diff options
author | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
commit | e840a51629bd6de238168c5fc9013a2bf50ed1f7 (patch) | |
tree | 0740154bae719dc91b5446b5f9ef88602ad72ad9 /src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java | |
parent | 6a5563cc14e3595c65282c217e264cd717dd657b (diff) | |
parent | 222d70d5e7219ab0206cca192952748fcd17bdbf (diff) |
Merge branch 'refs/heads/news' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java index 3c8cb3c10..979a2845d 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java @@ -125,15 +125,15 @@ public class SQLiteAxolotlStore implements AxolotlStore { } private int loadCurrentPreKeyId() { - String regIdString = this.account.getKey(JSONKEY_CURRENT_PREKEY_ID); - int reg_id; - if (regIdString != null) { - reg_id = Integer.valueOf(regIdString); + String prekeyIdString = this.account.getKey(JSONKEY_CURRENT_PREKEY_ID); + int prekey_id; + if (prekeyIdString != null) { + prekey_id = Integer.valueOf(prekeyIdString); } else { Log.w(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Could not retrieve current prekey id for account " + account.getJid()); - reg_id = 0; + prekey_id = 0; } - return reg_id; + return prekey_id; } public void regenerate() { |