add multi-device-setup

AndroidManifest.xml

@@ -294,6 +294,10 @@
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".qr.BackupTransferActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
         <activity android:name=".preferences.ChatBackgroundActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

build.gradle

@@ -97,7 +97,7 @@ android {
 
     defaultConfig {
         versionCode 649
-        versionName "1.35.1"
+        versionName "1.35.3"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true

jni/dc_wrapper.c

@@ -39,7 +39,7 @@ int sendmmsg(int sockfd, struct mmsghdr *msgvec, unsigned int vlen,
 int recvmmsg(int sockfd, struct mmsghdr *msgvec, unsigned int vlen,
              int flags, struct timespec *timeout)
 {
-    if (flags != -1) {
+    if (flags != 0) {
         // Not supported by the fallback.
         return -1;
     }
@@ -958,6 +958,21 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_imexHasBackup(JNIEnv *env, j
 }
 
 
+JNIEXPORT jlong Java_com_b44t_messenger_DcContext_newBackupProviderCPtr(JNIEnv *env, jobject obj)
+{
+    return (jlong)dc_backup_provider_new(get_dc_context(env, obj));
+}
+
+
+JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_receiveBackup(JNIEnv *env, jobject obj, jstring qr)
+{
+    CHAR_REF(qr);
+        jboolean ret = dc_receive_backup(get_dc_context(env, obj), qrPtr);
+    CHAR_UNREF(qr);
+    return ret;
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcContext_addAddressBook(JNIEnv *env, jobject obj, jstring adrbook)
 {
     CHAR_REF(adrbook);
@@ -1956,6 +1971,55 @@ JNIEXPORT void Java_com_b44t_messenger_DcLot_unrefLotCPtr(JNIEnv *env, jobject o
 }
 
 
+/*******************************************************************************
+ * DcBackupProvider
+ ******************************************************************************/
+
+
+static dc_backup_provider_t* get_dc_backup_provider(JNIEnv *env, jobject obj)
+{
+    static jfieldID fid = 0;
+    if (fid==0) {
+        jclass cls = (*env)->GetObjectClass(env, obj);
+        fid = (*env)->GetFieldID(env, cls, "backupProviderCPtr", "J" /*Signature, J=long*/);
+    }
+    if (fid) {
+        return (dc_backup_provider_t*)(*env)->GetLongField(env, obj, fid);
+    }
+    return NULL;
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_DcBackupProvider_unrefBackupProviderCPtr(JNIEnv *env, jobject obj)
+{
+    dc_backup_provider_unref(get_dc_backup_provider(env, obj));
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQr(JNIEnv *env, jobject obj)
+{
+    char* temp = dc_backup_provider_get_qr(get_dc_backup_provider(env, obj));
+        jstring ret = JSTRING_NEW(temp);
+    dc_str_unref(temp);
+    return ret;
+}
+
+
+JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQrSvg(JNIEnv *env, jobject obj)
+{
+    char* temp = dc_backup_provider_get_qr_svg(get_dc_backup_provider(env, obj));
+        jstring ret = JSTRING_NEW(temp);
+    dc_str_unref(temp);
+    return ret;
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_DcBackupProvider_waitForReceiver(JNIEnv *env, jobject obj)
+{
+    dc_backup_provider_wait(get_dc_backup_provider(env, obj));
+}
+
+
 /*******************************************************************************
  * DcProvider
  ******************************************************************************/

res/drawable/ic_baseline_devices_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/pref_icon_tint"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
+</vector>

res/layout/backup_provider_activity.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+	android:id="@+id/backup_provider_fragment" />

res/layout/backup_provider_fragment.xml

@@ -0,0 +1,111 @@
+<?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="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical">
+
+	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
+		android:id="@+id/status_line"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="40sp"
+		android:gravity="center_horizontal"
+		android:textAlignment="center"
+		android:textColor="?attr/emoji_text_color"
+		android:textSize="20sp"
+		tools:text="One moment..."/>
+
+	<ProgressBar
+		android:id="@+id/progress_bar"
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		/>
+
+	<LinearLayout
+		android:id="@+id/top_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:orientation="vertical"
+		android:visibility="gone"
+		tools:visibility="visible">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="8dp"
+				android:layout_marginRight="8dp"
+				android:gravity="center_vertical"
+				android:text="➊"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/> <!-- idk - using sightly larger text size moves the next text down -->
+			<TextView
+				android:id="@+id/same_network_hint"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:text="@string/multidevice_same_network_hint"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="8dp"
+				android:layout_marginRight="8dp"
+				android:gravity="center_vertical"
+				android:text="➋"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/>
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/multidevice_install_dc_on_other_device"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="8dp"
+				android:layout_marginRight="8dp"
+				android:gravity="center_vertical"
+				android:text="➌"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/>
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/multidevice_tap_scan_on_other_device"
+				android:textColor="?attr/emoji_text_color"
+				android:textSize="16sp"/>
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<com.caverock.androidsvg.SVGImageView
+		android:id="@+id/qrImage"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		android:layout_marginBottom="16dp"
+		android:contentDescription="@string/qrscan_title" />
+
+</LinearLayout>

res/layout/backup_receiver_fragment.xml

@@ -0,0 +1,38 @@
+<?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="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical">
+
+	<TextView
+		android:id="@+id/status_line"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="40sp"
+		android:gravity="center_horizontal"
+		android:textAlignment="center"
+		android:textColor="?attr/emoji_text_color"
+		android:textSize="20sp"
+		tools:text="One moment..."/>
+
+	<ProgressBar
+		android:id="@+id/progress_bar"
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		/>
+
+	<TextView
+		android:id="@+id/same_network_hint"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_margin="16dp"
+		android:layout_weight="1"
+		android:gravity="bottom"
+		android:text="@string/multidevice_same_network_hint"
+		android:textColor="@color/gray50"
+		android:textSize="16sp"/>
+
+</LinearLayout>

res/layout/welcome_activity.xml

@@ -68,7 +68,7 @@
             android:layout_height="wrap_content"
             android:paddingLeft="24dp"
             android:paddingRight="24dp"
-            android:text="@string/scan_invitation_code"/>
+            android:text="@string/qrscan_title"/>
 
     </LinearLayout>
 

res/menu/backup_transfer_menu.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/troubleshooting"
+          android:id="@+id/troubleshooting"
+          app:showAsAction="never"/>
+
+    <item android:title="@string/menu_copy_to_clipboard"
+          android:id="@+id/copy"
+          android:visible="false"
+          app:showAsAction="never"/>
+
+    <item android:title="@string/pref_view_log"
+          android:id="@+id/view_log_button"
+          app:showAsAction="never"/>
+
+</menu>

res/values/strings.xml

@@ -465,6 +465,33 @@
     <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
     <string name="aeap_explanation">You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt\'s highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet.</string>
 
+
+    <!-- Multi Device -->
+    <!-- "Second Device" can also be translated as "Another Device", if that is catchier in the destination language. However, make sure to use the term consistently. -->
+    <string name="multidevice_title">Add Second Device</string>
+    <string name="multidevice_same_network_hint">Make sure both devices are on the same Wi-Fi or network</string>
+    <string name="multidevice_install_dc_on_other_device">Install Delta Chat 1.36 or newer on your other device (https://get.delta.chat)</string>
+    <string name="multidevice_tap_scan_on_other_device">Start Delta Chat, tap “Scan QR Code” and scan the code shown here</string>
+    <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
+    <string name="multidevice_qr_subtitle">Scan to set up second device for %1$s</string>
+    <string name="multidevice_reveiver_title">Add as Second Device</string>
+    <string name="multidevice_receiver_scanning_ask">Copy the account from the other device to this device?</string>
+    <string name="multidevice_abort">Abort setting up second device?</string>
+    <string name="multidevice_abort_will_invalidate_copied_qr">This will invalidate the QR code copied to clipboard.</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="exporting_account">Exporting account…</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="preparing_account">Preparing account…</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="account_prepared">Account prepared.</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="waiting_for_receiver">Waiting for receiver…</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="receiver_connected">Receiver connected…</string>
+    <!-- Shown beside progress bar, stay short -->
+    <string name="transferring">Transferring…</string>
+    <string name="troubleshooting">Troubleshooting</string>
+
     <!-- Connectivity -->
     <!-- Headline for the "Inbox" eg. in the "Connectivity" view -->
     <string name="incoming_messages">Incoming Messages</string>

res/xml/preferences.xml

@@ -20,6 +20,11 @@
                 android:icon="@drawable/ic_brightness_6_24dp"
                 android:layout="@layout/preference_item" />
 
+    <Preference android:key="preference_category_multidevice"
+                android:title="@string/multidevice_title"
+                android:icon="@drawable/ic_baseline_devices_24"
+                android:layout="@layout/preference_item"/>
+
     <Preference android:key="preference_category_connectivity"
                 android:title="@string/connectivity"
                 android:icon="@drawable/ic_swap_vert_24dp"

src/com/b44t/messenger/DcBackupProvider.java

@@ -0,0 +1,32 @@
+package com.b44t.messenger;
+
+public class DcBackupProvider {
+
+    public DcBackupProvider(long backupProviderCPtr) {
+        this.backupProviderCPtr = backupProviderCPtr;
+    }
+
+    public boolean isOk() {
+      return backupProviderCPtr != 0;
+    }
+
+    @Override protected void finalize() throws Throwable {
+        super.finalize();
+        unref();
+    }
+
+    public void unref() {
+        if (backupProviderCPtr == 0) {
+            unrefBackupProviderCPtr();
+            backupProviderCPtr = 0;
+        }
+    }
+
+    public native String    getQr           ();
+    public native String    getQrSvg        ();
+    public native void      waitForReceiver ();
+
+    // working with raw c-data
+    private long        backupProviderCPtr;    // CAVE: the name is referenced in the JNI
+    private native void unrefBackupProviderCPtr();
+}

src/com/b44t/messenger/DcContext.java

@@ -49,6 +49,7 @@ public class DcContext {
     public final static int DC_QR_FPR_MISMATCH      = 220;
     public final static int DC_QR_FPR_WITHOUT_ADDR  = 230;
     public final static int DC_QR_ACCOUNT           = 250;
+    public final static int DC_QR_BACKUP            = 251;
     public final static int DC_QR_WEBRTC            = 260;
     public final static int DC_QR_ADDR              = 320;
     public final static int DC_QR_TEXT              = 330;
@@ -148,6 +149,8 @@ public void unref() {
     public native boolean      continueKeyTransfer  (int msg_id, String setup_code);
     public native void         imex                 (int what, String dir);
     public native String       imexHasBackup        (String dir);
+    public DcBackupProvider    newBackupProvider    () { return new DcBackupProvider(newBackupProviderCPtr()); }
+    public native boolean      receiveBackup        (String qr);
     public native boolean      mayBeValidAddr       (String addr);
     public native int          lookupContactIdByAddr(String addr);
     public native int[]        getContacts          (int flags, String query);
@@ -251,4 +254,5 @@ public String getNameNAddr() {
     private native long getLocationsCPtr (int chat_id, int contact_id, long timestamp_start, long timestamp_end);
     private native long checkQrCPtr      (String qr);
     private native long getProviderFromEmailWithDnsCPtr  (String addr);
+    private native long newBackupProviderCPtr();
 }