Merge branch 'dev' into multi-device-integration

res/drawable/icon_link.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M326.612,185.391c59.747,59.809 58.927,155.698 0.36,214.59 -0.11,0.12 -0.24,0.25 -0.36,0.37l-67.2,67.2c-59.27,59.27 -155.699,59.262 -214.96,0 -59.27,-59.26 -59.27,-155.7 0,-214.96l37.106,-37.106c9.84,-9.84 26.786,-3.3 27.294,10.606 0.648,17.722 3.826,35.527 9.69,52.721 1.986,5.822 0.567,12.262 -3.783,16.612l-13.087,13.087c-28.026,28.026 -28.905,73.66 -1.155,101.96 28.024,28.579 74.086,28.749 102.325,0.51l67.2,-67.19c28.191,-28.191 28.073,-73.757 0,-101.83 -3.701,-3.694 -7.429,-6.564 -10.341,-8.569a16.037,16.037 0,0 1,-6.947 -12.606c-0.396,-10.567 3.348,-21.456 11.698,-29.806l21.054,-21.055c5.521,-5.521 14.182,-6.199 20.584,-1.731a152.482,152.482 0,0 1,20.522 17.197zM467.547,44.449c-59.261,-59.262 -155.69,-59.27 -214.96,0l-67.2,67.2c-0.12,0.12 -0.25,0.25 -0.36,0.37 -58.566,58.892 -59.387,154.781 0.36,214.59a152.454,152.454 0,0 0,20.521 17.196c6.402,4.468 15.064,3.789 20.584,-1.731l21.054,-21.055c8.35,-8.35 12.094,-19.239 11.698,-29.806a16.037,16.037 0,0 0,-6.947 -12.606c-2.912,-2.005 -6.64,-4.875 -10.341,-8.569 -28.073,-28.073 -28.191,-73.639 0,-101.83l67.2,-67.19c28.239,-28.239 74.3,-28.069 102.325,0.51 27.75,28.3 26.872,73.934 -1.155,101.96l-13.087,13.087c-4.35,4.35 -5.769,10.79 -3.783,16.612 5.864,17.194 9.042,34.999 9.69,52.721 0.509,13.906 17.454,20.446 27.294,10.606l37.106,-37.106c59.271,-59.259 59.271,-155.699 0.001,-214.959z"
+      android:fillColor="?attr/pref_icon_tint"/>
+</vector>

res/layout/fragment_qr_code.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <TextView
-            android:id="@+id/explanationTextView"
-            style="@style/Signal.Text.Body"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/fragment_qr_code_explanation" />
-
-        <ImageView
-            android:id="@+id/qrCodeImageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:background="@color/white" />
-
-    </LinearLayout>
-
-</ScrollView>

res/layout/view_device_linking.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:orientation="vertical"
+    android:gravity="center_horizontal">
+
+    <ProgressBar
+        android:id="@+id/spinner"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginTop="16dp"
+        android:indeterminate="true"
+        android:progressTint="@color/white" />
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Signal.Text.Headline"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:textSize="20sp"
+        android:fontFamily="sans-serif-medium"
+        android:textAlignment="center"
+        android:text="@string/view_device_linking_title_1" />
+
+    <TextView
+        android:id="@+id/explanationTextView"
+        style="@style/Signal.Text.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textAlignment="center"
+        android:text="@string/view_device_linking_explanation_1" />
+
+    <TextView
+        android:id="@+id/mnemonicTextView"
+        style="@style/Signal.Text.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textAlignment="center"
+        android:text="word word word" />
+
+    <LinearLayout
+        android:id="@+id/buttonContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/authorizeButton"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="16dp"
+            android:background="@color/transparent"
+            android:textColor="@color/signal_primary"
+            android:text="@string/view_device_linking_authorize_button_title"
+            android:elevation="0dp"
+            android:stateListAnimator="@null" />
+
+        <Button
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="16dp"
+            android:background="@color/transparent"
+            android:textColor="@color/signal_primary"
+            android:text="@string/view_device_linking_cancel_button_title"
+            android:elevation="0dp"
+            android:stateListAnimator="@null" />
+
+    </LinearLayout>
+
+</LinearLayout>

