diff --git a/res/drawable/icon_link.xml b/res/drawable/icon_link.xml
new file mode 100644
index 0000000000..fdabbd20d4
--- /dev/null
+++ b/res/drawable/icon_link.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/layout/fragment_qr_code.xml b/res/layout/fragment_qr_code.xml
deleted file mode 100644
index 8a3df0f20b..0000000000
--- a/res/layout/fragment_qr_code.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/view_device_linking.xml b/res/layout/view_device_linking.xml
new file mode 100644
index 0000000000..b16429e9b1
--- /dev/null
+++ b/res/layout/view_device_linking.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/view_qr_code.xml b/res/layout/view_qr_code.xml
new file mode 100644
index 0000000000..57cfc4b024
--- /dev/null
+++ b/res/layout/view_qr_code.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02a9c47c6e..f0dfd8f41a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1575,6 +1575,7 @@
Copied to clipboard
Share Public Key
Show QR Code
+ Link Device
Show Seed
Your Seed
Copy
@@ -1610,13 +1611,24 @@
Pending Friend Request…
New Message
-
- Your QR Code
- This is your personal QR code. Other people can scan it to start a secure conversation with you.
- Loki Messenger needs camera access to scan QR codes.
+
+ Your QR Code
+ This is your personal QR code. Other people can scan it to start a secure conversation with you.
+ Cancel
+
+ Waiting for Device
+ Waiting for Authorization
+ Linking Request Received
+ Device Link Authorized
+ 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
+ Please check that the words below match the ones shown on your other device
+ Your device has been linked successfully
+ Authorize
+ Cancel
Scan QR Code
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\".
+ Loki Messenger needs camera access to scan QR codes.
Copy public key
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 850e9c2734..99aa910c01 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -41,6 +41,10 @@
android:title="@string/activity_settings_show_qr_code_button_title"
android:icon="@drawable/icon_qr_code"/>
+
+
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 89df173c6f..49390c5be8 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/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);
diff --git a/src/org/thoughtcrime/securesms/loki/DeviceLinkingDialog.kt b/src/org/thoughtcrime/securesms/loki/DeviceLinkingDialog.kt
new file mode 100644
index 0000000000..2cb86b9a8a
--- /dev/null
+++ b/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
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/DeviceLinkingDialogDelegate.kt b/src/org/thoughtcrime/securesms/loki/DeviceLinkingDialogDelegate.kt
new file mode 100644
index 0000000000..61e73408cf
--- /dev/null
+++ b/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()
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt
index 9611c826a3..26d93228e4 100644
--- a/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt
+++ b/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? {
- val message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteID, Address.fromSerialized(author))
+ override fun getQuoteServerID(quoteID: Long, quoteeHexEncodedPublicKey: String): Long? {
+ val message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quoteID, Address.fromSerialized(quoteeHexEncodedPublicKey))
return if (message != null) getServerID(message.getId()) else null
}
diff --git a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
index e67efcdde7..bacbdaa5f4 100644
--- a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
+++ b/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()
}
diff --git a/src/org/thoughtcrime/securesms/loki/QRCodeDialog.kt b/src/org/thoughtcrime/securesms/loki/QRCodeDialog.kt
new file mode 100644
index 0000000000..c82694db88
--- /dev/null
+++ b/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() }
+ }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/QRCodeFragment.kt b/src/org/thoughtcrime/securesms/loki/QRCodeFragment.kt
deleted file mode 100644
index 3e15a97059..0000000000
--- a/src/org/thoughtcrime/securesms/loki/QRCodeFragment.kt
+++ /dev/null
@@ -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)
- }
-}
\ No newline at end of file