narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #1826 from sebastianv89/patch-1

Browse source 
Renaming of variable
This commit is contained in:
Daniel Gultsch 2016-05-04 09:28:46 +02:00
parent 59f02f7766 cf374ec4ef
commit dee7fd3eab
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
View file

@ -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() {