res/layout/view_qr_code.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:orientation="vertical"
+    android:gravity="center_horizontal">
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Signal.Text.Headline"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="20sp"
+        android:fontFamily="sans-serif-medium"
+        android:textAlignment="center"
+        android:text="@string/view_qr_code_title" />
+
+    <TextView
+        android:id="@+id/explanationTextView"
+        style="@style/Signal.Text.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textAlignment="center"
+        android:text="@string/view_qr_code_explanation" />
+
+    <ImageView
+        android:id="@+id/qrCodeImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="48dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="48dp"
+        android:layout_marginBottom="24dp"
+        android:background="@color/white" />
+
+    <Button
+        android:id="@+id/cancelButton"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/transparent"
+        android:textColor="@color/signal_primary"
+        android:text="@string/view_qr_code_cancel_button_title"
+        android:elevation="0dp"
+        android:stateListAnimator="@null" />
+
+</LinearLayout>

res/values/strings.xml

@@ -1575,6 +1575,7 @@
     <string name="activity_settings_public_key_copied_message">Copied to clipboard</string>
     <string name="activity_settings_share_public_key_button_title">Share Public Key</string>
     <string name="activity_settings_show_qr_code_button_title">Show QR Code</string>
+    <string name="activity_settings_link_device_button_title">Link Device</string>
     <string name="activity_settings_show_seed_button_title">Show Seed</string>
     <string name="activity_settings_seed_dialog_title">Your Seed</string>
     <string name="activity_settings_seed_dialog_copy_button_title">Copy</string>
@@ -1610,13 +1611,24 @@
     <!-- Conversation activity -->
     <string name="activity_conversation_pending_friend_request_hint">Pending Friend Request…</string>
     <string name="activity_conversation_default_hint">New Message</string>
-    <!-- QR code fragment -->
+    <!-- QR code view -->
-    <string name="fragment_qr_code_title">Your QR Code</string>
+    <string name="view_qr_code_title">Your QR Code</string>
-    <string name="fragment_qr_code_explanation">This is your personal QR code. Other people can scan it to start a secure conversation with you.</string>
+    <string name="view_qr_code_explanation">This is your personal QR code. Other people can scan it to start a secure conversation with you.</string>
-    <string name="fragment_qr_code_camera_permission_dialog_message">Loki Messenger needs camera access to scan QR codes.</string>
+    <string name="view_qr_code_cancel_button_title">Cancel</string>
+    <!-- Device linking view -->
+    <string name="view_device_linking_title_1">Waiting for Device</string>
+    <string name="view_device_linking_title_2">Waiting for Authorization</string>
+    <string name="view_device_linking_title_3">Linking Request Received</string>
+    <string name="view_device_linking_title_4">Device Link Authorized</string>
+    <string name="view_device_linking_explanation_1">Create a new account on your other device and click \"Link Device\" when you\'re at the \"Create Your Loki Messenger Account\" step to start the linking process</string>
+    <string name="view_device_linking_explanation_2">Please check that the words below match the ones shown on your other device</string>
+    <string name="view_device_linking_explanation_3">Your device has been linked successfully</string>
+    <string name="view_device_linking_authorize_button_title">Authorize</string>
+    <string name="view_device_linking_cancel_button_title">Cancel</string>
     <!-- Scan QR code fragment -->
     <string name="fragment_scan_qr_code_title">Scan QR Code</string>
     <string name="fragment_scan_qr_code_explanation">Scan the QR code of the person you\'d like to securely message. They can find their QR code by going into Loki Messenger\'s in-app settings and clicking \"Show QR Code\".</string>
+    <string name="fragment_scan_qr_code_camera_permission_dialog_message">Loki Messenger needs camera access to scan QR codes.</string>
     <!-- Conversation activity -->
     <string name="activity_conversation_copy_public_key_button_title">Copy public key</string>
 

res/xml/preferences.xml

@@ -41,6 +41,10 @@
                 android:title="@string/activity_settings_show_qr_code_button_title"
                 android:icon="@drawable/icon_qr_code"/>
 
+    <Preference android:key="preference_category_link_device"
+        android:title="@string/activity_settings_link_device_button_title"
+        android:icon="@drawable/icon_link"/>
+
     <Preference android:key="preference_category_seed"
                 android:title="@string/activity_settings_show_seed_button_title"
                 android:icon="@drawable/icon_seedling"/>

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -40,7 +40,9 @@ import android.support.v7.preference.Preference;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.loki.QRCodeFragment;
+import org.thoughtcrime.securesms.loki.DeviceLinkingDialog;
+import org.thoughtcrime.securesms.loki.DeviceLinkingView;
+import org.thoughtcrime.securesms.loki.QRCodeDialog;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
@@ -80,6 +82,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   // private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
   private static final String PREFERENCE_CATEGORY_PUBLIC_KEY     = "preference_category_public_key";
   private static final String PREFERENCE_CATEGORY_QR_CODE        = "preference_category_qr_code";
