Federation Data Exchange for FE2

fe2-android/app/src/main/java/com/github/dedis/popstellar/model/network/method/message/data/federation/FederationResult.kt

@@ -25,15 +25,15 @@ class FederationResult
 
   init {
     when (status) {
-      "failure" -> {
-        require(reason != null) { "Reason must be provided for failure status." }
-        require(publicKey == null) { "Public key must be null for failure status." }
+      FAILURE -> {
+        require(reason != null) { "Reason must be provided for $FAILURE status." }
+        require(publicKey == null) { "Public key must be null for $FAILURE status." }
       }
-      "success" -> {
-        require(publicKey != null) { "Public key must be provided for success status." }
-        require(reason == null) { "Reason must be null for success status." }
+      SUCCESS -> {
+        require(publicKey != null) { "Public key must be provided for $SUCCESS status." }
+        require(reason == null) { "Reason must be null for $SUCCESS status." }
       }
-      else -> throw IllegalArgumentException("Status must be either 'failure' or 'success'.")
+      else -> throw IllegalArgumentException("Status must be either '$FAILURE' or '$SUCCESS'.")
     }
   }
 
@@ -62,16 +62,21 @@ class FederationResult
   }
 
   override fun toString(): String {
-    if (status == "failure") {
+    if (status == FAILURE) {
       return "FederationResult{status='$status', reason='$reason', challenge='$challenge'}"
-    } else if (status == "success") {
+    } else if (status == SUCCESS) {
       return "FederationResult{status='$status', public_key='$publicKey', " +
           "challenge='$challenge'}"
     }
     return "FederationResult{ERROR}"
   }
 
   fun isSuccess(): Boolean {
-    return status == "success"
+    return status == SUCCESS
+  }
+
+  companion object {
+    private const val SUCCESS = "success"
+    private const val FAILURE = "failure"
   }
 }

fe2-android/app/src/main/java/com/github/dedis/popstellar/utility/handler/data/LinkedOrganizationsHandler.kt

@@ -9,6 +9,7 @@ import com.github.dedis.popstellar.repository.LinkedOrganizationsRepository
 import com.github.dedis.popstellar.repository.RollCallRepository
 import com.github.dedis.popstellar.utility.error.UnknownLaoException
 import com.github.dedis.popstellar.utility.error.keys.NoRollCallException
+import io.reactivex.disposables.CompositeDisposable
 import javax.inject.Inject
 import timber.log.Timber
 
@@ -45,7 +46,7 @@ constructor(
           linkedOrgRepo.otherLaoId != null) {
         val laoId = context.channel.extractLaoId()
         linkedOrgRepo.addLinkedLao(laoId, linkedOrgRepo.otherLaoId!!, arrayOf())
-        laoRepo.addDisposable(
+        disposables.add(
             context.messageSender
                 .subscribe(Channel.getLaoChannel(linkedOrgRepo.otherLaoId!!))
                 .subscribe(
@@ -76,15 +77,15 @@ constructor(
     // LAO. This might be changed in the future (making a pop-up asking the user if he/she wants
     // to subscribe to that)
     tokenExchange.tokens.forEach { t ->
-      laoRepo.addDisposable(
+      disposables.add(
           context.messageSender
               .subscribe(
                   Channel.getLaoChannel(tokenExchange.laoId).subChannel(SOCIAL).subChannel(t))
               .subscribe(
                   { Timber.tag(TAG).d(SUCCESS) },
                   { error: Throwable -> Timber.tag(TAG).e(error, ERROR) }))
     }
-    laoRepo.addDisposable(
+    disposables.add(
         context.messageSender
             .subscribe(
                 Channel.getLaoChannel(tokenExchange.laoId).subChannel(SOCIAL).subChannel(REACTIONS))
@@ -106,6 +107,7 @@ constructor(
 
   companion object {
     private val TAG = LinkedOrganizationsHandler::class.java.simpleName
+    private val disposables = CompositeDisposable()
     private const val SOCIAL = "social"
     private const val REACTIONS = "reactions"
     private const val SUCCESS = "subscription is a success"

fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/federation/LinkedOrganizationsFragmentNonOrganizerTest.kt

@@ -35,6 +35,9 @@ class LinkedOrganizationsFragmentNonOrganizerTest {
     @Inject
     lateinit var laoRepository: LAORepository
 
+    @BindValue @Mock
+    lateinit var linkedOrganizationsViewModel: LinkedOrganizationsViewModel
+
     @BindValue @Mock
     lateinit var keyManager: KeyManager
 
@@ -54,6 +57,7 @@ class LinkedOrganizationsFragmentNonOrganizerTest {
                     laoRepository.updateLao(LAO)
                     Mockito.`when`(keyManager.mainKeyPair).thenReturn(KEY_PAIR)
                     Mockito.`when`(keyManager.mainPublicKey).thenReturn(POP_TOKEN.publicKey)
+                    Mockito.`when`(linkedOrganizationsViewModel.getLinkedLaosMap()).thenReturn(mutableMapOf(LAO_ID to arrayOf()))
                 }
             }
 
@@ -75,6 +79,18 @@ class LinkedOrganizationsFragmentNonOrganizerTest {
                 .check(matches(withEffectiveVisibility(Visibility.GONE)))
     }
 
+    @Test
+    fun testLAOTextDisplayed() {
+        LinkedOrganizationsFragmentPageObject.listOrganizationsText().check(matches(isDisplayed()))
+        LinkedOrganizationsFragmentPageObject.noOrganizationsText().check(matches(withEffectiveVisibility(Visibility.GONE)))
+    }
+
+    @Test
+    fun testLAOTextIsCorrect() {
+        val validText = "List of linked organizations :\n\n$LAO_ID"
+        LinkedOrganizationsFragmentPageObject.listOrganizationsText().check(matches(withText(validText)))
+    }
+
     companion object {
         private val KEY_PAIR = Base64DataUtils.generateKeyPair()
         private val POP_TOKEN = Base64DataUtils.generatePoPToken()

fe2-android/app/src/test/ui/robolectric/com/github/dedis/popstellar/ui/lao/federation/LinkedOrganizationsFragmentOrganizerTest.kt

@@ -106,7 +106,7 @@ class LinkedOrganizationsFragmentOrganizerTest {
     }
 
     @Test
-    fun testTextDisplayed() {
+    fun testNoLAOTextDisplayed() {
         LinkedOrganizationsFragmentPageObject.noOrganizationsText().check(matches(isDisplayed()))
         LinkedOrganizationsFragmentPageObject.listOrganizationsText().check(matches(withEffectiveVisibility(Visibility.GONE)))
     }