Update SDK JAVA API making initNewAccount() private and called in the respective constructors

4 files changed, 4 insertions, 26 deletions

diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
index 05480fc..ec1d49c 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
@@ -70,11 +70,6 @@ public class OlmAccountTest {
     public void test02CreateAccount() {
         mOlmAccount = new OlmAccount();
         assertNotNull(mOlmAccount);
-    }
-
-    @Test
-    public void test03InitNewAccount() {
-        assertTrue(mOlmAccount.initNewAccount());
         mIsAccountCreated = true;
     }
 
@@ -154,7 +149,6 @@ public class OlmAccountTest {
     @Test
     public void test10RemoveOneTimeKeysForSession() {
         OlmSession olmSession = new OlmSession();
-        olmSession.initNewSession();
         long sessionId = olmSession.getOlmSessionId();
         assertTrue(0 != sessionId);
 
@@ -189,7 +183,6 @@ public class OlmAccountTest {
         Log.d(LOG_TAG, "## testJni(): lib version="+versionLib);
 
         OlmAccount account = new OlmAccount();
-        boolean initStatus = account.initNewAccount();
 
         long accountNativeId = account.getOlmAccountId();
         Log.d(LOG_TAG, "## testJni(): lib accountNativeId="+accountNativeId);
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
index 56048cc..0b8e6b4 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
@@ -50,10 +50,7 @@ public class OlmSessionTest {
 
         // creates alice & bob accounts
         OlmAccount aliceAccount = new OlmAccount();
-        aliceAccount.initNewAccount();
-
         OlmAccount bobAccount = new OlmAccount();
-        bobAccount.initNewAccount();
 
         // test accounts creation
         assertTrue(0!=bobAccount.getOlmAccountId());
@@ -88,7 +85,6 @@ public class OlmSessionTest {
 
         // CREATE ALICE SESSION
         OlmSession aliceSession = new OlmSession();
-        aliceSession.initNewSession();
         assertTrue(0!=aliceSession.getOlmSessionId());
 
         // CREATE ALICE OUTBOUND SESSION and encrypt message to bob
@@ -100,7 +96,6 @@ public class OlmSessionTest {
 
         // CREATE BOB INBOUND SESSION and decrypt message from alice
         OlmSession bobSession = new OlmSession();
-        bobSession.initNewSession();
         assertTrue(0!=bobSession.getOlmSessionId());
         assertNotNull(bobSession.initInboundSessionWithAccount(bobAccount, encryptedMsgToBob.mCipherText));
         String decryptedMsg = bobSession.decryptMessage(encryptedMsgToBob);
@@ -140,10 +135,7 @@ public class OlmSessionTest {
 
         // creates alice & bob accounts
         OlmAccount aliceAccount = new OlmAccount();
-        aliceAccount.initNewAccount();
-
         OlmAccount bobAccount = new OlmAccount();
-        bobAccount.initNewAccount();
 
         // test accounts creation
         assertTrue(0!=bobAccount.getOlmAccountId());
@@ -178,7 +170,6 @@ public class OlmSessionTest {
 
         // CREATE ALICE SESSION
         OlmSession aliceSession = new OlmSession();
-        aliceSession.initNewSession();
         assertTrue(0!=aliceSession.getOlmSessionId());
 
         // CREATE ALICE OUTBOUND SESSION and encrypt message to bob
@@ -190,7 +181,6 @@ public class OlmSessionTest {
 
         // CREATE BOB INBOUND SESSION and decrypt message from alice
         OlmSession bobSession = new OlmSession();
-        bobSession.initNewSession();
         assertTrue(0!=bobSession.getOlmSessionId());
         assertNotNull(bobSession.initInboundSessionWithAccount(bobAccount, encryptedAliceToBobMsg1.mCipherText));
 
@@ -237,10 +227,7 @@ public class OlmSessionTest {
     public void test03AliceBobSessionId() {
         // creates alice & bob accounts
         OlmAccount aliceAccount = new OlmAccount();
-        aliceAccount.initNewAccount();
-
         OlmAccount bobAccount = new OlmAccount();
-        bobAccount.initNewAccount();
 
         // test accounts creation
         assertTrue(0!=bobAccount.getOlmAccountId());
@@ -248,12 +235,10 @@ public class OlmSessionTest {
 
         // CREATE ALICE SESSION
         OlmSession aliceSession = new OlmSession();
-        aliceSession.initNewSession();
         assertTrue(0!=aliceSession.getOlmSessionId());
 
         // CREATE BOB INBOUND SESSION and decrypt message from alice
         OlmSession bobSession = new OlmSession();
-        bobSession.initNewSession();
         assertTrue(0!=bobSession.getOlmSessionId());
 
         String aliceSessionId = aliceSession.sessionIdentifier();
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
index e9eddc7..963f0a4 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
@@ -35,7 +35,7 @@ public class OlmAccount {
     private long mNativeOlmAccountId;
 
     public OlmAccount() {
-        //initNewAccount();
+        initNewAccount();
     }
 
     /**
@@ -79,7 +79,7 @@ public class OlmAccount {
      * To be called before any other API call.
      * @return true if init succeed, false otherwise.
      */
-    public boolean initNewAccount() {
+    private boolean initNewAccount() {
         boolean retCode = false;
         if(0 != (mNativeOlmAccountId = initNewAccountJni())){
             retCode = true;
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
index 0c2888c..06e2fcf 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
@@ -31,7 +31,7 @@ public class OlmSession {
     private OlmAccount mOlmAccount;
 
     public OlmSession() {
-        //initNewSession();
+        initNewSession();
     }
 
     /**
@@ -76,7 +76,7 @@ public class OlmSession {
      * To be called before any other API call.
      * @return true if init succeed, false otherwise.
      */
-    public boolean initNewSession() {
+    private boolean initNewSession() {
         boolean retCode = false;
         if(0 != (mNativeOlmSessionId = initNewSessionJni())){
             retCode = true;