+  private static final String PREFERENCE_CATEGORY_LINK_DEVICE    = "preference_category_link_device";
   private static final String PREFERENCE_CATEGORY_SEED           = "preference_category_seed";
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
@@ -176,7 +179,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       this.findPreference(PREFERENCE_CATEGORY_PUBLIC_KEY)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PUBLIC_KEY));
       this.findPreference(PREFERENCE_CATEGORY_QR_CODE)
-              .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE));
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE));
+      this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_LINK_DEVICE));
       this.findPreference(PREFERENCE_CATEGORY_SEED)
         .setOnPreferenceClickListener(new CategoryClickListener((PREFERENCE_CATEGORY_SEED)));
 
@@ -238,6 +243,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       Drawable advanced      = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_advanced_white_24dp));
       Drawable publicKey     = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_textsms_24dp));
       Drawable qrCode        = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_qr_code));
+      Drawable linkDevice    = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_link));
       Drawable seed          = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_seedling));
 
       int[]      tintAttr   = new int[]{R.attr.pref_icon_tint};
@@ -254,6 +260,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       DrawableCompat.setTint(advanced, color);
       DrawableCompat.setTint(publicKey, color);
       DrawableCompat.setTint(qrCode, color);
+      DrawableCompat.setTint(linkDevice, color);
       DrawableCompat.setTint(seed, color);
 
       // this.findPreference(PREFERENCE_CATEGORY_SMS_MMS).setIcon(sms);
@@ -265,6 +272,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       // this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced);
       this.findPreference(PREFERENCE_CATEGORY_PUBLIC_KEY).setIcon(publicKey);
       this.findPreference(PREFERENCE_CATEGORY_QR_CODE).setIcon(qrCode);
+      this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE).setIcon(linkDevice);
       this.findPreference(PREFERENCE_CATEGORY_SEED).setIcon(seed);
     }
 
@@ -317,7 +325,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
           startActivity(shareIntent);
           break;
         case PREFERENCE_CATEGORY_QR_CODE:
-          fragment = new QRCodeFragment();
+          QRCodeDialog.INSTANCE.show(getContext());
+          break;
+        case PREFERENCE_CATEGORY_LINK_DEVICE:
+          DeviceLinkingDialog.INSTANCE.show(getContext(), DeviceLinkingView.Mode.Master);
           break;
         case PREFERENCE_CATEGORY_SEED:
           File languageFileDirectory = new File(getContext().getApplicationInfo().dataDir);

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

