Hook up signal device linking view.

src/org/thoughtcrime/securesms/loki/DeviceLinkingView.kt

@@ -32,31 +32,10 @@ class DeviceLinkingView private constructor(context: Context, attrs: AttributeSe
     private constructor(context: Context) : this(context, null)
 
     init {
-        setUpLanguageFileDirectory()
+        languageFileDirectory = MnemonicUtilities.getLanguageFileDirectory(context)
         setUpViewHierarchy()
     }
 
-    private fun setUpLanguageFileDirectory() {
-        val languages = listOf( "english", "japanese", "portuguese", "spanish" )
-        val directory = File(context.applicationInfo.dataDir)
-        for (language in languages) {
-            val fileName = "$language.txt"
-            if (directory.list().contains(fileName)) { continue }
-            val inputStream = context.assets.open("mnemonic/$fileName")
-            val file = File(directory, fileName)
-            val outputStream = FileOutputStream(file)
-            val buffer = ByteArray(1024)
-            while (true) {
-                val count = inputStream.read(buffer)
-                if (count < 0) { break }
-                outputStream.write(buffer, 0, count)
-            }
-            inputStream.close()
-            outputStream.close()
-        }
-        languageFileDirectory = directory
-    }
-
     private fun setUpViewHierarchy() {
         inflate(context, R.layout.view_device_linking, this)
         spinner.indeterminateDrawable.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN)
@@ -72,8 +51,8 @@ class DeviceLinkingView private constructor(context: Context, attrs: AttributeSe
         explanationTextView.text = resources.getString(explanationID)
         mnemonicTextView.visibility = if (mode == Mode.Master) View.GONE else View.VISIBLE
         if (mode == Mode.Slave) {
-            val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context).removing05PrefixIfNeeded()
-            mnemonicTextView.text = MnemonicCodec(languageFileDirectory).encode(hexEncodedPublicKey).split(" ").slice(0 until 3).joinToString(" ")
+            val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
+            mnemonicTextView.text = MnemonicUtilities.getFirst3Words(MnemonicCodec(languageFileDirectory), hexEncodedPublicKey)
         }
         authorizeButton.visibility = View.GONE
         authorizeButton.setOnClickListener { authorizePairing() }

src/org/thoughtcrime/securesms/loki/LinkedDevicesActivity.kt

@@ -0,0 +1,76 @@
+package org.thoughtcrime.securesms.loki
+
+import android.os.Bundle
+import android.view.MenuItem
+import android.widget.Toast
+import org.thoughtcrime.securesms.*
+import org.thoughtcrime.securesms.util.DynamicTheme
+import org.thoughtcrime.securesms.util.DynamicLanguage
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.sms.MessageSender
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.api.LokiStorageAPI
+
+class LinkedDevicesActivity : PassphraseRequiredActionBarActivity() {
+
+  companion object {
+    private val TAG = DeviceActivity::class.java.simpleName
+  }
+
+  private val dynamicTheme = DynamicTheme()
+  private val dynamicLanguage = DynamicLanguage()
+  private lateinit var deviceListFragment: DeviceListFragment
+
+  public override fun onPreCreate() {
+    dynamicTheme.onCreate(this)
+    dynamicLanguage.onCreate(this)
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    super.onCreate(savedInstanceState, ready)
+    supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    supportActionBar?.setTitle(R.string.AndroidManifest__linked_devices)
+    this.deviceListFragment = DeviceListFragment()
+    this.deviceListFragment.setAddDeviceButtonListener {
+      // TODO: Hook up add device
+    }
+    this.deviceListFragment.setHandleDisconnectDevice { devicePublicKey ->
+      // Purge the device pairing from our database
+      val ourPublicKey = TextSecurePreferences.getLocalNumber(this)
+      val database = DatabaseFactory.getLokiAPIDatabase(this)
+      database.removePairingAuthorisation(ourPublicKey, devicePublicKey)
+      // Update mapping on the file server
+      LokiStorageAPI.shared.updateUserDeviceMappings()
+      // Send a background message to let the device know that it has been revoked
+      MessageSender.sendBackgroundMessage(this, devicePublicKey)
+      // Refresh the list
+      refresh()
+      Toast.makeText(this, R.string.DeviceListActivity_unlinked_device, Toast.LENGTH_LONG).show()
+      return@setHandleDisconnectDevice null
+    }
+    initFragment(android.R.id.content, deviceListFragment, dynamicLanguage.currentLocale)
+    refresh()
+  }
+
+  private fun refresh() {
+    val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+    val isDeviceLinkingEnabled = DatabaseFactory.getLokiAPIDatabase(this).getPairingAuthorisations(userHexEncodedPublicKey).isEmpty()
+    this.deviceListFragment.setAddDeviceButtonVisible(isDeviceLinkingEnabled)
+    this.deviceListFragment.refresh()
+  }
+
+  public override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
+    dynamicLanguage.onResume(this)
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    if (item.itemId == android.R.id.home) {
+      finish()
+      return true
+    }
+    return false
+  }
+}

src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt

@@ -189,6 +189,11 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         val database = databaseHelper.readableDatabase
         database.delete(pairingAuthorisationCache, "$primaryDevicePublicKey = ? OR $secondaryDevicePublicKey = ?", arrayOf( hexEncodedPublicKey, hexEncodedPublicKey ))
     }
+
+    fun removePairingAuthorisation(primaryDevicePublicKey: String, secondaryDevicePublicKey: String) {
+        val database = databaseHelper.readableDatabase
+        database.delete(pairingAuthorisationCache, "${Companion.primaryDevicePublicKey} = ? OR ${Companion.secondaryDevicePublicKey} = ?", arrayOf( primaryDevicePublicKey, secondaryDevicePublicKey ))
+    }
 }
 
 // region Convenience

src/org/thoughtcrime/securesms/loki/MnemonicUtilities.kt

@@ -0,0 +1,36 @@
+package org.thoughtcrime.securesms.loki
+
+import android.content.Context
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+import org.whispersystems.signalservice.loki.utilities.removing05PrefixIfNeeded
+import java.io.File
+import java.io.FileOutputStream
+
+object MnemonicUtilities {
+  @JvmStatic
+  public fun getLanguageFileDirectory(context: Context): File {
+    val languages = listOf( "english", "japanese", "portuguese", "spanish" )
+    val directory = File(context.applicationInfo.dataDir)
+    for (language in languages) {
+      val fileName = "$language.txt"
+      if (directory.list().contains(fileName)) { continue }
+      val inputStream = context.assets.open("mnemonic/$fileName")
+      val file = File(directory, fileName)
+      val outputStream = FileOutputStream(file)
+      val buffer = ByteArray(1024)
+      while (true) {
+        val count = inputStream.read(buffer)
+        if (count < 0) { break }
+        outputStream.write(buffer, 0, count)
+      }
+      inputStream.close()
+      outputStream.close()
+    }
+    return directory
+  }
+
+  @JvmStatic
+  public fun getFirst3Words(codec: MnemonicCodec, hexEncodedPublicKey: String): String {
+    return codec.encode(hexEncodedPublicKey.removing05PrefixIfNeeded()).split(" ").slice(0 until 3).joinToString(" ")
+  }
+}