bump version

add verify-contact activities

AndroidManifest.xml

@@ -5,10 +5,6 @@
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference"/>
 
-    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
-                android:label="Access to TextSecure Secrets"
-                android:protectionLevel="signature" />
-
     <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
     <uses-feature android:name="android.hardware.location" android:required="false"/>
@@ -28,13 +24,6 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
 
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
 
@@ -88,10 +77,6 @@
     <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
-    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
-                android:protectionLevel="signature" />
-    <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
-
     <application android:name=".ApplicationContext"
                  android:icon="@mipmap/ic_launcher_dev"
                  android:label="@string/app_name"
@@ -117,9 +102,6 @@
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
               android:launchMode="singleTask"/>
 
-    <activity android:name=".CountrySelectionActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".InviteActivity"
               android:theme="@style/TextSecure.HighlightTheme"
               android:windowSoftInputMode="stateHidden"
@@ -213,11 +195,6 @@
           android:windowSoftInputMode="stateVisible"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".DatabaseMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".DatabaseUpgradeActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
@@ -323,6 +300,14 @@
               android:windowSoftInputMode="stateVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".QrScanActivity"
+            android:theme="@style/TextSecure.LightTheme"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+     <activity android:name=".QrShowActivity"
+            android:theme="@style/TextSecure.LightTheme"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".ClearProfileAvatarActivity"
               android:theme="@style/Theme.AppCompat.Dialog.Alert"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -347,24 +332,14 @@
               android:theme="@style/TextSecure.LightNoActionBar"
               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"/>
+
     <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
-    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
 
-    <service android:name=".service.QuickResponseService"
-             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
-             android:exported="true" >
-        <intent-filter>
-            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:scheme="sms" />
-            <data android:scheme="smsto" />
-            <data android:scheme="mms" />
-            <data android:scheme="mmsto" />
-        </intent-filter>
-    </service>
-
     <service android:name=".service.AccountAuthenticatorService" android:exported="true">
         <intent-filter>
             <action android:name="android.accounts.AccountAuthenticator" />
@@ -396,39 +371,6 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.SmsListener"
-              android:permission="android.permission.BROADCAST_SMS"
-              android:enabled="true"
-              android:exported="true">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
-             </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.SmsDeliveryListener"
-              android:exported="true">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.MmsListener"
-              android:enabled="true"
-              android:exported="true"
-              android:permission="android.permission.BROADCAST_WAP_PUSH">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-    </receiver>
-
     <receiver android:name=".notifications.MarkReadReceiver"
               android:enabled="true"
               android:exported="false">
@@ -466,15 +408,15 @@
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"
-              android:authorities="org.thoughtcrime.provider.securesms" />
+              android:authorities="${applicationId}.provider.securesms" />
 
     <provider android:name=".providers.MmsBodyProvider"
               android:grantUriPermissions="true"
               android:exported="false"
-              android:authorities="org.thoughtcrime.provider.securesms.mms" />
+              android:authorities="${applicationId}.provider.securesms.mms" />
 
     <provider android:name="android.support.v4.content.FileProvider"
-              android:authorities="org.thoughtcrime.securesms.fileprovider"
+              android:authorities="${applicationId}.fileprovider"
               android:exported="false"
               android:grantUriPermissions="true">
 
@@ -482,6 +424,13 @@
 
     </provider>
 
+    <provider
+        android:name=".connect.AttachmentsContentProvider"
+        android:authorities="${applicationId}.attachments"
+        android:grantUriPermissions="true"
+        android:exported="false">
+    </provider>
+
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -501,13 +450,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.LocalBackupListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.PersistentConnectionBootListener">
+        <receiver android:name=".service.PersistentConnectionBootListener">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
         </intent-filter>

build.gradle