@@ -0,0 +1,165 @@
+package org.thoughtcrime.securesms.loki
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.os.Handler
+import android.support.v7.app.AlertDialog
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.view_device_linking.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+import org.whispersystems.signalservice.loki.utilities.removing05PrefixIfNeeded
+import java.io.File
+import java.io.FileOutputStream
+
+object DeviceLinkingDialog {
+
+    fun show(context: Context, mode: DeviceLinkingView.Mode) {
+        val view = DeviceLinkingView(context, mode)
+        val dialog = AlertDialog.Builder(context).setView(view).show()
+        view.dismiss = { dialog.dismiss() }
+    }
+}
+
+class DeviceLinkingView private constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, private val mode: Mode) : LinearLayout(context, attrs, defStyleAttr) {
+    private var delegate: DeviceLinkingDialogDelegate? = null
+    private lateinit var languageFileDirectory: File
+    var dismiss: (() -> Unit)? = null
+
+    // region Types
+    enum class Mode { Master, Slave }
+    // endregion
+
+    // region Lifecycle
+    constructor(context: Context, mode: Mode) : this(context, null, 0, mode)
+    private constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0, Mode.Master) // Just pass in a dummy mode
+    private constructor(context: Context) : this(context, null)
+
+    init {
+        if (mode == Mode.Slave) {
+            if (delegate == null) { throw IllegalStateException("Missing delegate for device linking dialog in slave mode.") }
+        }
+        setUpLanguageFileDirectory()
+        setUpViewHierarchy()
+        when (mode) {
+            Mode.Master -> Log.d("Loki", "TODO: DeviceLinkingSession.startListeningForLinkingRequests(this)")
+            Mode.Slave -> Log.d("Loki", "TODO: DeviceLinkingSession.startListeningForAuthorization(this)")
+        }
+    }
+
+    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)
+        val titleID = when (mode) {
+            Mode.Master -> R.string.view_device_linking_title_1
+            Mode.Slave -> R.string.view_device_linking_title_2
+        }
+        titleTextView.text = resources.getString(titleID)
+        val explanationID = when (mode) {
+            Mode.Master -> R.string.view_device_linking_explanation_1
+            Mode.Slave -> R.string.view_device_linking_explanation_2
+        }
+        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(" ")
+        }
+        authorizeButton.visibility = View.GONE
+        cancelButton.setOnClickListener { cancel() }
+    }
+    // endregion
+
+    // region Device Linking
+    private fun requestUserAuthorization() { // TODO: deviceLink parameter
+        // To be called by DeviceLinkingSession when a linking request has been received
+        // TODO: this.deviceLink = deviceLink
+        spinner.visibility = View.GONE
+        val titleTextViewLayoutParams = titleTextView.layoutParams as LayoutParams
+        titleTextViewLayoutParams.topMargin = toPx(16, resources)
+        titleTextView.layoutParams = titleTextViewLayoutParams
+        titleTextView.text = resources.getString(R.string.view_device_linking_title_3)
+        explanationTextView.text = resources.getString(R.string.view_device_linking_explanation_2)
+        mnemonicTextView.visibility = View.VISIBLE
+        val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context).removing05PrefixIfNeeded() // TODO: deviceLink.slave.hexEncodedPublicKey.removing05PrefixIfNeeded()
+        mnemonicTextView.text = MnemonicCodec(languageFileDirectory).encode(hexEncodedPublicKey).split(" ").slice(0 until 3).joinToString(" ")
+        authorizeButton.visibility = View.VISIBLE
+    }
+
+    private fun authorizeDeviceLink() {
+        // TODO: val deviceLink = this.deviceLink!!
+        // TODO: val linkingAuthorizationMessage = DeviceLinkingUtilities.getLinkingAuthorizationMessage(deviceLink)
+        // TODO: Send the linking authorization message
+        // TODO: val session = DeviceLinkingSession.current!!
+        // TODO: session.stopListeningForLinkingRequests()
+        // TODO: session.markLinkingRequestAsProcessed()
+        dismiss?.invoke()
+        // TODO: val master = DeviceLink.Device(deviceLink.master.hexEncodedPublicKey, linkingAuthorizationMessage.masterSignature)
+        // TODO: val signedDeviceLink = DeviceLink(master, deviceLink.slave)
+        // TODO: LokiStorageAPI.addDeviceLink(signedDeviceLink).fail { error ->
+        // TODO:     Log.d("Loki", "Failed to add device link due to error: $error.")
+        // TODO: }
+    }
+
+    private fun handleDeviceLinkAuthorized() { // TODO: deviceLink parameter
+        // To be called by DeviceLinkingSession when a device link has been authorized
+        // TODO: val session = DeviceLinkingSession.current!!
+        // TODO: session.stopListeningForLinkingAuthorization()
+        spinner.visibility = View.GONE
+        val titleTextViewLayoutParams = titleTextView.layoutParams as LayoutParams
+        titleTextViewLayoutParams.topMargin = toPx(8, resources)
+        titleTextView.layoutParams = titleTextViewLayoutParams
+        titleTextView.text = resources.getString(R.string.view_device_linking_title_4)
+        val explanationTextViewLayoutParams = explanationTextView.layoutParams as LayoutParams
+        explanationTextViewLayoutParams.bottomMargin = toPx(12, resources)
+        explanationTextView.layoutParams = explanationTextViewLayoutParams
+        explanationTextView.text = resources.getString(R.string.view_device_linking_explanation_3)
+        titleTextView.text = resources.getString(R.string.view_device_linking_title_4)
+        mnemonicTextView.visibility = View.GONE
+        buttonContainer.visibility = View.GONE
+        // TODO: LokiStorageAPI.addDeviceLink(signedDeviceLink).fail { error ->
+        // TODO:     Log.d("Loki", "Failed to add device link due to error: $error.")
+        // TODO: }
+        Handler().postDelayed({
+            delegate?.handleDeviceLinkAuthorized()
+            dismiss?.invoke()
+        }, 4000)
+    }
+    // endregion
+
+    // region Interaction
+    private fun cancel() {
+        // TODO: val session = DeviceLinkingSession.current!!
+        // TODO: session.stopListeningForLinkingRequests()
+        // TODO: session.markLinkingRequestAsProcessed() // Only relevant in master mode
+        delegate?.handleDeviceLinkingDialogDismissed() // Only relevant in slave mode
+        dismiss?.invoke()
+    }
+    // endregion
+}

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

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.loki
+
+interface DeviceLinkingDialogDelegate {
+
+    fun handleDeviceLinkAuthorized() // TODO: Device link
+    fun handleDeviceLinkingDialogDismissed()
+}

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

