Always call save() after modifying something

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index 64bdfae3be86fa9ca87ab15abb0cb70e6ad9072d..28854846d3b16cedbf7f8dfd2d1f55835a15d3fe 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -240,7 +240,6 @@ public class Main {
 
                 break;
         }
 
                 break;
         }

-        m.save();

         System.exit(0);
     }
 
         System.exit(0);
     }
 

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index b15457af5b5fde47b1fa0a837ab743338e0a6513..86850ed46ffa53c7a8fc55043dd749b7177b0c9d 100644 (file)
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -136,7 +136,7 @@ class Manager implements TextSecure {
         accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
     }
 
         accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
     }
 

-    public void save() {
+    private void save() {

         ObjectNode rootNode = jsonProcessot.createObjectNode();
         rootNode.put("username", username)
                 .put("password", password)
         ObjectNode rootNode = jsonProcessot.createObjectNode();
         rootNode.put("username", username)
                 .put("password", password)


@@ -160,6 +160,7 @@ class Manager implements TextSecure {
         axolotlStore = new JsonAxolotlStore(identityKey, registrationId);
         groupStore = new JsonGroupStore();
         registered = false;
         axolotlStore = new JsonAxolotlStore(identityKey, registrationId);
         groupStore = new JsonGroupStore();
         registered = false;

+        save();

     }
 
     public boolean isRegistered() {
     }
 
     public boolean isRegistered() {


@@ -177,6 +178,7 @@ class Manager implements TextSecure {
             accountManager.requestSmsVerificationCode();
 
         registered = false;
             accountManager.requestSmsVerificationCode();
 
         registered = false;

+        save();

     }
 
     private static final int BATCH_SIZE = 100;
     }
 
     private static final int BATCH_SIZE = 100;


@@ -194,6 +196,8 @@ class Manager implements TextSecure {
         }
 
         preKeyIdOffset = (preKeyIdOffset + BATCH_SIZE + 1) % Medium.MAX_VALUE;
         }
 
         preKeyIdOffset = (preKeyIdOffset + BATCH_SIZE + 1) % Medium.MAX_VALUE;

+        save();
+

         return records;
     }
 
         return records;
     }
 


@@ -210,6 +214,7 @@ class Manager implements TextSecure {
         PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
 
         axolotlStore.storePreKey(Medium.MAX_VALUE, record);
         PreKeyRecord record = new PreKeyRecord(Medium.MAX_VALUE, keyPair);
 
         axolotlStore.storePreKey(Medium.MAX_VALUE, record);

+        save();

 
         return record;
     }
 
         return record;
     }


@@ -222,6 +227,7 @@ class Manager implements TextSecure {
 
             axolotlStore.storeSignedPreKey(nextSignedPreKeyId, record);
             nextSignedPreKeyId = (nextSignedPreKeyId + 1) % Medium.MAX_VALUE;
 
             axolotlStore.storeSignedPreKey(nextSignedPreKeyId, record);
             nextSignedPreKeyId = (nextSignedPreKeyId + 1) % Medium.MAX_VALUE;

+            save();

 
             return record;
         } catch (InvalidKeyException e) {
 
             return record;
         } catch (InvalidKeyException e) {


@@ -244,6 +250,7 @@ class Manager implements TextSecure {
         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
 
         accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);
         SignedPreKeyRecord signedPreKeyRecord = generateSignedPreKey(axolotlStore.getIdentityKeyPair());
 
         accountManager.setPreKeys(axolotlStore.getIdentityKeyPair().getPublicKey(), lastResortKey, signedPreKeyRecord, oneTimePreKeys);

+        save();

     }
 
 
     }
 
 


@@ -392,6 +399,7 @@ class Manager implements TextSecure {
             } catch (InvalidNumberException e) {
                 System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
                 System.err.println("Aborting sending.");
             } catch (InvalidNumberException e) {
                 System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
                 System.err.println("Aborting sending.");

+                save();

                 return;
             }
         }
                 return;
             }
         }