Resolved TODOs

Author: BuddahLD

ethree-common/src/main/java/com/virgilsecurity/android/common/interaction/KeyManagerCloud.kt

@@ -72,7 +72,7 @@ class KeyManagerCloud(
     fun exists(password: String) = initCloudKeyStorage(password).exists(identity)
 
     fun store(password: String, data: ByteArray, meta: Map<String, String>?) =
-            initCloudKeyStorage(password).store(identity, data, meta) // TODO ckech whether meta is null by default
+            initCloudKeyStorage(password).store(identity, data, meta)
 
     fun retrieve(password: String) = initCloudKeyStorage(password).retrieve(identity)
 

ethree-enclave/src/main/java/com/virgilsecurity/android/ethreeenclave/interaction/EThree.kt

@@ -88,6 +88,7 @@ private constructor(
                         keyStorageAndroid.store(keyEntryAndroid)
                     } catch (throwable: Throwable) {
                         keyStorageAndroid.names().forEach { keyStorageAndroid.delete(it) }
+
                         throw KeyStorageException("Error while migrating keys from legacy key "
                         + "storage to the new one. All keys are restored in legacy key storage.")
                     }

samples/android-kotlin-nexmo/app/src/main/java/com/android/virgilsecurity/ethreenexmodemo/ui/chatControl/thread/ThreadPresenter.kt

@@ -24,31 +24,31 @@ class ThreadPresenter(context: Context) {
     fun startMessagesListener(thread: NexmoConversation, onNewMessage: (NexmoMessage) -> Unit) {
         messageEventListener = object : NexmoMessageEventListener {
             override fun onTypingEvent(p0: NexmoTypingEvent) {
-                // TODO Implement body or it will be empty ):
+
             }
 
             override fun onAttachmentEvent(p0: NexmoAttachmentEvent) {
-                // TODO Implement body or it will be empty ):
+
             }
 
             override fun onTextEvent(textEvent: NexmoTextEvent) {
                 if (textEvent.member.user.name != preferences.username()) {
                     val sender = thread.allMembers.first { it.user.name != preferences.username() }
-                            .user.name // TODO get right name
+                            .user.name
                     onNewMessage(NexmoMessage(textEvent.text, sender))
                 }
             }
 
             override fun onSeenReceipt(p0: NexmoSeenEvent) {
-                // TODO Implement body or it will be empty ):
+
             }
 
             override fun onEventDeleted(p0: NexmoDeletedEvent) {
-                // TODO Implement body or it will be empty ):
+
             }
 
             override fun onDeliveredReceipt(p0: NexmoDeliveredEvent) {
-                // TODO Implement body or it will be empty ):
+
             }
 
         }

tests/src/androidTest/java/com/virgilsecurity/android/ethree/interaction/sync/EThreeSyncNegative.kt

@@ -240,7 +240,7 @@ class EThreeSyncNegative {
         } catch (throwable: Throwable) {
             assertTrue(throwable is WrongPasswordException)
         }
-    } // TODO check whether it's ok that updateRecipients executes successfully if KeyKnox is empty
+    }
 
     //STE-2
     @Test fun lookup_zero_users() {

tests/src/androidTest/java/com/virgilsecurity/android/ethree/java/interaction/EThreeTestPositive.java

@@ -65,6 +65,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 @RunWith(AndroidJUnit4.class)
@@ -148,23 +149,25 @@ public void onError(@NotNull Throwable throwable) {
         assertEquals(1, cards.size());
     }
 
-    // TODO uncomment after sdk updated to handle null jwt properly
-//    @Test public void initialize_with_null_token() throws InterruptedException {
-//        final CountDownLatch lock = new CountDownLatch(1);
-//        EThree.initialize(TestConfig.Companion.getContext(), new OnGetTokenCallback() {
-//            @NotNull @Override public String onGetToken() {
-//                return null;
-//            }
-//        }).addCallback(new OnResultListener<EThree>() {
-//            @Override public void onSuccess(EThree result) {
-//                eThree = result;
-//                lock.countDown();
-//            }
-//
-//            @Override public void onError(@NotNull Throwable throwable) {
-//                fail(throwable.getMessage());
-//            }
-//        });
-//        lock.await(TestUtils.THROTTLE_TIMEOUT, TimeUnit.SECONDS);
-//    }
+    @Test public void initialize_with_null_token() throws InterruptedException {
+        final CountDownLatch lock = new CountDownLatch(1);
+        EThree.initialize(TestConfig.Companion.getContext(), new OnGetTokenCallback() {
+            @NotNull @Override public String onGetToken() {
+                //noinspection ConstantConditions
+                return null;
+            }
+        }).addCallback(new OnResultListener<EThree>() {
+            @Override public void onSuccess(EThree result) {
+                fail("Null token should throw exception");
+
+            }
+
+            @Override public void onError(@NotNull Throwable throwable) {
+                assertTrue(throwable instanceof IllegalArgumentException);
+
+                lock.countDown();
+            }
+        });
+        lock.await(TestUtils.THROTTLE_TIMEOUT, TimeUnit.SECONDS);
+    }
 }