updates

sticknet · Mar 27, 2021 · 36586d8 · 36586d8
1 parent 3882799
commit 36586d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/android/app/src/main/java/com/stiiick/stickprotocol/main/StickProtocol.java b/android/app/src/main/java/com/stiiick/stickprotocol/main/StickProtocol.java
@@ -433,25 +433,26 @@ public JSONObject initialize(String userId, String password, ProgressEvent progr
             signedPreKeyJson.put("salt", signedCipherMap.get("salt"));
             signedPreKeyJson.put("timestamp", Long.toString(signedPreKey.getTimestamp()));
 
-            int localId = KeyHelper.generateRegistrationId(false);
-            Preferences.setLocalRegistrationId(context, localId);
             JSONObject identityKeyJson = new JSONObject();
             identityKeyJson.put("id", Preferences.getActiveIdentityKeyId(context));
             identityKeyJson.put("public", Base64.encodeBytes(identityKey.getPublicKey().serialize()));
-            identityKeyJson.put("localId", localId);
             HashMap<String, String> identityCipherMap = pbEncrypt(identityKey.getPrivateKey().serialize(), password);
             identityKeyJson.put("cipher", identityCipherMap.get("cipher"));
             identityKeyJson.put("salt", identityCipherMap.get("salt"));
             identityKeyJson.put("timestamp", Preferences.getActiveIdentityKeyTimestamp(context));
 
             String oneTimeId = UUID.randomUUID().toString();
+            int localId = KeyHelper.generateRegistrationId(false);
+            Preferences.setLocalRegistrationId(context, localId);
             JSONObject map = new JSONObject();
             map.put("identityKey", identityKeyJson);
             map.put("signedPreKey", signedPreKeyJson);
             map.put("preKeys", preKeysArray);
             map.put("passwordHash", passwordHash);
             map.put("passwordSalt", Base64.encodeBytes(salt));
             map.put("oneTimeId", oneTimeId);
+            map.put("localId", localId);
+
             PreferenceManager.getDefaultSharedPreferences(context).edit().putString("oneTimeId", oneTimeId).apply();
             PreferenceManager.getDefaultSharedPreferences(context).edit().putString("userId", userId).apply();
 

diff --git a/server/setup.cfg b/server/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = stick-protocol-server
-version = 1.1.52
+version = 1.1.54
 description = Stick protocol server for Django.
 long_description = file: README.rst
 long_description_content_type = text/x-rst

diff --git a/server/stick_protocol/stick_protocol.py b/server/stick_protocol/stick_protocol.py
@@ -47,7 +47,7 @@ def process_pre_key_bundle(self, data, user):
         user.passwordSalt = data["passwordSalt"]
         user.set_password(data["passwordHash"])  # This will create a "Double-Hashed" password
         user.oneTimeId = data["oneTimeId"]
-        user.SPID = data['SPID']
+        user.localId = data['localId']
         user.nextPreKeyId = data['nextPreKeyId']
         user.finishedRegistration = True
         user.save()