@@ -83,6 +83,8 @@ dependencies {
     compile 'org.whispersystems:signal-service-android:2.7.6'
     compile 'org.whispersystems:webrtc-android:M68'
 
+    compile 'com.journeyapps:zxing-android-embedded:3.4.0'
+
     compile "me.leolin:ShortcutBadger:1.1.16"
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.jpardogo.materialtabstrip:library:1.0.9'
@@ -96,7 +98,6 @@ dependencies {
     compile 'pl.tajchert:waitingdots:0.1.0'
     compile 'com.soundcloud.android:android-crop:0.9.10@aar'
     compile 'com.melnykov:floatingactionbutton:1.3.0'
-    compile 'com.google.zxing:android-integration:3.1.0'
     compile 'com.squareup.dagger:dagger:1.2.2'
     annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
     compile 'mobi.upod:time-duration-picker:1.1.3'
@@ -185,7 +186,6 @@ dependencyVerification {
         'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
         'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c',
         'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
-        'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
         'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
         'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
         'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
@@ -255,8 +255,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 392
-        versionName "4.24.7"
+        versionCode 397
+        versionName "0.0.7"
         applicationId "chat.delta.androidii"
 
         minSdkVersion 14

jni/Android.mk

@@ -871,7 +871,7 @@ LOCAL_STATIC_LIBRARIES :=  etpan sasl2 sqlite crypto libiconv
 # "breakpad" was placed after "crypto", NativeLoader.cpp after dc_wrapper.c
 
 LOCAL_CFLAGS 	:= -w -Os -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno
+LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno -std=c99
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math -D__STDC_CONSTANT_MACROS
 
 LOCAL_SRC_FILES := \
@@ -927,7 +927,6 @@ messenger-backend/src/dc_strbuilder.c \
 messenger-backend/src/dc_strencode.c \
 messenger-backend/src/dc_token.c \
 messenger-backend/src/dc_tools.c \
-messenger-backend/src/dc_uudecode.c \
 dc_wrapper.c
 
 include $(BUILD_SHARED_LIBRARY)

jni/Application.mk

@@ -1,5 +1,5 @@
+APP_PLATFORM := android-14
 APP_ABI := armeabi armeabi-v7a x86
-APP_PLATFORM := android-9
-APP_STL := stlport_static
-APP_CPPFLAGS += -fexceptions
-APP_OPTIM := debug
+NDK_TOOLCHAIN_VERSION := 4.9
+APP_STL := gnustl_static
+

jni/dc_wrapper.c

@@ -345,9 +345,9 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_blockContact(JNIEnv *env, jobje
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_deleteContact(JNIEnv *env, jobject obj, jint contact_id)
+JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_deleteContact(JNIEnv *env, jobject obj, jint contact_id)
 {
-	return (jint)dc_delete_contact(get_dc_context(env, obj), contact_id);
+	return (jboolean)dc_delete_contact(get_dc_context(env, obj), contact_id);
 }
 
 
@@ -499,9 +499,9 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getMsgCPtr(JNIEnv *env, jobjec
 }
 
 
-JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj)
+JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj, jint viewtype)
 {
-	return (jlong)dc_msg_new(get_dc_context(env, obj));
+	return (jlong)dc_msg_new(get_dc_context(env, obj), viewtype);
 }
 
 
@@ -547,34 +547,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendTextMsg(JNIEnv *env, jobjec
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendVcardMsg(JNIEnv *env, jobject obj, jint chat_id, jint contact_id)
-{
-	return dc_send_vcard_msg(get_dc_context(env, obj), chat_id, contact_id);
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendMediaMsg(JNIEnv *env, jobject obj, jint chat_id, jint type, jstring file, jstring mime, jint w, jint h, jint ms, jstring author, jstring trackname)
-{
-	jint msg_id = 0;
-	CHAR_REF(file);
-	CHAR_REF(mime);
-	CHAR_REF(author);
-	CHAR_REF(trackname);
-	switch (type) {
-		case DC_MSG_IMAGE: msg_id = (jint)dc_send_image_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, w, h); break;
-		case DC_MSG_VIDEO: msg_id = (jint)dc_send_video_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, w, h, ms); break;
-		case DC_MSG_VOICE: msg_id = (jint)dc_send_voice_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, ms); break;
-		case DC_MSG_AUDIO: msg_id = (jint)dc_send_audio_msg(get_dc_context(env, obj), chat_id, filePtr, mimePtr, ms, authorPtr, tracknamePtr); break;
-		default:           msg_id = (jint)dc_send_file_msg (get_dc_context(env, obj), chat_id, filePtr, mimePtr); break;
-	}
-	CHAR_UNREF(trackname);
-	CHAR_UNREF(author);
-	CHAR_UNREF(mime);
-	CHAR_UNREF(file);
-	return msg_id;
-}
-
-
 /* DcContext - handle config */
 
 JNIEXPORT void Java_com_b44t_messenger_DcContext_setConfig(JNIEnv *env, jobject obj, jstring key, jstring value /*may be NULL*/)
@@ -587,39 +559,20 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_setConfig(JNIEnv *env, jobject
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcContext_setConfigInt(JNIEnv *env, jobject obj, jstring key, jint value)
-{
-	CHAR_REF(key);
-		dc_set_config_int(get_dc_context(env, obj), keyPtr, value);
-	CHAR_UNREF(key);
-}
-
-
 JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getConfig(JNIEnv *env, jobject obj, jstring key, jstring def/*may be NULL*/)
 {
 	CHAR_REF(key);
-	CHAR_REF(def);
-		char* temp = dc_get_config(get_dc_context(env, obj), keyPtr, defPtr /*is NULL if value is NULL, CHAR_REF() handles this*/);
+		char* temp = dc_get_config(get_dc_context(env, obj), keyPtr);
 			jstring ret = NULL;
 			if (temp) {
 				ret = JSTRING_NEW(temp);
 			}
 		free(temp);
 	CHAR_UNREF(key);
-	CHAR_UNREF(def);
 	return ret; /* returns NULL only if key is unset and "def" is NULL */
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcContext_getConfigInt(JNIEnv *env, jobject obj, jstring key, jint def)
-{
-	CHAR_REF(key);
-		jint ret = dc_get_config_int(get_dc_context(env, obj), keyPtr, def);
-	CHAR_UNREF(key);
-	return ret;
-}
-
-
 /* DcContext - out-of-band verification */
 
 JNIEXPORT jlong Java_com_b44t_messenger_DcContext_checkQrCPtr(JNIEnv *env, jobject obj, jstring qr)
@@ -773,6 +726,12 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcChatlist_getChatCPtr(JNIEnv *env, jobj
 }
 
 
+JNIEXPORT jint Java_com_b44t_messenger_DcChatlist_getMsgId(JNIEnv *env, jobject obj, jint index)
+{
+	return dc_chatlist_get_msg_id(get_dc_chatlist(env, obj), index);
+}
+
+
 JNIEXPORT jlong Java_com_b44t_messenger_DcChatlist_getMsgCPtr(JNIEnv *env, jobject obj, jint index)
 {
 	dc_chatlist_t* chatlist = get_dc_chatlist(env, obj);
@@ -981,7 +940,7 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getTimestamp(JNIEnv *env, jobject
 
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getType(JNIEnv *env, jobject obj)
 {
-	return dc_msg_get_type(get_dc_msg(env, obj));
+	return dc_msg_get_viewtype(get_dc_msg(env, obj));
 }
 
 
@@ -1029,9 +988,9 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_lateFilingMediaSize(JNIEnv *env, jo
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getBytes(JNIEnv *env, jobject obj)
+JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getFilebytes(JNIEnv *env, jobject obj)
 {
-	return (jint)dc_msg_get_filebytes(get_dc_msg(env, obj));
+	return (jlong)dc_msg_get_filebytes(get_dc_msg(env, obj));
 }
 
 
@@ -1083,12 +1042,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getFilename(JNIEnv *env, jobject
 }
 
 
-JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getMediainfoCPtr(JNIEnv *env, jobject obj)
-{
-	return (jlong)dc_msg_get_mediainfo(get_dc_msg(env, obj));
-}
-
-
 JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isForwarded(JNIEnv *env, jobject obj)
 {
     return dc_msg_is_forwarded(get_dc_msg(env, obj))!=0;
@@ -1122,12 +1075,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getSetupCodeBegin(JNIEnv *env, j
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setType(JNIEnv *env, jobject obj, int type)
-{
-    dc_msg_set_type(get_dc_msg(env, obj), type);
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_setText(JNIEnv *env, jobject obj, jstring text)
 {
 	CHAR_REF(text);
@@ -1158,16 +1105,6 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_setDuration(JNIEnv *env, jobject ob
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setMediainfo(JNIEnv *env, jobject obj, jstring author, jstring trackname)
-{
-	CHAR_REF(author);
-	CHAR_REF(trackname);
-		dc_msg_set_mediainfo(get_dc_msg(env, obj), authorPtr, tracknamePtr);
-	CHAR_UNREF(trackname);
-	CHAR_UNREF(author);
-}
-
-
 /*******************************************************************************
  * DcContact
  ******************************************************************************/

proguard.cfg

@@ -5,4 +5,8 @@
 -keepclassmembers class ** {
     public void onEvent*(**);
 }
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
 

res/drawable/attachment_selector_shadow.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/transparent_black_30"
+        android:endColor="@color/transparent_black"
+        android:angle="90"/>
+
+</shape>

res/drawable/ic_help_24dp.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_help_white_24dp"
+    android:tint="?attr/pref_icon_tint"/>

res/drawable/ic_invite_24dp.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_mood_white_24dp"
+    android:tint="?attr/pref_icon_tint"/>

res/drawable/message_bubble_background_received_alone.xml

@@ -6,7 +6,11 @@
         android:bottom="2px">
 
         <shape android:shape="rectangle">
-            <corners android:radius="@dimen/message_corner_radius"/>
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomRightRadius="@dimen/message_corner_radius"
+                android:bottomLeftRadius="@dimen/message_corner_collapse_radius" />
             <solid android:color="@color/white" />
         </shape>
     </item>

res/drawable/message_bubble_background_sent_alone.xml

@@ -6,7 +6,11 @@
         android:bottom="2px">
 
         <shape android:shape="rectangle">
-            <corners android:radius="@dimen/message_corner_radius"/>
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomRightRadius="@dimen/message_corner_collapse_radius"
+                android:bottomLeftRadius="@dimen/message_corner_radius" />
             <solid android:color="@color/white" />
         </shape>
     </item>

res/drawable/no_message_rounded_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#8000" />
+    <padding
+        android:left="1dp"
+        android:right="1dp"
+        android:bottom="1dp"
+        android:top="1dp" />
+    <corners android:radius="8dp" />
+</shape>

res/layout/activity_qr_scan.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.journeyapps.barcodescanner.CompoundBarcodeView
+        android:id="@+id/zxing_barcode_scanner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true" />
+
+</RelativeLayout>

res/layout/activity_qr_show.xml

@@ -0,0 +1,26 @@
+<?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"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/qrImage"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:contentDescription="@string/qr_scan_activity__title" />
+
+    <TextView
+        android:id="@+id/qrShowHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:text=""
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        android:textSize="16sp" />
+
+</LinearLayout>

res/layout/activity_select_chat_background.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/preview"
+        android:scaleType="centerCrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="bottom">
+
+        <Button
+            android:id="@+id/set_default_button"
+            android:theme="@style/Button.Primary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="Set default" />
+
+        <Button
+            android:id="@+id/from_gallery_button"
+            android:theme="@style/Button.Primary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="From gallery" />
+    </LinearLayout>
+
+</FrameLayout>

res/layout/alert_view.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-    <ImageView
-        android:id="@+id/sms_failed_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_error"
-        android:visibility="gone"
-        android:tint="@color/core_red"
-        tools:visibility="visible"
-        android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
-
-    <ImageView
-        android:id="@+id/pending_approval_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_error"
-        android:tint="@color/core_light_60"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/conversation_item_sent__pending_approval_description" />
-
-</merge>

res/layout/attachment_type_selector.xml

@@ -1,224 +1,235 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attachment_type_selector_background">
+              android:layout_height="wrap_content">
 
-    <org.thoughtcrime.securesms.components.RecentPhotoViewRail
-            android:id="@+id/recent_photos"
-            android:layout_width="match_parent"
-            android:layout_height="90dp"
-            android:padding="4dp"/>
+    <View android:layout_width="match_parent"
+          android:layout_height="4dp"
+          android:background="@drawable/attachment_selector_shadow"/>
 
-    <LinearLayout android:orientation="horizontal"
+    <LinearLayout android:orientation="vertical"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="16dp"
-                  android:layout_marginRight="16dp"
-                  android:layout_marginTop="16dp"
-                  android:weightSum="4">
+                  android:background="?attachment_type_selector_background">
 
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
+        <org.thoughtcrime.securesms.components.RecentPhotoViewRail
+                android:id="@+id/recent_photos"
+                android:layout_width="match_parent"
+                android:layout_height="90dp"
+                android:padding="4dp"/>
 
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/gallery_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_image_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__gallery_description"
-                    app:circleColor="@color/purple_400"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      style="@style/AttachmentTypeLabel"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/attachment_type_selector__gallery"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:layout_weight="1"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/audio_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_headset_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__audio_description"
-                    app:circleColor="@color/orange_400"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__audio"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:layout_weight="1"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/document_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_insert_drive_file_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__file_description"
-                    app:circleColor="@color/red_400"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      style="@style/AttachmentTypeLabel"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/attachment_type_selector__file"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:orientation="vertical"
-                      android:layout_weight="1">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/contact_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_person_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__contact_description"
-                    app:circleColor="@color/blue_400"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__contact"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="16dp"
-                  android:layout_marginLeft="16dp"
-                  android:layout_marginRight="16dp"
-                  android:layout_marginBottom="16dp"
-                  android:weightSum="4">
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/camera_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_camera_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__camera_description"
-                    app:circleColor="@color/green_400"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__camera"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/location_linear_layout"
+        <LinearLayout android:orientation="horizontal"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
+                      android:layout_marginLeft="16dp"
+                      android:layout_marginRight="16dp"
+                      android:layout_marginTop="16dp"
+                      android:weightSum="4">
 
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/location_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_location_on_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__location_description"
-                    app:circleColor="@color/blue_grey_400"/>
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
 
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__location"/>
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/gallery_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_image_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__gallery_description"
+                        app:circleColor="@color/purple_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          style="@style/AttachmentTypeLabel"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/attachment_type_selector__gallery"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          android:layout_weight="1"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/audio_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_headset_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__audio_description"
+                        app:circleColor="@color/orange_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          style="@style/AttachmentTypeLabel"
+                          android:text="@string/attachment_type_selector__audio"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          android:layout_weight="1"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/document_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_insert_drive_file_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__file_description"
+                        app:circleColor="@color/red_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          style="@style/AttachmentTypeLabel"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/attachment_type_selector__file"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          android:orientation="vertical"
+                          android:layout_weight="1">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/contact_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_person_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__contact_description"
+                        app:circleColor="@color/blue_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          style="@style/AttachmentTypeLabel"
+                          android:text="@string/attachment_type_selector__contact"/>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-
-        <LinearLayout android:layout_width="match_parent"
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
+                      android:layout_marginTop="16dp"
+                      android:layout_marginLeft="16dp"
+                      android:layout_marginRight="16dp"
+                      android:layout_marginBottom="16dp"
+                      android:weightSum="4">
 
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/giphy_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_gif_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__gif_description"
-                    app:circleColor="@color/cyan_400"/>
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/camera_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_camera_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__camera_description"
+                        app:circleColor="@color/green_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          style="@style/AttachmentTypeLabel"
+                          android:text="@string/attachment_type_selector__camera"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/location_linear_layout"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/location_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_location_on_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__location_description"
+                        app:circleColor="@color/blue_grey_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          style="@style/AttachmentTypeLabel"
+                          android:text="@string/attachment_type_selector__location"/>
+
+            </LinearLayout>
+
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/giphy_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_gif_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__gif_description"
+                        app:circleColor="@color/cyan_400"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          style="@style/AttachmentTypeLabel"
+                          android:text="@string/attachment_type_selector__gif"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/close_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__drawer_description"
+                        app:circleColor="@color/gray50"/>
+
+                <TextView android:layout_marginTop="10dp"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          style="@style/AttachmentTypeLabel"
+                          android:text=" "/>
+
+            </LinearLayout>
 
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__gif"/>
 
         </LinearLayout>
 
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/close_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__drawer_description"
-                    app:circleColor="@color/gray50"/>
-
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text=" "/>
-
-        </LinearLayout>
-
-
     </LinearLayout>
 
 </LinearLayout>

res/layout/audio_view.xml

@@ -20,17 +20,6 @@
                     android:layout_gravity="center"
                     android:gravity="center">
 
-                <com.pnikosis.materialishprogress.ProgressWheel
-                        android:id="@+id/download_progress"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:visibility="gone"
-                        android:layout_gravity="center"
-                        app:matProg_barColor="@color/white"
-                        app:matProg_linearProgress="true"
-                        app:matProg_spinSpeed="0.333"
-                        tools:visibility="gone"/>
-
                 <ImageView android:id="@+id/play"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
@@ -56,16 +45,6 @@
                            android:scaleType="centerInside"
                            android:contentDescription="@string/audio_view__pause_accessibility_description"/>
 
-                <ImageView android:id="@+id/download"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:clickable="true"
-                           android:visibility="gone"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_download_circle_fill_white_48dp"
-                           android:contentDescription="@string/audio_view__download_accessibility_description"/>
-
             </org.thoughtcrime.securesms.components.AnimatingToggle>
 
             <SeekBar android:id="@+id/seek"

res/layout/contact_selection_list_fragment.xml

@@ -34,59 +34,4 @@
         android:visibility="gone"
         android:layout_gravity="end"/>
 
-    <LinearLayout android:id="@+id/show_contacts_container"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:layout_gravity="center"
-                  android:visibility="gone"
-                  tools:visibility="visible">
-
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-            <com.pnikosis.materialishprogress.ProgressWheel
-                    android:id="@+id/progress"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="invisible"
-                    app:matProg_circleRadius="145dp"
-                    app:matProg_barWidth="6dp"
-                    app:matProg_rimColor="@color/signal_primary"
-                    app:matProg_barColor="@color/signal_primary_dark"
-                    app:matProg_progressIndeterminate="true"
-                    tools:visibility="visible"
-                    />
-
-            <ImageView android:layout_gravity="center"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:src="@drawable/no_contacts"/>
-
-
-        </FrameLayout>
-
-        <TextView android:id="@+id/show_contacts_description"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="20dp"
-                  android:layout_marginLeft="50dp"
-                  android:layout_marginRight="50dp"
-                  android:textSize="15sp"
-                  android:lineSpacingMultiplier="1.3"
-                  android:gravity="center"
-                  android:text="@string/contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them"/>
-
-        <Button android:id="@+id/show_contacts_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_gravity="center_horizontal"
-                android:background="@color/signal_primary"
-                android:textColor="@color/white"
-                android:padding="10dp"
-                android:text="@string/contact_selection_list_fragment__show_contacts"/>
-    </LinearLayout>
-
 </FrameLayout>

res/layout/contact_selection_list_item.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <org.thoughtcrime.securesms.contacts.ContactSelectionListItem
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +7,7 @@
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:focusable="true"
-        android:background="@drawable/conversation_item_background"
+        android:background="?attr/conversation_list_item_background"
         android:paddingLeft="48dp"
         android:paddingStart="48dp"
         android:paddingRight="24dp"
@@ -33,15 +32,16 @@
                   android:orientation="vertical">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+            android:drawablePadding="5dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
 
         <LinearLayout android:id="@+id/number_container"
                       android:orientation="horizontal"

res/layout/conversation_activity.xml

@@ -1,98 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<org.thoughtcrime.securesms.components.InputAwareLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/layout_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
-        android:id="@+id/quick_attachment_drawer"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent" android:layout_width="match_parent">
+    <ImageView
+        android:id="@+id/background_imageview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:scaleType="centerCrop"/>
+    <org.thoughtcrime.securesms.components.InputAwareLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:id="@+id/layout_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-    <LinearLayout android:id="@+id/conversation_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical"
-                  android:paddingTop="?attr/actionBarSize"
-                  android:gravity="bottom"
-                  android:clipToPadding="false"
-                  android:clipChildren="false">
+    <org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
+            android:id="@+id/quick_attachment_drawer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <ViewStub android:id="@+id/group_share_profile_view_stub"
-                  android:layout="@layout/conversation_activity_group_share_profile_stub"
-                  android:inflatedId="@+id/group_share_profile_view"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+        <LinearLayout android:id="@+id/conversation_container"
+                      android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="vertical"
+                      android:paddingTop="?attr/actionBarSize"
+                      android:gravity="bottom"
+                      android:clipToPadding="false"
+                      android:clipChildren="false">
 
-        <ViewStub android:id="@+id/unverified_banner_stub"
-                  android:layout="@layout/conversation_activity_unverified_banner_stub"
-                  android:inflatedId="@+id/unverified_banner"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"/>
+            <ViewStub android:id="@+id/group_share_profile_view_stub"
+                      android:layout="@layout/conversation_activity_group_share_profile_stub"
+                      android:inflatedId="@+id/group_share_profile_view"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"/>
 
-        <ViewStub
-                android:id="@+id/reminder_stub"
-                android:layout="@layout/conversation_activity_reminderview_stub"
-                android:inflatedId="@+id/reminder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <ViewStub android:id="@+id/unverified_banner_stub"
+                      android:layout="@layout/conversation_activity_unverified_banner_stub"
+                      android:inflatedId="@+id/unverified_banner"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"/>
 
-        <FrameLayout android:id="@+id/fragment_content"
-                     android:layout_width="match_parent"
-                     android:layout_height="0dp"
-                     android:layout_weight="1" />
+            <ViewStub
+                    android:id="@+id/reminder_stub"
+                    android:layout="@layout/conversation_activity_reminderview_stub"
+                    android:inflatedId="@+id/reminder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
-        <ViewStub
-                android:id="@+id/attachment_editor_stub"
-                android:inflatedId="@+id/attachment_editor"
-                android:layout="@layout/conversation_activity_attachment_editor_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <FrameLayout android:id="@+id/fragment_content"
+                         android:layout_width="match_parent"
+                         android:layout_height="0dp"
+                         android:layout_weight="1" />
 
-        <include layout="@layout/conversation_input_panel"/>
+            <ViewStub
+                    android:id="@+id/attachment_editor_stub"
+                    android:inflatedId="@+id/attachment_editor"
+                    android:layout="@layout/conversation_activity_attachment_editor_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
-        <Button android:id="@+id/register_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/conversation_activity__enable_signal_messages"
-                android:visibility="gone"/>
+            <include layout="@layout/conversation_input_panel"/>
 
-        <Button android:id="@+id/unblock_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/ConversationActivity_unblock"
-                android:visibility="gone"/>
+            <Button android:id="@+id/register_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/conversation_activity__enable_signal_messages"
+                    android:visibility="gone"/>
 
-        <Button android:id="@+id/make_default_sms_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dp"
-                android:text="@string/conversation_activity__enable_signal_for_sms"
-                android:visibility="gone"/>
+            <Button android:id="@+id/make_default_sms_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="@string/conversation_activity__enable_signal_for_sms"
+                    android:visibility="gone"/>
 
-        <TextView android:id="@+id/space_left"
-                  android:paddingLeft="5dip"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:visibility="gone"
-                  android:background="?android:windowBackground"
-                  android:text="160/160 (1)" />
+            <TextView android:id="@+id/space_left"
+                      android:paddingLeft="5dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:visibility="gone"
+                      android:background="?android:windowBackground"
+                      android:text="160/160 (1)" />
 
 
-        <ViewStub
-                android:id="@+id/emoji_drawer_stub"
-                android:layout="@layout/conversation_activity_emojidrawer_stub"
-                android:inflatedId="@+id/emoji_drawer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            <ViewStub
+                    android:id="@+id/emoji_drawer_stub"
+                    android:layout="@layout/conversation_activity_emojidrawer_stub"
+                    android:inflatedId="@+id/emoji_drawer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
-    </LinearLayout>
-</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
-</org.thoughtcrime.securesms.components.InputAwareLayout>
+        </LinearLayout>
+    </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
+    </org.thoughtcrime.securesms.components.InputAwareLayout>
+</RelativeLayout>

res/layout/conversation_fragment.xml

@@ -2,6 +2,7 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools"
+             android:id="@+id/conversation_container"
              android:layout_width="fill_parent"
              android:layout_height="match_parent">
 
@@ -33,6 +34,16 @@
               android:visibility="gone"
               tools:text="March 1, 2015" />
 
+    <TextView
+        android:id="@+id/no_messages_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="visible"
+        style="@style/NoMessagesTextView"
+        tools:text="@string/ConversationActivity_NoMessagesHint"
+        />
+
     <View android:id="@+id/compose_divider"
           android:layout_width="match_parent"
           android:layout_height="2dp"

res/layout/conversation_input_panel.xml

@@ -14,7 +14,8 @@
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
         android:clipChildren="false"
-        android:clipToPadding="false">
+        android:clipToPadding="false"
+        android:background="@color/white">
 
     <FrameLayout
         android:layout_width="0dp"
@@ -203,7 +204,7 @@
         android:layout_marginLeft="12dp"
         android:layout_marginStart="12dp"
         android:background="@drawable/circle_tintable"
-        android:layout_gravity="bottom">
+        android:layout_gravity="center_vertical">
 
         <ImageButton
             android:id="@+id/attach_button"

res/layout/conversation_item_footer.xml

@@ -8,54 +8,6 @@
     android:orientation="horizontal"
     tools:parentTag="org.thoughtcrime.securesms.components.ConversationItemFooter">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginRight="6dp"
-        android:layout_marginEnd="6dp"
-        android:orientation="horizontal"
-        android:gravity="left|start|center_vertical">
-
-        <TextView
-            android:id="@+id/footer_date"
-            android:autoLink="none"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:linksClickable="false"
-            style="@style/Signal.Text.Caption.MessageSent"
-            android:textColor="?conversation_item_sent_text_secondary_color"
-            android:textAllCaps="true"
-            tools:text="30 mins"/>
-
-        <org.thoughtcrime.securesms.components.ExpirationTimerView
-            android:id="@+id/footer_expiration_timer"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:visibility="gone"
-            tools:visibility="visible"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/footer_sim_info"
-        android:autoLink="none"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="15sp"
-        android:linksClickable="false"
-        style="@style/Signal.Text.Caption.MessageSent"
-        android:layout_gravity="right|end|bottom"
-        android:fontFamily="sans-serif-light"
-        android:paddingLeft="4dp"
-        android:paddingStart="4dp"
-        android:visibility="gone"
-        tools:visibility="visible"
-        tools:text="to SIM1" />
-
     <ImageView
         android:id="@+id/footer_secure_indicator"
         android:layout_width="12dp"
@@ -66,12 +18,21 @@
         android:contentDescription="@string/conversation_item__secure_message_description"
         tools:visibility="visible"/>
 
+    <TextView
+        android:id="@+id/footer_date"
+        android:autoLink="none"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:linksClickable="false"
+        style="@style/Signal.Text.Caption.MessageSent"
+        android:textColor="?conversation_item_sent_text_secondary_color"
+        android:textAllCaps="true"
+        tools:text="30 mins"/>
+
     <org.thoughtcrime.securesms.components.DeliveryStatusView
         android:id="@+id/footer_delivery_status"
         android:layout_width="20dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="3dp"
-        android:layout_marginStart="3dp"/>
+        android:layout_gravity="center_vertical"/>
 
 </merge>

res/layout/conversation_item_received.xml

@@ -86,20 +86,6 @@
                     tools:visibility="visible"
                     tools:text="+14152222222"/>
 
-                <TextView
-                    android:id="@+id/group_message_sender_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="4sp"
-                    android:paddingLeft="4sp"
-                    style="@style/Signal.Text.Preview"
-                    android:fontFamily="sans-serif-regular"
-                    android:textColor="?conversation_item_received_text_primary_color"
-                    android:textStyle="italic"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    tools:text="~Clement Duval"/>
-
             </LinearLayout>
 
             <org.thoughtcrime.securesms.components.QuoteView
@@ -171,6 +157,7 @@
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+                android:gravity="end"
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:alpha="0.7"
@@ -179,13 +166,5 @@
 
         </LinearLayout>
 
-        <org.thoughtcrime.securesms.components.AlertView
-            android:id="@+id/indicators_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:orientation="vertical"
-            android:gravity="center_vertical"/>
-
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationItem>

res/layout/conversation_item_sent.xml

@@ -125,6 +125,7 @@
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+                android:gravity="end"
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
@@ -132,7 +133,10 @@
 
         </LinearLayout>
 
-        <org.thoughtcrime.securesms.components.AlertView
+        <!-- the following view is only left because it is used as a reference for positioning above.
+         removing would require some re-layouting, it's just not done yet.-->
+        <View
+            android:visibility="gone"
             android:id="@+id/indicators_parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

res/layout/conversation_list_item_view.xml

@@ -36,45 +36,55 @@
                   android:weightSum="1"
                   android:orientation="horizontal">
 
-        <org.thoughtcrime.securesms.components.FromTextView
-                  android:id="@+id/from"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentTop="true"
-                  android:layout_alignParentLeft="true"
-                  android:layout_alignParentStart="true"
-                  android:layout_toLeftOf="@+id/thumbnail"
-                  android:layout_toStartOf="@+id/thumbnail"
-                  style="@style/Signal.Text.Body"
-                  android:fontFamily="sans-serif-medium"
-                  android:textColor="?attr/conversation_list_item_contact_color"
-                  android:maxLines="1"
-                  tools:text="Jules Bonnot"
-                  android:ellipsize="end"
-                  android:layout_marginBottom="2dp"
-                  android:drawablePadding="5dp"/>
+        <RelativeLayout
+            android:id="@+id/from"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@+id/thumbnail"
+            android:layout_toStartOf="@+id/thumbnail">
 
-        <org.thoughtcrime.securesms.components.AlertView
-                android:id="@+id/indicators_parent"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:paddingTop="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_marginEnd="2dp"
+            <org.thoughtcrime.securesms.components.FromTextView
+                android:id="@+id/from_text"
+                style="@style/Signal.Text.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_below="@id/from"
-                app:useSmallIcon="true"
+                android:layout_marginBottom="2dp"
+                android:layout_toLeftOf="@id/verified_indicator"
+                android:layout_toStartOf="@id/verified_indicator"
+                android:drawablePadding="5dp"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-medium"
+                android:maxLines="1"
+                android:textColor="?attr/conversation_list_item_contact_color"
+                tools:text="Jules Bonnot" />
+
+            <ImageView
+                android:id="@+id/verified_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_verified"
                 android:visibility="gone"
-                tools:visibility="visible"/>
+                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true" />
+
+        </RelativeLayout>
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/subject"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/from"
-                android:layout_toRightOf="@id/indicators_parent"
-                android:layout_toEndOf="@id/indicators_parent"
                 android:layout_toLeftOf="@+id/status"
                 android:layout_toStartOf="@+id/status"
                 android:paddingRight="1dp"

res/layout/conversation_title_view.xml

@@ -39,58 +39,55 @@
             tools:src="@drawable/ic_contact_picture"
             android:contentDescription="@string/conversation_list_item_view__contact_photo_image"/>
 
-    <RelativeLayout android:id="@+id/content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/contact_photo_image"
-                    android:layout_toEndOf="@id/contact_photo_image"
-                    android:layout_centerVertical="true">
+    <RelativeLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/contact_photo_image"
+        android:layout_toRightOf="@id/contact_photo_image">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textSize="18dp"
-                android:transitionName="recipient_name"
-                android:drawablePadding="5dp"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                style="@style/TextSecure.TitleTextStyle"
-                tools:ignore="UnusedAttribute"/>
+            android:id="@+id/title"
+            style="@style/TextSecure.TitleTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@id/verified_indicator"
+            android:layout_toStartOf="@id/verified_indicator"
+            android:drawablePadding="5dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="18dp"
+            android:transitionName="recipient_name"
+            tools:text="Jules Bonnot" />
 
-        <ImageView android:id="@+id/verified_indicator"
-                   android:src="@drawable/ic_check_circle_white_18dp"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginRight="3dp"
-                   android:layout_marginEnd="3dp"
-                   android:layout_gravity="bottom"
-                   android:layout_alignParentLeft="true"
-                   android:layout_alignParentStart="true"
-                   android:layout_below="@id/title"
-                   android:alpha="0.7"
-                   android:visibility="gone"/>
+        <ImageView
+            android:id="@+id/verified_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/ic_verified"
+            android:visibility="gone" />
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:layout_gravity="center_vertical|start"
-                android:gravity="center_vertical"
-                android:layout_toRightOf="@id/verified_indicator"
-                android:layout_toEndOf="@id/verified_indicator"
-                android:layout_below="@id/title"
-                android:textDirection="ltr"
-                android:textSize="13dp"
-                tools:text="(123) 123-1234"
-                style="@style/TextSecure.SubtitleTextStyle"/>
+            android:id="@+id/subtitle"
+            style="@style/TextSecure.SubtitleTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textDirection="ltr"
+            android:textSize="13dp"
+            android:layout_below="@id/title"
+            tools:text="(123) 123-1234" />
 
     </RelativeLayout>
 

res/layout/country_list_item.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              android:padding="8dip"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView android:id="@+id/country_name"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_weight="1.0"
-              android:textSize="18sp"
-              android:textStyle="bold" />
-
-    <TextView android:id="@+id/country_code"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textSize="18.0sp"
-              android:textStyle="bold"
-              android:textColor="#7b7b7b"
-              android:gravity="right|center"
-              android:layout_marginLeft="4dip"
-              android:layout_marginRight="5dip"
-              android:layout_gravity="right|center"/>
-
-</LinearLayout>
-

res/layout/country_selection.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="fill_parent"
-             android:layout_height="fill_parent">
-
-    <fragment android:id="@+id/fragment_content"
-              android:name="org.thoughtcrime.securesms.CountrySelectionFragment"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"/>
-</FrameLayout>

res/layout/country_selection_fragment.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:background="#ffffff">
-
-    <EditText android:id="@+id/country_search"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:drawableLeft="@drawable/ic_menu_search_holo_light"
-              android:hint="@string/country_selection_fragment__search" />
-
-    <ListView android:id="@android:id/list"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:divider="#ffdddddd"
-              android:dividerHeight="1.0px"
-              android:choiceMode="singleChoice" />
-
-    <TextView android:id="@android:id/empty"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:gravity="center"
-              android:textAppearance="?android:attr/textAppearanceLarge"
-              android:text="@string/country_selection_fragment__loading_countries" />
-</LinearLayout>

res/layout/delivery_status_view.xml

@@ -20,16 +20,6 @@
                android:visibility="gone"
                android:contentDescription="@string/conversation_item_sent__delivered_description" />
 
-    <ImageView android:id="@+id/delivered_indicator"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_vertical|end"
-               android:src="@drawable/ic_delivery_status_delivered"
-               android:paddingLeft="2dp"
-               android:visibility="gone"
-               android:contentDescription="@string/conversation_item_sent__delivered_description"
-               tools:visibility="gone"/>
-
     <ImageView android:id="@+id/read_indicator"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -41,4 +31,15 @@
                android:tint="@color/core_blue"
                tools:visibility="visible"/>
 
+    <ImageView android:id="@+id/failed_indicator"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_vertical|end"
+               android:src="@drawable/ic_delivery_status_failed"
+               android:paddingLeft="2dp"
+               android:visibility="gone"
+               android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"
+               android:tint="@color/core_blue"
+               tools:visibility="visible"/>
+
 </merge>

res/layout/document_view.xml

@@ -21,18 +21,6 @@
                     android:focusable="false"
                     android:gravity="center">
 
-                <com.pnikosis.materialishprogress.ProgressWheel
-                        android:id="@+id/download_progress"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:visibility="gone"
-                        android:clickable="false"
-                        android:layout_gravity="center"
-                        app:matProg_barColor="@color/white"
-                        app:matProg_linearProgress="true"
-                        app:matProg_spinSpeed="0.333"
-                        tools:visibility="gone"/>
-
                 <FrameLayout
                         android:id="@+id/icon_container"
                         android:layout_width="wrap_content"

res/layout/group_create_activity.xml

@@ -68,25 +68,47 @@
 
     </RelativeLayout>
 
-    <com.dd.CircularProgressButton
-        android:id="@+id/add_member_button"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:background="@color/signal_primary"
-        android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginBottom="15dp"
-        android:paddingEnd="12dp"
-        android:paddingStart="12dp"
-        android:textColor="@color/white"
-        app:cpb_colorIndicator="@color/white"
-        app:cpb_colorProgress="@color/textsecure_primary"
-        app:cpb_cornerRadius="20dp"
-        app:cpb_selectorIdle="@drawable/progress_button_state"
-        app:cpb_textIdle="@string/recipients_panel__add_members"
-        app:layout_constraintBottom_toTopOf="@id/skip_button_bottom_spacer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/add_member_button"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:background="@color/signal_primary"
+            android:layout_marginStart="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginBottom="15dp"
+            android:paddingEnd="12dp"
+            android:paddingStart="12dp"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="20dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            app:cpb_textIdle="@string/recipients_panel__add_members"/>
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/verify_button"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:background="@color/signal_primary"
+            android:layout_marginStart="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginBottom="15dp"
+            android:paddingEnd="12dp"
+            android:paddingStart="12dp"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="20dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            android:visibility="gone"
+            app:cpb_textIdle="@string/qr_show_activity__title"/>
+
+    </LinearLayout>
 
     <ListView android:id="@+id/selected_contacts_list"
         android:layout_width="match_parent"

res/layout/preference_divider_explain_autocrypt.xml

@@ -0,0 +1,19 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:layout_margin="0dp"
+              android:background="@color/amber_50"
+              android:padding="0dp">
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/preferences_autocrypt__explain"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="16dp"
+            android:background="?pref_divider"/>
+
+</LinearLayout>

res/layout/profile_create_activity.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout android:layout_width="match_parent"
+<FrameLayout xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
              android:layout_height="match_parent"
              xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -23,26 +24,40 @@
                        android:layout_height="64dp"
                        android:transitionName="avatar"/>
 
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                    android:id="@+id/name"
-                    android:hint="@string/profile_create_activity__your_name"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="10dp"
-                    android:inputType="textCapWords"/>
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp">
 
-            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                    android:id="@+id/emoji_toggle"
-                    android:layout_width="37dp"
-                    android:layout_height="37dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/touch_highlight_background"
-                    android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/name_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/profile_create_activity__your_name"
+                    android:inputType="textCapWords" />
+            </android.support.design.widget.TextInputLayout>
 
         </LinearLayout>
 
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="top|left"
+            android:hint="@string/default_status_hint"
+            android:inputType="textMultiLine"
+            android:maxLines="3" />
+    </android.support.design.widget.TextInputLayout>
+
         <LinearLayout android:id="@+id/information_link_container"
                       android:clickable="true"
                       android:orientation="horizontal"
@@ -61,16 +76,17 @@
                        android:src="@drawable/ic_info_white_18dp"
                        android:tint="#73B7F0"/>
 
-            <TextView style="@style/Registration.Description"
-                      android:id="@+id/information_label"
-                      android:clickable="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="match_parent"
-                      android:layout_marginLeft="3dp"
-                      android:layout_gravity="center_vertical"
-                      android:gravity="center_vertical"
-                      android:textColor="#73B7F0"
-                      android:text="@string/profile_create_activity__who_can_see_this_information"/>
+            <TextView
+                android:id="@+id/information_label"
+                style="@style/Registration.Description"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="3dp"
+                android:clickable="true"
+                android:gravity="center_vertical"
+                android:text="@string/profile_create_activity__who_can_see_this_information"
+                android:textColor="#73B7F0" />
         </LinearLayout>
 
 
@@ -81,31 +97,18 @@
                       android:clipChildren="false"
                       android:clipToPadding="false">
 
-            <com.dd.CircularProgressButton
-                    android:id="@+id/finish_button"
-                    app:cpb_textIdle="@string/profile_create_activity__finish"
-                    app:cpb_selectorIdle="@drawable/progress_button_state"
-                    app:cpb_colorIndicator="@color/white"
-                    app:cpb_colorProgress="@color/textsecure_primary"
-                    app:cpb_cornerRadius="50dp"
-                    android:textAllCaps="true"
-                    android:background="@color/signal_primary"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginBottom="20dp"
-                    android:layout_gravity="center_horizontal"/>
-
-            <TextView android:id="@+id/password_account_settings_button"
-                      android:layout_gravity="center_horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginTop="0dp"
-                      android:layout_marginBottom="20dp"
-                      android:textColor="@color/gray50"
-                      android:text="@string/profile_create_activity__password_account"/>
+            <TextView
+                android:id="@+id/password_account_settings_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="0dp"
+                android:text="@string/profile_create_activity__password_account"
+                android:textColor="#73B7F0"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                android:typeface="sans" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
                     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -118,10 +121,11 @@
 
 </org.thoughtcrime.securesms.components.InputAwareLayout>
 
-    <View android:id="@+id/reveal"
-          android:background="@color/textsecure_primary"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:visibility="invisible"/>
+    <View
+        android:id="@+id/reveal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/textsecure_primary"
+        android:visibility="invisible" />
 
 </FrameLayout>

res/layout/registration_activity.xml

@@ -341,7 +341,7 @@
             app:cpb_colorProgress="@color/textsecure_primary"
             app:cpb_cornerRadius="50dp"
             app:cpb_selectorIdle="@drawable/progress_button_state"
-            app:cpb_textIdle="@string/registration_activity__register"
+            app:cpb_textIdle="@string/registration_activity__login"
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/register_button_spacer_top" />

res/layout/setup_code_grid.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- the FrameLayout is needed as View.inflate() without a root discards all layout_-attributes -->
+
+    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginEnd="24dp"
+                android:columnCount="6"
+                android:rowCount="1">
+
+        <!-- 1st row -->
+
+        <EditText
+            android:id="@+id/setupCode0"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:layout_marginBottom="8dp"
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode1"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode2"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:layout_marginBottom="8dp"
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <!-- 2nd row -->
+
+        <EditText
+            android:id="@+id/setupCode3"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:layout_marginBottom="8dp"
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode4"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:layout_marginBottom="8dp"
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode5"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:text=" - "
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <!-- 3rd row -->
+
+        <EditText
+            android:id="@+id/setupCode6"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:text=" - "
+            android:layout_marginBottom="8dp"
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode7"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:text=" - "
+            android:layout_marginBottom="8dp"
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+        <EditText
+            android:id="@+id/setupCode8"
+            android:layout_marginBottom="8dp"
+            android:layout_width="wrap_content"
+            android:inputType="numberDecimal"
+            android:maxLength="4"
+            android:minEms="3"/>
+
+        <TextView
+            android:text=" "
+            android:layout_marginBottom="8dp"
+            android:textAppearance="@style/TextAppearance.AppCompat"/>
+
+    </GridLayout>
+
+</FrameLayout>

res/layout/transfer_controls_view.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <com.pnikosis.materialishprogress.ProgressWheel
-            android:id="@+id/progress_wheel"
-            android:layout_width="@dimen/transfer_controls_contracted_width"
-            android:layout_height="@dimen/transfer_controls_contracted_width"
-            android:visibility="gone"
-            android:layout_gravity="center"
-            app:matProg_barColor="@color/white"
-            app:matProg_linearProgress="true"
-            app:matProg_spinSpeed="0.333" />
-
-    <TextView android:id="@+id/download_details"
-              android:layout_width="@dimen/transfer_controls_expanded_width"
-              android:layout_height="@dimen/transfer_controls_contracted_width"
-              android:padding="15dp"
-              android:gravity="center"
-              android:longClickable="false"
-              android:textColor="?conversation_item_received_text_primary_color"
-              android:drawableLeft="@drawable/ic_file_download_white_36dp"
-              android:textSize="16dp"
-              android:visibility="gone"
-              android:textStyle="bold" />
-</merge>

res/menu/conversation.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item android:title="@string/conversation__menu_view_profile"
+          android:id="@+id/menu_conversation_settings"/>
+
     <item android:title="@string/conversation__menu_add_attachment"
           android:id="@+id/menu_add_attachment" />
 
     <item android:title="@string/conversation__menu_view_all_media"
           android:id="@+id/menu_view_media" />
 
-    <item android:title="@string/conversation__menu_conversation_settings"
-          android:id="@+id/menu_conversation_settings"/>
-
 </menu>

res/menu/conversation_add_to_contacts.xml

@@ -1,10 +0,0 @@
-<?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:id="@+id/menu_add_to_contacts"
-          android:title="@string/conversation_add_to_contacts__menu_add_to_contacts"
-          app:showAsAction="never" />
-
-</menu>

res/menu/conversation_archive.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation__menu_archive_chat"
+          android:id="@+id/menu_archive_chat"/>
+
+</menu>

res/menu/conversation_delete.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="@string/conversation_insecure__invite"
-          android:id="@+id/menu_invite"/>
+    <item android:title="@string/conversation__menu_delete_chat"
+          android:id="@+id/menu_delete_chat"/>
 
 </menu>

res/menu/conversation_expiring_off.xml

@@ -1,9 +0,0 @@
-<?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/conversation_expiring_off__disappearing_messages"
-          android:id="@+id/menu_expiring_messages_off"
-          android:icon="@drawable/ic_timer_off_white_24dp"/>
-
-</menu>

res/menu/conversation_expiring_on.xml

@@ -1,10 +0,0 @@
-<?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:id="@+id/menu_expiring_messages"
-          app:actionLayout="@layout/expiration_timer_menu"
-          app:showAsAction="always"
-          android:title="@string/menu_conversation_expiring_on__messages_expiring"/>
-
-</menu>

res/menu/conversation_group_options.xml

@@ -1,9 +0,0 @@
-<?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/convesation_group_options__recipients_list"
-          android:id="@+id/menu_group_recipients"
-          android:icon="?menu_group_icon"
-          app:showAsAction="ifRoom" />
-
-</menu>

res/menu/conversation_mms_group_options.xml

@@ -1,17 +0,0 @@
-<?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/conversation_group_options__delivery"
-          android:id="@+id/menu_group_delivery"
-          android:icon="?menu_split_icon"
-          app:showAsAction="ifRoom" >
-
-        <menu>
-            <group android:id="@+id/distribution_group"
-                   android:checkableBehavior="single">
-                <item android:id="@+id/menu_distribution_conversation" android:title="@string/conversation_group_options__conversation" android:checked="true" />
-                <item android:id="@+id/menu_distribution_broadcast" android:title="@string/conversation_group_options__broadcast" />
-            </group>
-        </menu>
-    </item>
-</menu>

res/menu/conversation_push_group_options.xml

@@ -3,7 +3,8 @@
 
     <item android:id="@+id/menu_edit_group"
           android:title="@string/conversation__menu_edit_group"
-          app:showAsAction="collapseActionView" />
+          android:icon="?menu_group_icon"
+          app:showAsAction="ifRoom" />
 
     <item android:id="@+id/menu_leave"
           android:title="@string/conversation__menu_leave_group"

res/menu/conversation_secure.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-      <item android:title="@string/conversation_secure_verified__menu_reset_secure_session"
-            android:id="@+id/menu_reset_secure_session"/>
-</menu>

res/menu/conversation_unarchive.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation__menu_unarchive_chat"
+          android:id="@+id/menu_archive_chat"/>
+
+</menu>

res/menu/preferences_create_profile_menu.xml

@@ -0,0 +1,9 @@
+<?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:id="@+id/menu_create_profile"
+        android:title="@string/profile_create_activity__finish"
+        app:showAsAction="always"
+        android:icon="?menu_accept_icon"/>
+</menu>

res/menu/text_secure_normal.xml

@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/qr_scan_activity__title"
+          android:id="@+id/menu_qr_scan"
+          android:icon="@drawable/ic_ab_qr"
+          app:showAsAction="always"/>
+
+    <item android:title="@string/qr_show_activity__title"
+        android:id="@+id/menu_qr_show" />
 
     <item android:title="@string/text_secure_normal__menu_new_chat"
           android:id="@+id/menu_new_chat" />
 
+    <item android:title="@string/menu_deaddrop"
+          android:id="@+id/menu_deaddrop" />
+
     <item android:title="@string/text_secure_normal__menu_clear_passphrase"
           android:id="@+id/menu_clear_passphrase" />
 
-    <item android:title="@string/text_secure_normal__mark_all_as_read"
-          android:id="@+id/menu_mark_all_read" />
-
-    <item android:title="@string/text_secure_normal__invite_friends"
-          android:id="@+id/menu_invite" />
-
     <item android:title="@string/text_secure_normal__menu_settings"
           android:id="@+id/menu_settings" />
 
-    <item android:title="@string/text_secure_normal__help"
-          android:id="@+id/menu_help"/>
-
 </menu>

res/values/arrays.xml

@@ -213,33 +213,7 @@
   </string-array>
 
   <!-- discrete MIME type (the part before the "/") -->
-  <string-array name="pref_media_download_entries">
-      <item>image</item>
-      <item>audio</item>
-      <item>video</item>
-      <item>documents</item>
-  </string-array>
 
-  <string-array name="pref_media_download_values">
-      <item>@string/arrays__images</item>
-      <item>@string/arrays__audio</item>
-      <item>@string/arrays__video</item>
-      <item>@string/arrays__documents</item>
-  </string-array>
-
-  <string-array name="pref_media_download_mobile_data_default">
-      <item>image</item>
-      <item>audio</item>
-  </string-array>
-
-  <string-array name="pref_media_download_wifi_default">
-      <item>image</item>
-      <item>audio</item>
-      <item>video</item>
-      <item>documents</item>
-  </string-array>
-
-  <string-array name="pref_media_download_roaming_default" />
 
     <!-- RedPhone -->
 

res/values/attrs.xml

@@ -7,6 +7,7 @@
     <attr name="attachment_document_icon_large" format="reference" />
 
     <attr name="conversation_list_item_background" format="reference"/>
+    <attr name="conversation_list_deaddrop_bg_color" format="reference|color"/>
     <attr name="conversation_list_item_contact_color" format="reference|color"/>
     <attr name="conversation_list_item_subject_color" format="reference|color"/>
     <attr name="conversation_list_item_delivery_icon_color" format="reference|color"/>
@@ -177,10 +178,6 @@
         <attr name="iconColor" format="color" />
     </declare-styleable>
 
-    <declare-styleable name="AlertView">
-        <attr name="useSmallIcon" format="boolean" />
-    </declare-styleable>
-
     <declare-styleable name="AudioView">
         <attr name="widgetBackground" format="color"/>
         <attr name="foregroundTintColor" format="color" />

res/values/colors.xml

@@ -59,6 +59,7 @@
 
     <color name="sticker_selected_color">#99ffffff</color>
     <color name="transparent">#00FFFFFF</color>
+    <color name="transparent_black">#00000000</color>
 
     <color name="MediaOverview_Media_selected_overlay">#88000000</color>
 

res/values/dimens.xml

@@ -18,7 +18,7 @@
 
     <!-- TODO: Consolidate these two message corner things -->
     <dimen name="message_corner_radius">16dp</dimen>
-    <dimen name="message_corner_collapse_radius">4dp</dimen>
+    <dimen name="message_corner_collapse_radius">1dp</dimen>
     <dimen name="message_bubble_corner_radius">2dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="message_bubble_horizontal_padding">12dp</dimen>
@@ -72,6 +72,4 @@
 
     <dimen name="floating_action_button_margin">16dp</dimen>
 
-    <dimen name="alertview_small_icon_size">14dp</dimen>
-
 </resources>

res/values/strings.xml

@@ -39,8 +39,16 @@
     <string name="ApplicationPreferencesActivity_off">off</string>
     <string name="ApplicationPreferencesActivity_Off">Off</string>
     <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-    <string name="ApplicationPreferencesActivity_privacy_summary">Screen lock %1$s, Registration lock %2$s</string>
+    <string name="ApplicationPreferencesActivity_privacy_summary">Screen lock %1$s, Read receipts %2$s</string>
     <string name="ApplicationPreferencesActivity_appearance_summary">Theme %1$s, Language %2$s</string>
+    <string name="ApplicationPreferencesActivity_appearance_summary_new">Theme %1$s, Language %2$s, Background %3$s</string>
+    <string name="ApplicationPreferencesActivity_appearance_background_default">default</string>
+    <string name="ApplicationPreferencesActivity_appearance_background_custom">custom</string>
+
+    <!-- AppearancePreferenceFragment -->
+    <string name="AppearancePreferencesFragment_background_save_error">Background image could not be saved</string>
+    <string name="AppearancePreferencesFragment_background_custom_summary">Custom</string>
+    <string name="AppearancePreferencesFragment_background_default_summary">Default</string>
 
     <!-- AppProtectionPreferenceFragment -->
     <plurals name="AppProtectionPreferenceFragment_minutes">
@@ -117,7 +125,6 @@
     <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback to unencrypted SMS?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback to unencrypted MMS?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">This message will <b>not</b> be encrypted because the recipient is no longer a Delta Chat user.\n\nSend unsecured message?</string>
-    <string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
     <string name="ConversationItem_copied_text">Copied %s</string>
     <string name="ConversationItem_from_s">from %s</string>
     <string name="ConversationItem_to_s">to %s</string>
@@ -163,6 +170,9 @@
     <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Delta Chat needs Camera permissions to take photos or video</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+    <string name="ConversationActivity_NoMessagesHint">Send message to %1$s:\n\n• It is okay if %2$s does not use Delta Chat.\n\n• Delivering the first message may take a while.</string>
+    <string name="ConversationActivity_MsgNewGroupDraftHint">Compose the first message, allowing others to reply within this group.\n\n• It is okay if not all members use Delta Chat.\n\n• Delivering the first message may take a while.</string>
+    <string name="ConversationActivity_ask_delete_chat">Delete this chat? It will no longer be shown in the chat list, its messages will remain on the server.</string>
 
     <!-- ConversationAdapter -->
     <plurals name="ConversationAdapter_n_unread_messages">
@@ -223,9 +233,9 @@
         <item quantity="one">Delete selected chats?</item>
         <item quantity="other">Delete selected chats?</item>
     </plurals>
-    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
-        <item quantity="one">This will permanently delete the selected chats.</item>
-        <item quantity="other">This will permanently delete all %1$d selected chats.</item>
+    <plurals name="ConversationListFragment_ask_selected_chats">
+        <item quantity="one">Delete the selected chat? It will no longer be shown in the chat list, its messages will remain on the server.</item>
+        <item quantity="other">Delete %1%d selected chats? They will no longer be shown in the chat list, their messages will remain on the server.</item>
     </plurals>
     <string name="ConversationListFragment_deleting">Deleting</string>
     <string name="ConversationListFragment_deleting_selected_conversations">Deleting selected chats...</string>
@@ -293,6 +303,8 @@
 
     <!-- ShareActivity -->
     <string name="ShareActivity_share_with">Share with</string>
+    <string name="ShareActivity_unable_to_open_media">Can\'t find an app able to open this media.</string>
+    <string name="ShareActivity_file_not_found">Could not find %1$s.</string>
 
     <!-- ExperienceUpgradeActivity -->
     <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Welcome to Delta Chat.</string>
@@ -748,6 +760,9 @@
     <!-- ContactSelectionListFragment-->
     <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Delta Chat requires the Contacts permission in order to display your contacts, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Error retrieving contacts, check your network connection</string>
+    <string name="ContactSelectionListFragment_error_deleting_contacts_check_existing_conversations">Error deleting contacts, some contacts couldn\'t get deleted. Please delete existing conversations before.</string>
+    <string name="ContactSelectionListFragment_contact_delete_confirmation_title">Delete contacts?</string>
+    <string name="ContactSelectionListFragment_contact_delete_confirmation_message">This will permanently delete the selected contacts.\n\nContacts with ongoing chats and contacts from the system\'s address book cannot be deleted permanently.</string>
 
     <!-- blocked_contacts_fragment -->
     <string name="blocked_contacts_fragment__no_blocked_contacts">No blocked contacts</string>
@@ -1063,15 +1078,15 @@
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the Enter key will send text messages</string>
     <string name="preferences__choose_identity">Choose identity</string>
     <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Choose your contact entry from the contacts list.</string>
-    <string name="preferences__change_passphrase">Change passphrase</string>
-    <string name="preferences__change_your_passphrase">Change your passphrase</string>
+    <string name="preferences__change_passphrase">Change secret</string>
+    <string name="preferences__change_your_passphrase">Change your pin / pattern / fingerprint via system settings</string>
     <string name="preferences__enable_passphrase">Enable passphrase screen lock</string>
     <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Lock screen and notifications with a passphrase</string>
     <string name="preferences__screen_security">Screen security</string>
     <string name="preferences__screen_security_restart_warning">To apply the screen security setting please restart the app</string>
     <string name="preferences__disable_screen_security_to_allow_screen_shots">Block screenshots in the recents list and inside the app</string>
     <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Auto-lock Delta Chat after a specified time interval of inactivity</string>
-    <string name="preferences__inactivity_timeout_passphrase">Inactivity timeout passphrase</string>
+    <string name="preferences__inactivity_timeout_passphrase">Inactivity timeout lock</string>
     <string name="preferences__inactivity_timeout_interval">Inactivity timeout interval</string>
     <string name="preferences__notifications">Notifications</string>
     <string name="preferences__led_color">LED color</string>
@@ -1157,6 +1172,7 @@
     <string name="preferences_chats__message_text_size">Message font size</string>
     <string name="preferences_events__contact_joined_signal">Contact joined Delta Chat</string>
     <string name="preferences_notifications__priority">Priority</string>
+    <string name="preferences_other">Other</string>
     <string name="preferences_backup__export_explain">A backup helps you to set up a new installation on this or on another device.\n\nThe backup will contain all messages, contacts and chats and your end-to-end Autocrypt setup. Keep the backup file in a safe place or delete it as soon as possible.</string>
     <string name="preferences_backup__export_start_button">Start backup</string>
     <string name="preferences_backup__backup_written_to_x">Backup written successfully to %1$s</string>
@@ -1169,6 +1185,10 @@
     <string name="preferences_managekeys__import_explain">Import secret keys from \"%1$s\"?\n\n• Existing secret keys will not be deleted\n\n• The last imported key will be used as the new default key unless it has the word \"legacy\" in its filename</string>
     <string name="preferences_managekeys__secret_keys_exported_to_x">Secret keys written successfully to \"%1$s\".</string>
     <string name="preferences_managekeys__secret_keys_imported_from_x">Secret keys imported from \"%1$s\".</string>
+    <string name="preferences_autocrypt">Autocrypt</string>
+    <string name="preferences_autocrypt__send_asm">Send Autocrypt Setup Message</string>
+    <string name="preferences_autocrypt__prefer_e2ee">Prefer end-to-end encryption</string>
+    <string name="preferences_autocrypt__explain">Autocrypt is a new and open specification for automatic end-to-end email encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with Autocrypt Setup Messages.</string>
 
     
     <!-- **************************************** -->
@@ -1301,6 +1321,32 @@
     <string name="new_conversation_activity__refresh">Refresh</string>
     <!-- redphone_audio_popup_menu -->
 
+    <!-- qr_scan_activity -->
+    <string name="qr_scan_activity__title">Scan QR code</string>
+    <string name="qr_scan_activity__hint">Place your camera over the QR code</string>
+
+    <!-- qr_scan_handler -->
+    <string name="qr_scan_handler_join_verified_group">Do you want to join the verified group <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
+    <string name="qr_scan_handler_fingerprint_ask_oob">Verify contact and start chatting with <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
+    <string name="qr_scan_handler_fingerprint_ok">Contact <![CDATA[<i>]]>%1$s<![CDATA[</i>]]> verified. Start chatting?</string>
+    <string name="qr_scan_handler_fingerprint_mismatch">The scanned fingerprint does <![CDATA[<b>]]>not match<![CDATA[</b>]]> the fingerprint last seen for <![CDATA[<i>]]>%1$s<![CDATA[</i>]]>.</string>
+    <string name="qr_scan_handler_fingerprint_without_address">This QR code contains a fingerprint but no email address.\n\nFor an out-of-band-verification, please establish an encrpyted connection to the recipient first.</string>
+    <string name="qr_scan_handler_Scan_contains_text">Scanned QR code text:\n\n%1$s</string>
+    <string name="qr_scan_handler_qr_scan_contains_url">Scanned QR code URL:\n\n%1$s</string>
+    <string name="qr_scan_handler_fingerprint">Fingerprint</string>
+    <string name="qr_scan_handler_ask_start_chat_with">Chat with <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
+    <string name="qr_scan_handler_verfied_introduce_myself">%1$s verified, introduce myself …</string>
+
+    <!-- qr_show_activity -->
+    <string name="qr_show_activity__title">Show QR verify code</string>
+    <string name="qr_show_activity__joining">%1$s joins.</string>
+    <string name="qr_show_activity__verified">%1$s verified.</string>
+    <string name="qr_show_activity__group_joined">%1$s securely joined the group.</string>
+    <string name="qr_show_activity__join_verified_group_hint">Scan this to join the verified group <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.</string>
+    <string name="qr_show_activity__join_verified_group_title">QR invite code</string>
+    <string name="qr_show_activity__join_contact_title">QR verify code</string>
+    <string name="qr_show_activity__join_contact_hint"><![CDATA[<b>]]>%1$s<![CDATA[</b><br>]]>Scan this to set up a verified contact.</string>
+
     <!-- Trimmer -->
     <string name="trimmer__deleting">Deleting</string>
     <string name="trimmer__deleting_old_messages">Deleting old messages...</string>
@@ -1441,6 +1487,18 @@
     <string name="import_backup_ask">Backup found at \"%1$s\".\n\nDo you want to import and use all data and settings from it?</string>
     <string name="import_backup_no_backup_found">No backups found.\n\nCopy the backup to \"%1$s\" and try again. Alternatively, press \"Start messaging\" to go with the normal setup process.</string>
 
+    <string name="autocrypt__button_send_asm">Send Autocrypt Setup Message</string>
+    <string name="autocrypt__msg_before_sending_asm">An \"Autocrypt Setup Message\" securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nThe setup will be encrypted by a setup code which is displayed here and must be typed on the other device.</string>
+    <string name="autocrypt__msg_after_sending_asm">Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be prompted for a setup code. Type the following digits into the prompt:\n\n%1$s\n\nOnce you\'re done, your other device will be ready to use Autocrypt.</string>
+    <string name="autocrypt__asm_subject">Autocrypt Setup Message</string>
+    <string name="autocrypt__asm_general_body">This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device.</string>
+    <string name="autocrypt__asm_tap_body">This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap on this message.</string>
+    <string name="autocrypt__continue_transfer_title">Autocrypt Setup Message</string>
+    <string name="autocrypt__continue_transfer_please_enter_code">Please enter the setup code that is displayed on the other device.</string>
+    <string name="autocrypt__continue_transfer_bad_code">Bad setup code. Please try again.\n\nIf you do not remember the setup code, just send another Autocrypt Setup Message from the other device.</string>
+    <string name="autocrypt__continue_transfer_succeeded">End-to-end setup transferred. This device is now ready to use Autocrypt with the same setup as the other device.</string>
+    <string name="autocrypt__continue_button_retry">Retry</string>
+
     <!-- Generic and reusable strings -->
     <string name="email_address">Email address</string>
     <string name="bad_email_address">Bad email address.</string>
@@ -1456,5 +1514,23 @@
     <string name="contact_selection_list__type_email_above">Type email address above</string>
     <string name="text_secure_normal__menu_new_chat">New chat</string>
     <string name="help_url">https://delta.chat/en/help</string>
+    <string name="security_authentication_failed">Authentication failed.</string>
+    <string name="security_authentication_unlock_title">Unlock Delta Chat</string>
+    <string name="security_authentication_unlock_description">Please enter your system defined secret to unlock Delta Chat.</string>
+    <!-- Translators: The URL should not be localized, it is not clear which languuage the receiver prefers and the language will be detected on the server -->
+    <string name="default_status_text">Sent with my Delta Chat Messenger: https://delta.chat</string>
+    <string name="default_status_hint">Status text</string>
+    <string name="registration_activity__login">Login</string>
+    <string name="preferences__chat_background">Chat-Background</string>
+    <string name="copy_to_clipboard">Copy to clipboard</string>
+    <string name="open">Open</string>
+    <string name="done">Done</string>
+    <string name="menu_deaddrop">Contact requests</string>
+    <string name="not_now">Not now</string>
+    <string name="never">Never</string>
+    <string name="conversation__menu_view_profile">View profile</string>
+    <string name="conversation__menu_archive_chat">Archive chat</string>
+    <string name="conversation__menu_unarchive_chat">Unarchive chat</string>
+    <string name="conversation__menu_delete_chat">Delete chat</string>
 
 </resources>

res/values/styles.xml

@@ -182,6 +182,7 @@
 
     <style name="Button.Primary" parent="Base.Widget.AppCompat.Button.Colored">
         <item name="colorAccent">@color/signal_primary</item>
+        <item name="colorButtonNormal">@color/signal_primary</item>
         <item name="android:textColor">@color/white</item>
     </style>
 
@@ -230,4 +231,13 @@
         <item name="colorControlActivated">@color/white</item>
     </style>
 
+    <style name="NoMessagesTextView">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:background">@drawable/no_message_rounded_background</item>
+        <item name="android:layout_marginLeft">12dp</item>
+        <item name="android:layout_marginRight">12dp</item>
+        <item name="android:padding">12dp</item>
+    </style>
+
 </resources>

res/values/themes.xml

@@ -132,6 +132,7 @@
         <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
+        <item name="conversation_list_deaddrop_bg_color">#ffcccccc</item>
         <item name="conversation_list_item_contact_color">@color/core_light_90</item>
         <item name="conversation_list_item_subject_color">@color/core_light_60</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
@@ -275,6 +276,7 @@
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
+        <item name="conversation_list_deaddrop_bg_color">#ff333333</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>

res/xml/preferences.xml

@@ -25,4 +25,12 @@
                 android:title="@string/preferences__advanced"
                 android:icon="@drawable/ic_advanced_24dp"/>
 
+    <Preference android:key="preference_category_invite"
+                android:title="@string/text_secure_normal__invite_friends"
+                android:icon="@drawable/ic_invite_24dp"/>
+
+    <Preference android:key="preference_category_help"
+                android:title="@string/text_secure_normal__help"
+                android:icon="@drawable/ic_help_24dp"/>
+
 </PreferenceScreen>

res/xml/preferences_advanced.xml

@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference android:key="pref_backup"
-                android:title="@string/preferences__backup"/>
+    <PreferenceCategory android:key="media_download" android:title="@string/preferences_autocrypt">
+        <Preference android:key="pref_send_autocrypt_setup_message"
+                    android:title="@string/preferences_autocrypt__send_asm"/>
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="pref_prefer_e2ee"
+            android:title="@string/preferences_autocrypt__prefer_e2ee"/>
+    </PreferenceCategory>
 
-    <Preference android:key="pref_manage_keys"
-                android:title="@string/preferences__manage_keys"/>
+    <PreferenceCategory android:layout="@layout/preference_divider_explain_autocrypt"/>
 
-    <Preference android:key="pref_submit_debug_logs"
-                android:title="@string/preferences__submit_debug_log"/>
+    <PreferenceCategory android:key="media_download" android:title="@string/preferences_other">
+        <Preference android:key="pref_backup"
+                    android:title="@string/preferences__backup"
+                    android:summary="@string/preferences_chats__backup_chats_to_external_storage"/>
+
+        <Preference android:key="pref_manage_keys"
+                    android:title="@string/preferences__manage_keys"/>
+
+        <Preference android:key="pref_submit_debug_logs"
+                    android:title="@string/preferences__submit_debug_log"/>
+    </PreferenceCategory>
 </PreferenceScreen>

res/xml/preferences_app_protection.xml

@@ -1,65 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/preferences_app_protection__screen_lock">
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_android_screen_lock"
+            android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint"
+            android:title="@string/preferences_app_protection__screen_lock" />
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_timeout_passphrase"
+            android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
+            android:title="@string/preferences__inactivity_timeout_passphrase" />
+
+        <Preference
+            android:dependency="pref_timeout_passphrase"
+            android:key="pref_timeout_interval"
+            android:title="@string/preferences__inactivity_timeout_interval" />
+
+        <Preference
+            android:key="pref_change_passphrase"
+            android:summary="@string/preferences__change_your_passphrase"
+            android:title="@string/preferences__change_passphrase" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider" />
+
     <PreferenceCategory android:title="@string/preferences_app_protection__app_access">
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:key="pref_android_screen_lock"
-                android:defaultValue="false"
-                android:title="@string/preferences_app_protection__screen_lock"
-                android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint"/>
-
-        <Preference android:title="@string/preferences_app_protection__screen_lock_inactivity_timeout"
-                    android:key="pref_android_screen_lock_timeout"
-                    android:dependency="pref_android_screen_lock"/>
-
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:key="pref_enable_passphrase_temporary"
-                            android:defaultValue="true"
-                            android:title="@string/preferences__enable_passphrase"
-                            android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
-
-        <Preference android:key="pref_change_passphrase"
-                    android:title="@string/preferences__change_passphrase"
-                    android:summary="@string/preferences__change_your_passphrase"
-                    android:dependency="pref_enable_passphrase_temporary"/>
-
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_timeout_passphrase"
-                android:title="@string/preferences__inactivity_timeout_passphrase"
-                android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
-                android:dependency="pref_enable_passphrase_temporary"/>
-
-        <Preference android:title="@string/preferences__inactivity_timeout_interval"
-                    android:key="pref_timeout_interval"
-                    android:dependency="pref_timeout_passphrase"/>
-
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:defaultValue="false"
-                            android:key="pref_screen_security"
-                            android:title="@string/preferences__screen_security"
-                            android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
+            android:defaultValue="false"
+            android:key="pref_screen_security"
+            android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots"
+            android:title="@string/preferences__screen_security" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_incognito_keyboard"
-            android:title="@string/preferences__incognito_keyboard"
-            android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"/>
+            android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"
+            android:title="@string/preferences__incognito_keyboard" />
+
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:layout="@layout/preference_divider" />
 
     <PreferenceCategory android:title="@string/preferences_app_protection__communication">
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_read_receipts"
-                android:title="@string/preferences__read_receipts"
-                android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"/>
+            android:defaultValue="false"
+            android:key="pref_read_receipts"
+            android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"
+            android:title="@string/preferences__read_receipts" />
+
+        <Preference
+            android:key="preference_category_blocked"
+            android:title="@string/preferences_app_protection__blocked_contacts" />
 
-        <Preference android:key="preference_category_blocked"
-                    android:title="@string/preferences_app_protection__blocked_contacts" />
     </PreferenceCategory>
 
 </PreferenceScreen>

res/xml/preferences_appearance.xml

@@ -15,4 +15,9 @@
             android:entries="@array/language_entries"
             android:entryValues="@array/language_values"
             android:defaultValue="zz"/>
+
+    <org.thoughtcrime.securesms.preferences.widgets.SignalPreference
+        android:key="pref_chat_background"
+        android:title="@string/preferences__chat_background"
+        />
 </PreferenceScreen>

res/xml/preferences_chats.xml

@@ -2,34 +2,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:tools="http://schemas.android.com/tools">
-    <PreferenceCategory android:key="media_download" android:title="@string/preferences_chats__media_auto_download">
-        <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_using_mobile_data"
-                android:key="pref_media_download_mobile"
-                android:defaultValue="@array/pref_media_download_mobile_data_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
-
-        <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_using_wifi"
-                android:key="pref_media_download_wifi"
-                android:defaultValue="@array/pref_media_download_wifi_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
-
-        <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_roaming"
-                android:key="pref_media_download_roaming"
-                android:defaultValue="@array/pref_media_download_roaming_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
-
     <PreferenceCategory android:title="@string/preferences_chats__chats">
         <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
                 android:key="pref_message_body_text_size"
@@ -39,12 +11,6 @@
                 android:defaultValue="16">
         </org.thoughtcrime.securesms.preferences.widgets.SignalListPreference>
 
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="true"
-                android:key="pref_show_invite_reminder"
-                android:title="@string/preferences_chats__show_invitation_prompts"
-                android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" />
-
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_system_emoji"
@@ -79,22 +45,4 @@
                     android:dependency="pref_trim_threads" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
-
-    <PreferenceCategory android:key="backup_category" android:title="@string/preferences_chats__backups">
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_backup_enabled"
-                android:title="@string/preferences_chats__chat_backups"
-                android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
-
-        <org.thoughtcrime.securesms.preferences.widgets.ProgressPreference
-                android:key="pref_backup_create"
-                android:title="@string/preferences_chats__create_backup"
-                android:persistent="false"
-                android:dependency="pref_backup_enabled"
-                tools:summary="Last backup: 3 days ago"/>
-
-    </PreferenceCategory>
-
 </PreferenceScreen>

res/xml/preferences_notifications.xml

@@ -69,37 +69,4 @@
                 android:entryValues="@array/pref_notification_priority_values"/>
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
-
-    <PreferenceCategory android:title="@string/preferences_notifications__calls">
-
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:key="pref_call_notifications"
-                android:title="@string/preferences__notifications"
-                android:defaultValue="true" />
-
-        <org.thoughtcrime.securesms.preferences.widgets.SignalPreference
-                android:dependency="pref_call_notifications"
-                android:key="pref_call_ringtone"
-                android:title="@string/preferences_notifications__ringtone"
-                android:persistent="false"
-                android:defaultValue="content://settings/system/ringtone" />
-
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:dependency="pref_call_notifications"
-                android:key="pref_call_vibrate"
-                android:defaultValue="true"
-                android:title="@string/preferences__vibrate"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
-
-    <PreferenceCategory android:title="@string/preferences_notifications__events">
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:key="pref_enable_new_contacts_notifications"
-            android:title="@string/preferences_events__contact_joined_signal"
-            android:defaultValue="true" />
-    </PreferenceCategory>
-
 </PreferenceScreen>

src/com/b44t/messenger/DcChatlist.java

@@ -40,6 +40,7 @@ public class DcChatlist {
     public native int       getCnt    ();
     public native int       getChatId (int index);
     public @NonNull DcChat  getChat   (int index) { return new DcChat(getChatCPtr(index)); }
+    public native int       getMsgId  (int index);
     public @NonNull DcMsg   getMsg    (int index) { return new DcMsg(getMsgCPtr(index)); }
     public @NonNull DcLot   getSummary(int index, DcChat chat) { return new DcLot(getSummaryCPtr(index, chat==null? null : chat.getChatCPtr())); }
 

src/com/b44t/messenger/DcContext.java

@@ -27,6 +27,11 @@ import android.support.annotation.NonNull;
 
 public class DcContext {
 
+    public final static int DC_PREF_DEFAULT_E2EE_ENABLED = 1;
+    public final static int DC_PREF_DEFAULT_MDNS_ENABLED = 1;
+    public final static int DC_PREF_DEFAULT_TRIM_ENABLED = 0;
+    public final static int DC_PREF_DEFAULT_TRIM_LENGTH  = 500;
+
     public final static int DC_EVENT_INFO                        = 100;
     public final static int DC_EVENT_WARNING                     = 300;
     public final static int DC_EVENT_ERROR                       = 400;
@@ -89,9 +94,9 @@ public class DcContext {
     public native void         performSmtpIdle      ();
     public native void         interruptSmtpIdle    ();
     public native void         setConfig            (String key, String value);
-    public native void         setConfigInt         (String key, int value);
+    public void                setConfigInt         (String key, int value) { setConfig(key, Integer.toString(value)); }
     public native String       getConfig            (String key, String def);
-    public native int          getConfigInt         (String key, int def);
+    public int                 getConfigInt         (String key, int def) { try{return Integer.parseInt(getConfig(key, Integer.toString(def)));} catch(Exception e) {} return 0; }
     public native String       getInfo              ();
     public native String       initiateKeyTransfer  ();
     public native boolean      continueKeyTransfer  (int msg_id, String setup_code);
@@ -107,7 +112,7 @@ public class DcContext {
     public native int          createContact        (String name, String addr);
     public native void         blockContact         (int id, int block);
     public native String       getContactEncrInfo   (int contact_id);
-    public native int          deleteContact        (int id);
+    public native boolean      deleteContact        (int id);
     public native int          addAddressBook       (String adrbook);
     public @NonNull DcChatlist getChatlist          (int listflags, String query, int queryId) { return new DcChatlist(getChatlistCPtr(listflags, query, queryId)); }
     public @NonNull DcChat     getChat              (int chat_id) { return new DcChat(getChatCPtr(chat_id)); }
@@ -137,11 +142,9 @@ public class DcContext {
     public native String       getMsgInfo           (int id);
     public native int          getFreshMsgCount     (int chat_id);
     public native void         deleteMsgs           (int msg_ids[]);
-    public native void         forwardMsgs          (int msg_ids[], int chat_ids);
+    public native void         forwardMsgs          (int msg_ids[], int chat_id);
     public native int          sendMsg              (int chat_id, DcMsg msg);
     public native int          sendTextMsg          (int chat_id, String text);
-    public native int          sendVcardMsg         (int chat_id, int contact_id);
-    public native int          sendMediaMsg         (int chat_id, int type, String file, String mime, int w, int h, int time_ms, String author, String trackname);
     public native int          checkQrCPtr          (String qr);
     public @NonNull DcLot      checkQr              (String qr) { return new DcLot(checkQrCPtr(qr)); }
     public native String       getSecurejoinQr      (int chat_id);
@@ -161,7 +164,7 @@ public class DcContext {
     // working with raw c-data
     private long        contextCPtr;     // CAVE: the name is referenced in the JNI
     private native long createContextCPtr(String osName);
-    public  native long createMsgCPtr    ();
+    public  native long createMsgCPtr    (int viewtype);
     private native long getChatlistCPtr  (int listflags, String query, int queryId);
     private native long getChatCPtr      (int chat_id);
     private native long getMsgCPtr       (int id);

src/com/b44t/messenger/DcMsg.java

@@ -57,8 +57,8 @@ public class DcMsg {
     public final static int DC_MSG_ID_MARKER1 = 1;
     public final static int DC_MSG_ID_DAYMARKER = 9;
 
-    public DcMsg(DcContext context) {
-        msgCPtr = context.createMsgCPtr();
+    public DcMsg(DcContext context, int viewtype) {
+        msgCPtr = context.createMsgCPtr(viewtype);
     }
 
     public DcMsg(long msgCPtr) {
@@ -93,26 +93,23 @@ public class DcMsg {
     public native int     getHeight          (int def);
     public native int     getDuration        ();
     public native void    lateFilingMediaSize(int width, int height, int duration);
-    public native int     getBytes           ();
     public @NonNull DcLot getSummary         (DcChat chat) { return new DcLot(getSummaryCPtr(chat.getChatCPtr())); }
     public native String  getSummarytext     (int approx_characters);
     public native int     showPadlock        ();
-    public @NonNull DcLot getMediainfo       () { return new DcLot(getMediainfoCPtr()); }
     public boolean        hasFile            () { String file = getFile(); return file!=null && !file.isEmpty(); }
     public native String  getFile            ();
     public native String  getFilemime        ();
     public native String  getFilename        ();
+    public native long    getFilebytes       ();
     public native boolean isForwarded        ();
     public native boolean isInfo             ();
     public native boolean isSetupMessage     ();
     public native String  getSetupCodeBegin  ();
     public native boolean isIncreation       ();
-    public native void    setType            (int type);
     public native void    setText            (String text);
     public native void    setFile            (String file, String filemime);
     public native void    setDimension       (int width, int height);
     public native void    setDuration        (int duration);
-    public native void    setMediainfo       (String author, String trackname);
 
     // aliases and higher-level tools
     public static int[] msgSetToIds(final Set<DcMsg> dcMsgs) {
@@ -200,5 +197,4 @@ public class DcMsg {
     private long        msgCPtr;        // CAVE: the name is referenced in the JNI
     private native void unrefMsgCPtr    ();
     private native long getSummaryCPtr  (long chatCPtr);
-    private native long getMediainfoCPtr();
 };

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -16,19 +16,15 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.annotation.SuppressLint;
 import android.arch.lifecycle.DefaultLifecycleObserver;
 import android.arch.lifecycle.LifecycleOwner;
 import android.arch.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
-import com.google.android.gms.security.ProviderInstaller;
-
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
@@ -41,10 +37,10 @@ import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirementProv
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirementProvider;
-import org.thoughtcrime.securesms.jobs.requirements.ServiceRequirementProvider;
 import org.thoughtcrime.securesms.jobs.requirements.SqlCipherMigrationRequirementProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
+import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.PeerConnectionFactory.InitializationOptions;
@@ -55,7 +51,6 @@ import org.whispersystems.libsignal.util.AndroidSignalProtocolLogger;
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import dagger.ObjectGraph;
 
@@ -105,7 +100,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   public void onStart(@NonNull LifecycleOwner owner) {
     isAppVisible = true;
     Log.i(TAG, "App is now visible.");
-
     executePendingContactSync();
   }
 
@@ -113,6 +107,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   public void onStop(@NonNull LifecycleOwner owner) {
     isAppVisible = false;
     Log.i(TAG, "App is no longer visible.");
+    ScreenLockUtil.shouldLockApp = true;
   }
 
   @Override
@@ -148,7 +143,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
                                 .withDependencyInjector(this)
                                 .withJobSerializer(new JavaJobSerializer())
                                 .withRequirementProviders(new MasterSecretRequirementProvider(this),
-                                                          new ServiceRequirementProvider(this),
                                                           new NetworkRequirementProvider(this),
                                                           new SqlCipherMigrationRequirementProvider())
                                 .withConsumerThreads(5)

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -18,11 +18,13 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.TargetApi;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Bundle;
@@ -33,6 +35,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.preference.Preference;
+import android.widget.Toast;
 
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
@@ -65,6 +68,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
   private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
   private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
+  private static final String PREFERENCE_CATEGORY_INVITE         = "preference_category_invite";
+  private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
+
+  public static final int REQUEST_CODE_SET_BACKGROUND            = 11;
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@@ -145,6 +152,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+      this.findPreference(PREFERENCE_CATEGORY_INVITE)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_INVITE));
+      this.findPreference(PREFERENCE_CATEGORY_HELP)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
 
       if (VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
         tintIcons(getActivity());
@@ -177,37 +188,36 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
           .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
     }
 
-    private void setCategoryVisibility() {
-    }
-
     @TargetApi(11)
     private void tintIcons(Context context) {
-      Drawable sms           = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_textsms_white_24dp));
       Drawable notifications = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_notifications_white_24dp));
       Drawable privacy       = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_security_white_24dp));
       Drawable appearance    = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_brightness_6_white_24dp));
       Drawable chats         = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_forum_white_24dp));
-      Drawable devices       = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_laptop_white_24dp));
       Drawable advanced      = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_advanced_white_24dp));
+      Drawable invite        = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_mood_white_24dp));
+      Drawable help          = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_help_white_24dp));
 
       int[]      tintAttr   = new int[]{R.attr.pref_icon_tint};
       TypedArray typedArray = context.obtainStyledAttributes(tintAttr);
       int        color      = typedArray.getColor(0, 0x0);
       typedArray.recycle();
 
-      DrawableCompat.setTint(sms, color);
       DrawableCompat.setTint(notifications, color);
       DrawableCompat.setTint(privacy, color);
       DrawableCompat.setTint(appearance, color);
       DrawableCompat.setTint(chats, color);
-      DrawableCompat.setTint(devices, color);
       DrawableCompat.setTint(advanced, color);
+      DrawableCompat.setTint(invite, color);
+      DrawableCompat.setTint(help, color);
 
       this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS).setIcon(notifications);
       this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION).setIcon(privacy);
       this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance);
       this.findPreference(PREFERENCE_CATEGORY_CHATS).setIcon(chats);
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced);
+      this.findPreference(PREFERENCE_CATEGORY_INVITE).setIcon(invite);
+      this.findPreference(PREFERENCE_CATEGORY_HELP).setIcon(help);
     }
 
     private class CategoryClickListener implements Preference.OnPreferenceClickListener {
@@ -237,6 +247,16 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         case PREFERENCE_CATEGORY_ADVANCED:
           fragment = new AdvancedPreferenceFragment();
           break;
+        case PREFERENCE_CATEGORY_INVITE:
+          startActivity(new Intent(getActivity(), InviteActivity.class));
+          break;
+        case PREFERENCE_CATEGORY_HELP:
+          try {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help_url))));
+          } catch (ActivityNotFoundException e) {
+            Toast.makeText(getActivity(), R.string.ConversationListActivity_there_is_no_browser_installed_on_your_device, Toast.LENGTH_LONG).show();
+          }
+          break;
         default:
           throw new AssertionError();
         }