@@ -19,8 +19,8 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab
         @JvmStatic val createTableCommand = "CREATE TABLE $tableName ($messageID INTEGER PRIMARY KEY, $serverID INTEGER DEFAULT 0, $friendRequestStatus INTEGER DEFAULT 0);"
     }
 
-    override fun getServerIDFromQuote(quoteID: Long, author: String): Long? {
+    override fun getQuoteServerID(quoteID: Long, quoteeHexEncodedPublicKey: String): Long? {
-        val message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteID, Address.fromSerialized(author))
+        val message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteID, Address.fromSerialized(quoteeHexEncodedPublicKey))
         return if (message != null) getServerID(message.getId()) else null
     }
 

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

@@ -50,13 +50,13 @@ class NewConversationActivity : PassphraseRequiredActionBarActivity(), ScanListe
         Permissions.with(this)
             .request(Manifest.permission.CAMERA)
             .ifNecessary()
-            .withPermanentDenialDialog(getString(R.string.fragment_qr_code_camera_permission_dialog_message))
+            .withPermanentDenialDialog(getString(R.string.fragment_scan_qr_code_camera_permission_dialog_message))
             .onAllGranted {
                 val fragment = ScanQRCodeFragment()
                 fragment.scanListener = this
                 supportFragmentManager.beginTransaction().replace(android.R.id.content, fragment).addToBackStack(null).commitAllowingStateLoss()
             }
-            .onAnyDenied { Toast.makeText(this, R.string.fragment_qr_code_camera_permission_dialog_message, Toast.LENGTH_SHORT).show() }
+            .onAnyDenied { Toast.makeText(this, R.string.fragment_scan_qr_code_camera_permission_dialog_message, Toast.LENGTH_SHORT).show() }
             .execute()
     }
 

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

@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.loki
+
+import android.content.Context
+import android.support.v7.app.AlertDialog
+import android.util.AttributeSet
+import android.util.DisplayMetrics
+import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.view_qr_code.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.qr.QrCode
+import org.thoughtcrime.securesms.util.ServiceUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+
+object QRCodeDialog {
+
+    fun show(context: Context) {
+        val view = QRCodeView(context)
+        val dialog = AlertDialog.Builder(context).setView(view).show()
+        view.onCancel = { dialog.dismiss() }
+    }
+}
+
+class QRCodeView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) {
+    var onCancel: (() -> Unit)? = null
+
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+    constructor(context: Context) : this(context, null)
+
+    init {
+        inflate(context, R.layout.view_qr_code, this)
+        val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
+        val displayMetrics = DisplayMetrics()
+        ServiceUtil.getWindowManager(context).defaultDisplay.getMetrics(displayMetrics)
+        val size = displayMetrics.widthPixels - 2 * toPx(96, resources)
+        val qrCode = QrCode.create(hexEncodedPublicKey, size)
+        qrCodeImageView.setImageBitmap(qrCode)
+        cancelButton.setOnClickListener { onCancel?.invoke() }
+    }
+}

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

@@ -1,37 +0,0 @@
-package org.thoughtcrime.securesms.loki
-
-import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.util.DisplayMetrics
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import kotlinx.android.synthetic.main.fragment_qr_code.*
-import network.loki.messenger.R
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity
-import org.thoughtcrime.securesms.qr.QrCode
-import org.thoughtcrime.securesms.util.ServiceUtil.getWindowManager
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-
-class QRCodeFragment : Fragment() {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_qr_code, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
-        val displayMetrics = DisplayMetrics()
-        getWindowManager(context).defaultDisplay.getMetrics(displayMetrics)
-        val size = displayMetrics.widthPixels - 2 * toPx(32, resources)
-        val qrCode = QrCode.create(hexEncodedPublicKey, size)
-        qrCodeImageView.setImageBitmap(qrCode)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        val activity = activity as ApplicationPreferencesActivity
-        activity.supportActionBar!!.setTitle(R.string.fragment_qr_code_title)
-    }
-}