bump version

implement global search

.gitignore

@@ -30,3 +30,6 @@ jni/libspeex/.deps/
 
 # contains files for ndk-build when done from gradle.
 .externalNativeBuild
+
+# no vi tmp files
+*.swp

AndroidManifest.xml

@@ -144,23 +144,6 @@
     <activity android:name=".GroupCreateActivity"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".DatabaseUpgradeActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseCreateActivity"
-              android:label="@string/AndroidManifest__create_passphrase"
-              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphrasePromptActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".NewConversationActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
@@ -171,15 +154,6 @@
           android:windowSoftInputMode="stateHidden"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphraseChangeActivity"
-              android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".ApplicationPreferencesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -266,24 +240,10 @@
         </intent-filter>
     </activity>
 
-    <activity android:name=".contactshare.ContactShareEditActivity"
+    <activity android:name=".preferences.ChatBackgroundActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.SharedContactDetailsActivity"
-              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:exported="false" android:name=".service.KeyCachingService"/>
-
     <service android:name=".connect.KeepAliveService" android:enabled="true"/>
 
     <service android:name=".service.DirectShareService"
@@ -293,8 +253,6 @@
         </intent-filter>
     </service>
 
-    <service android:name=".service.GenericForegroundService"/>
-
     <receiver android:name=".connect.TimerReceiver" android:enabled="true"/>
 
     <receiver android:name=".notifications.MarkReadReceiver"
@@ -327,8 +285,6 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.ExpirationListener" />
-
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"

BUILDING.md

@@ -1,74 +0,0 @@
-Building Signal
-===============
-
-Basics
-------
-
-Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.  However, you needn't install it yourself; the
-"gradle wrapper" `gradlew`, mentioned below, will do that for you.
-
-Building Signal
----------------
-
-The following steps should help you (re)build Signal from the command line.
-
-1. Checkout the Signal-Android project source with the command:
-
-        git clone https://github.com/signalapp/Signal-Android.git
-
-2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
-3. Ensure that the following packages are installed from the Android SDK manager:
-    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (All API levels)
-    * Android Support Repository
-    * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
-
-        sdk.dir=/Application/android-sdk-macosx
-
-5. Using Java 8 
-
-6. Execute Gradle:
-
-        ./gradlew build
-
-Visual assets
-----------------------
-
-Source assets tend to be large binary blobs, which are best stored outside of git repositories. Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
-
-Sample command for generating our audio placeholder image:
-
-```bash
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
-pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
-```
-
-Setting up a development environment
-------------------------------------
-
-[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
-
-1. Install Android Studio.
-2. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
-3. From the Quickstart panel, choose "Configure" then "SDK Manager".
-4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
-5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
-7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-9. Default config options should be good enough.
-9. Project initialisation and build should proceed.
-
-Contributing code
------------------
-
-Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
-
-Mailing list
-------------
-
-Development discussion happens on the whispersystems mailing list.
-[To join](https://lists.riseup.net/www/info/whispersystems)
-Send emails to whispersystems@lists.riseup.net
-

apntool/.gitignore

@@ -1,2 +0,0 @@
-*.db
-*.db.gz

apntool/apntool.py

@@ -1,106 +0,0 @@
-import sys
-import re
-import argparse
-import sqlite3
-import gzip
-from progressbar import ProgressBar, Counter, Timer
-from lxml import etree
-
-parser = argparse.ArgumentParser(prog='apntool', description="""Process Android's apn xml files and drop them into an
-                                                             easily queryable SQLite db. Tested up to version 9 of
-                                                             their APN file.""")
-parser.add_argument('-v', '--version', action='version', version='%(prog)s v1.1')
-parser.add_argument('-i', '--input', help='the xml file to parse', default='apns.xml', required=False)
-parser.add_argument('-o', '--output', help='the sqlite db output file', default='apns.db', required=False)
-parser.add_argument('--quiet', help='do not show progress or verbose instructions', action='store_true', required=False)
-parser.add_argument('--no-gzip', help="do not gzip after creation", action='store_true', required=False)
-args = parser.parse_args()
-
-
-def normalized(target):
-    o2_typo = re.compile(r"02\.co\.uk")
-    port_typo = re.compile(r"(\d+\.\d+\.\d+\.\d+)\.(\d+)")
-    leading_zeros = re.compile(r"(/|\.|^)0+(\d+)")
-    subbed = o2_typo.sub(r'o2.co.uk', target)
-    subbed = port_typo.sub(r'\1:\2', subbed)
-    subbed = leading_zeros.sub(r'\1\2', subbed)
-    return subbed
-
-try:
-    connection = sqlite3.connect(args.output)
-    cursor = connection.cursor()
-    cursor.execute('SELECT SQLITE_VERSION()')
-    version = cursor.fetchone()
-    if not args.quiet:
-        print("SQLite version: %s" % version)
-        print("Opening %s" % args.input)
-
-    cursor.execute("PRAGMA legacy_file_format=ON")
-    cursor.execute("PRAGMA journal_mode=DELETE")
-    cursor.execute("PRAGMA page_size=32768")
-    cursor.execute("VACUUM")
-    cursor.execute("DROP TABLE IF EXISTS apns")
-    cursor.execute("""CREATE TABLE apns(_id INTEGER PRIMARY KEY, mccmnc TEXT, mcc TEXT, mnc TEXT, carrier TEXT,
-                apn TEXT, mmsc TEXT, port INTEGER, type TEXT, protocol TEXT, bearer TEXT, roaming_protocol TEXT,
-                carrier_enabled INTEGER, mmsproxy TEXT, mmsport INTEGER, proxy TEXT,  mvno_match_data TEXT,
-                mvno_type TEXT, authtype INTEGER, user TEXT, password TEXT, server TEXT)""")
-
-    apns = etree.parse(args.input)
-    root = apns.getroot()
-    pbar = None
-    if not args.quiet:
-        pbar = ProgressBar(widgets=['Processed: ', Counter(), ' apns (', Timer(), ')'], maxval=len(list(root))).start()
-
-    count = 0
-    for apn in root.iter("apn"):
-        if apn.get("mmsc") is None:
-            continue
-        sqlvars = ["?" for x in apn.attrib.keys()] + ["?"]
-        mccmnc = "%s%s" % (apn.get("mcc"), apn.get("mnc"))
-        normalized_mmsc = normalized(apn.get("mmsc"))
-        if normalized_mmsc != apn.get("mmsc"):
-            print("normalize MMSC: %s => %s" % (apn.get("mmsc"), normalized_mmsc))
-            apn.set("mmsc", normalized_mmsc)
-
-        if not apn.get("mmsproxy") is None:
-            normalized_mmsproxy = normalized(apn.get("mmsproxy"))
-            if normalized_mmsproxy != apn.get("mmsproxy"):
-                print("normalize proxy: %s => %s" % (apn.get("mmsproxy"), normalized_mmsproxy))
-                apn.set("mmsproxy", normalized_mmsproxy)
-
-        values = [apn.get(attrib) for attrib in apn.attrib.keys()] + [mccmnc]
-        keys = apn.attrib.keys() + ["mccmnc"]
-
-        cursor.execute("SELECT 1 FROM apns WHERE mccmnc = ? AND apn = ?", [mccmnc, apn.get("apn")])
-        if cursor.fetchone() is None:
-            statement = "INSERT INTO apns (%s) VALUES (%s)" % (", ".join(keys), ", ".join(sqlvars))
-            cursor.execute(statement, values)
-
-        count += 1
-        if not args.quiet:
-            pbar.update(count)
-
-    if not args.quiet:
-        pbar.finish()
-    connection.commit()
-    print("Successfully written to %s" % args.output)
-
-    if not args.no_gzip:
-        gzipped_file = "%s.gz" % (args.output,)
-        with open(args.output, 'rb') as orig:
-            with gzip.open(gzipped_file, 'wb') as gzipped:
-                gzipped.writelines(orig)
-        print("Successfully gzipped to %s" % gzipped_file)
-
-    if not args.quiet:
-        print("\nTo include this in the distribution, copy it to the project's assets/databases/ directory.")
-        print("If you support API 10 or lower, you must use the gzipped version to avoid corruption.")
-
-except sqlite3.Error, e:
-    if connection:
-        connection.rollback()
-    print("Error: %s" % e.args[0])
-    sys.exit(1)
-finally:
-    if connection:
-        connection.close()

apntool/requirements.txt

@@ -1,3 +0,0 @@
-argparse>=1.2.1
-lxml>=3.3.3
-progressbar-latest>=2.4

build.gradle

@@ -94,7 +94,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
     compile 'com.makeramen:roundedimageview:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.5'
-    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.squareup.dagger:dagger:1.2.2'
@@ -124,10 +123,6 @@ dependencies {
     compile 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
     compile 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
     compile 'org.signal:android-database-sqlcipher:3.5.9-S3'
-    compile ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1'
@@ -156,7 +151,6 @@ dependencyVerification {
         'com.android.support:preference-v14:1fcf40bd560dc21ce55b6a292d1326d28f52dc5e4f2a64eef2f38dd95777b645',
         'com.android.support:preference-v7:d9f32ddc92f8d6a0bd86a18f4fcaff805fa021245e395b6e7dd382907443ee53',
         'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
-        'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
         'mobi.upod:time-duration-picker:db469ce0f48dd96b892eac424ed76870e54bf00fe0a28cdcddfbe5f2a226a0e1',
         'com.codewaves.stickyheadergrid:stickyheadergrid:5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794',
         'com.android.support:appcompat-v7:b2825e8b47f665d3362d8481c8d147d1af9230d16f23a2b94f6ccbc53c68cec1',
@@ -195,7 +189,6 @@ dependencyVerification {
         'com.takisoft.fix:colorpicker:f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1',
         'com.github.dmytrodanylyk.circular-progress-button:library:8dc6a29a5a8db7b2ad5a9a7fda1dc9ae0893f4c8f0545732b2c63854ea693e8e',
         'org.signal:android-database-sqlcipher:33d4063336893af00b9d68b418e7b290cace74c20ce8aacffddc0911010d3d73',
-        'com.googlecode.ez-vcard:ez-vcard:7e24ad50b222d2f70ac91bdccfa3c0f6200b078d797cb784837f75e77bb4210f',
         'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
         'com.google.android.gms:play-services-base:0ca636a8fc9a5af45e607cdcd61783bf5d561cbbb0f862021ce69606eee5ad49',
         'com.google.android.gms:play-services-tasks:69ec265168e601d0203d04cd42e34bb019b2f029aa1e16fabd38a5153eea2086',
@@ -223,10 +216,8 @@ dependencyVerification {
         'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b',
         'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512',
         'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
-        'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'com.klinkerapps:logger:177e325259a8b111ad6745ec10db5861723c99f402222b80629f576f49408541',
         'com.google.android:flexbox:a9989fd13ae2ee42765dfc515fe362edf4f326e74925d02a10369df8092a4935',
-        'org.jsoup:jsoup:abeaf34795a4de70f72aed6de5966d2955ec7eb348eeb813324f23c999575473',
         'org.whispersystems:curve25519-android:82595394422b957d4a5b5f1b27b75ba25cf6dc4db4d312418ca38cd6fff279ca',
         'org.whispersystems:signal-protocol-java:5152c2b01a25147967d6bf82e540f947901bdfa79260be3eb3e96b03f787d6b5',
         'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
@@ -253,8 +244,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 399
-        versionName "0.0.9"
+        versionCode 400
+        versionName "0.0.10"
         applicationId "chat.delta.androidii"
 
         minSdkVersion 14
@@ -262,14 +253,12 @@ android {
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal");
+        project.ext.set("archivesBaseName", "Deltachat");
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
-        buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\""
-        buildConfigField "int", "GIPHY_PROXY_PORT", "80"
         buildConfigField "String", "USER_AGENT", "\"OWA\""
         buildConfigField "boolean", "DEV_BUILD", "false"
 
@@ -318,7 +307,6 @@ android {
                           'proguard-klinker.pro',
                           'proguard-retrolambda.pro',
                           'proguard-okhttp.pro',
-                          'proguard-ez-vcard.pro',
                           'proguard.cfg'
             testProguardFiles 'proguard-automation.pro',
                           'proguard.cfg'

jni/dc_wrapper.c

@@ -452,11 +452,15 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_removeContactFromChat(JNIEnv *e
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcContext_setDraft(JNIEnv *env, jobject obj, jint chat_id, jstring draft /* NULL=delete */)
+JNIEXPORT void Java_com_b44t_messenger_DcContext_setDraft(JNIEnv *env, jobject obj, jint chat_id, jobject msg /* NULL=delete */)
 {
-	CHAR_REF(draft);
-		dc_set_text_draft(get_dc_context(env, obj), chat_id, draftPtr /* NULL=delete */);
-	CHAR_UNREF(draft);
+	dc_set_draft(get_dc_context(env, obj), chat_id, get_dc_msg(env, msg));
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getDraftCPtr(JNIEnv *env, jobject obj, jint chat_id)
+{
+	return (jlong)dc_get_draft(get_dc_context(env, obj), chat_id);
 }
 
 
@@ -834,21 +838,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isVerified(JNIEnv *env, jobjec
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_DcChat_getDraft(JNIEnv *env, jobject obj) /* returns NULL for "no draft" */
-{
-	const char* temp = dc_chat_get_text_draft(get_dc_chat(env, obj));
-		jstring ret = temp? JSTRING_NEW(temp) : NULL;
-	free(temp);
-	return ret;
-}
-
-
-JNIEXPORT jlong Java_com_b44t_messenger_DcChat_getDraftTimestamp(JNIEnv *env, jobject obj)
-{
-	return JTIMESTAMP(dc_chat_get_draft_timestamp(get_dc_chat(env, obj)));
-}
-
-
 JNIEXPORT jintArray Java_com_b44t_messenger_DcContext_getChatMedia(JNIEnv *env, jobject obj, jint chat_id, jint msg_type, jint or_msg_type)
 {
 	dc_array_t* ca = dc_get_chat_media(get_dc_context(env, obj), chat_id, msg_type, or_msg_type);
@@ -900,12 +889,14 @@ JNIEXPORT jintArray Java_com_b44t_messenger_DcContext_getChatContacts(JNIEnv *en
 static dc_msg_t* get_dc_msg(JNIEnv *env, jobject obj)
 {
 	static jfieldID fid = 0;
-	if (fid==0) {
-		jclass cls = (*env)->GetObjectClass(env, obj);
-		fid = (*env)->GetFieldID(env, cls, "msgCPtr", "J" /*Signature, J=long*/);
-	}
-	if (fid) {
-		return (dc_msg_t*)(*env)->GetLongField(env, obj, fid);
+	if (env && obj) {
+		if (fid==0) {
+			jclass cls = (*env)->GetObjectClass(env, obj);
+			fid = (*env)->GetFieldID(env, cls, "msgCPtr", "J" /*Signature, J=long*/);
+		}
+		if (fid) {
+			return (dc_msg_t*)(*env)->GetLongField(env, obj, fid);
+		}
 	}
 	return NULL;
 }
@@ -1183,7 +1174,10 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getNameNAddr(JNIEnv *env, jo
 
 JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getProfileImage(JNIEnv *env, jobject obj)
 {
-	return JSTRING_NEW("");
+	const char* temp = dc_contact_get_profile_image(get_dc_contact(env, obj));
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
 }
 
 

proguard-ez-vcard.pro

@@ -1 +0,0 @@
--dontwarn ezvcard.io.html.HCardPage

res/layout/activity_contact_name_edit.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-    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"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:theme="?attr/actionBarStyle"
-        android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="12dp">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/name_edit_display_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:textSize="20sp"
-                tools:text="Peter Parker"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_prefix"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_prefix"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_given_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_given_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_middle_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_middle_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_family_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_family_name"/>
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
-                android:id="@+id/name_edit_suffix"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/ContactNameEditActivity_suffix"/>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>

res/layout/activity_contact_share_edit.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/contact_share_edit_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="80dp"
-        android:clipToPadding="false"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/contact_share_edit_send"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:src="@drawable/ic_send_push_white_24dp"
-        android:layout_margin="@dimen/floating_action_button_margin"/>
-
-</FrameLayout>

res/layout/activity_shared_contact_details.xml

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/shared_contact_details_header_background">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="?attr/actionBarSize"
-                android:orientation="vertical"
-                android:gravity="center">
-
-                <ImageView
-                    android:id="@+id/contact_details_avatar"
-                    android:layout_width="125dp"
-                    android:layout_height="125dp"
-                    android:padding="8dp"
-                    android:transitionName="avatar"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.7"/>
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                    android:id="@+id/contact_details_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:transitionName="name"
-                    android:gravity="center"
-                    android:textSize="20sp"
-                    tools:text="Peter Parker"/>
-
-                <TextView
-                    android:id="@+id/contact_details_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:transitionName="number"
-                    android:layout_marginBottom="14dp"
-                    android:gravity="center"
-                    tools:text="(610) 555-5555"/>
-
-                <Button
-                    android:id="@+id/contact_details_add_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:layout_gravity="center"
-                    style="@style/Button.Primary"
-                    android:text="@string/SharedContactDetailsActivity_add_to_contacts" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <Button
-                        android:id="@+id/contact_details_invite_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_gravity="center"
-                        style="@style/Button.Borderless"
-                        android:text="@string/SharedContactDetailsActivity_invite_to_signal"
-                        android:visibility="gone"
-                        tools:visibility="gone"/>
-
-                    <LinearLayout
-                        android:id="@+id/contact_details_engage_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal"
-                        style="?attr/buttonBarStyle"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <LinearLayout
-                            android:id="@+id/contact_details_message_button"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical"
-                            android:gravity="center"
-                            android:padding="10dp">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
-                                android:src="@drawable/message_24dp"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/SharedContactDetailsActivity_signal_message"
-                                android:textColor="@color/signal_primary"/>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/contact_details_call_button"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical"
-                            android:gravity="center"
-                            android:padding="10dp">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="6dp"
-                                android:tint="@color/signal_primary"
-                                android:src="@drawable/phone_24dp"/>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/SharedContactDetailsActivity_signal_call"
-                                android:textColor="@color/signal_primary"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </FrameLayout>
-
-            </LinearLayout>
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:theme="@style/TextSecure.LightActionBar.DarkText"
-                android:background="@color/transparent"
-                app:layout_collapseMode="pin" />
-
-        </android.support.design.widget.CollapsingToolbarLayout>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/contact_details_fields"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-</android.support.design.widget.CoordinatorLayout>

res/layout/attachment_type_selector.xml

@@ -100,24 +100,27 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:visibility="invisible"
                           android:gravity="center"
-                          android:orientation="vertical"
-                          android:layout_weight="1">
+                          android:orientation="vertical">
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
-                        android:id="@+id/contact_button"
+                        android:id="@+id/gif_button"
                         android:layout_width="53dp"
                         android:layout_height="53dp"
-                        android:src="@drawable/ic_person_white_24dp"
+                        android:src="@drawable/ic_gif_white_24dp"
+                        android:visibility="gone"
                         android:scaleType="center"
-                        android:contentDescription="@string/attachment_type_selector__contact_description"
-                        app:circleColor="@color/blue_400"/>
+                        android:contentDescription="@string/attachment_type_selector__gif_description"
+                        app:circleColor="@color/cyan_400"/>
 
                 <TextView android:layout_marginTop="10dp"
+                          android:visibility="gone"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           style="@style/AttachmentTypeLabel"
-                          android:text="@string/attachment_type_selector__contact"/>
+                          android:text="@string/attachment_type_selector__gif"/>
 
             </LinearLayout>
 
@@ -180,27 +183,26 @@
 
             </LinearLayout>
 
-
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
-                          android:layout_weight="1"
                           android:gravity="center"
-                          android:orientation="vertical">
+                          android:orientation="vertical"
+                          android:layout_weight="1">
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
-                        android:id="@+id/giphy_button"
+                        android:id="@+id/contact_button"
                         android:layout_width="53dp"
                         android:layout_height="53dp"
-                        android:src="@drawable/ic_gif_white_24dp"
+                        android:src="@drawable/ic_person_white_24dp"
                         android:scaleType="center"
-                        android:contentDescription="@string/attachment_type_selector__gif_description"
-                        app:circleColor="@color/cyan_400"/>
+                        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__gif"/>
+                          android:text="@string/attachment_type_selector__contact"/>
 
             </LinearLayout>
 

res/layout/blocked_contact_list_item.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<org.thoughtcrime.securesms.preferences.BlockedContactListItem
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:paddingRight="25dip">
-
-    <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo_image"
-            android:layout_width="@dimen/contact_selection_photo_size"
-            android:layout_height="@dimen/contact_selection_photo_size"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:cropToPadding="true"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
-
-    <TextView android:id="@+id/name"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_alignParentTop="true"
-              android:layout_marginLeft="14dip"
-              android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-              android:singleLine="true"
-              android:ellipsize="marquee"
-              android:layout_toRightOf="@id/contact_photo_image"
-              android:gravity="center_vertical|left"
-              android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</org.thoughtcrime.securesms.preferences.BlockedContactListItem>

res/layout/blocked_contacts_fragment.xml

@@ -1,23 +0,0 @@
-<?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"
-              android:paddingLeft="16dip"
-              android:paddingRight="16dip">
-
-    <ListView android:id="@id/android:list"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_weight="1"
-              android:drawSelectorOnTop="false"/>
-
-    <TextView android:id="@id/android:empty"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_gravity="center|center_vertical"
-              android:gravity="center|center_vertical"
-              android:textSize="20sp"
-              android:text="@string/blocked_contacts_fragment__no_blocked_contacts"/>
-
-</LinearLayout>

res/layout/conversation_activity.xml

@@ -24,18 +24,6 @@
                       android:clipToPadding="false"
                       android:clipChildren="false">
 
-            <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/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/reminder_stub"
                     android:layout="@layout/conversation_activity_reminderview_stub"

res/layout/conversation_activity_group_share_profile_stub.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.profiles.GroupShareProfileView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/group_share_profile_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />

res/layout/conversation_activity_unverified_banner_stub.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.identity.UnverifiedBannerView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/unverified_banner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />

res/layout/conversation_item_received.xml

@@ -101,14 +101,6 @@
                 app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
                 tools:visibility="visible"/>
 
-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_received_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:visibility="gone"/>
-
             <ViewStub
                 android:id="@+id/image_view_stub"
                 android:layout_width="wrap_content"

res/layout/conversation_item_received_shared_contact.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.SharedContactView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shared_contact_view"
-    android:layout_width="@dimen/media_bubble_default_dimens"
-    android:layout_height="wrap_content"
-    app:contact_titleColor="?conversation_item_received_text_primary_color"
-    app:contact_captionColor="?conversation_item_received_text_secondary_color"
-    app:contact_footerIconColor="?conversation_item_received_text_secondary_color"
-    app:contact_footerAlpha="0.7"/>

res/layout/conversation_item_sent.xml

@@ -51,14 +51,6 @@
                 app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
                 tools:visibility="visible"/>
 
-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_sent_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:visibility="gone"/>
-
             <ViewStub
                 android:id="@+id/image_view_stub"
                 android:layout_width="wrap_content"

res/layout/conversation_item_sent_shared_contact.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.SharedContactView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shared_contact_view"
-    android:layout_width="@dimen/media_bubble_default_dimens"
-    android:layout_height="wrap_content"
-    app:contact_titleColor="?conversation_item_sent_text_primary_color"
-    app:contact_captionColor="?conversation_item_sent_text_secondary_color"
-    app:contact_footerIconColor="?conversation_item_sent_icon_color"/>

res/layout/giphy_activity.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-    <android.support.design.widget.CoordinatorLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/giphy_logo"
-            android:orientation="vertical">
-
-        <android.support.design.widget.AppBarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/colorPrimary">
-
-            <org.thoughtcrime.securesms.giph.ui.GiphyActivityToolbar
-                    android:id="@+id/giphy_toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:background="?attr/colorPrimary"
-                    android:theme="?attr/actionBarStyle"
-                    app:layout_scrollFlags="scroll|enterAlways"/>
-
-            <android.support.design.widget.TabLayout
-                    android:id="@+id/tab_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:theme="?attr/actionBarTabBarStyle"
-                    android:scrollbars="horizontal"/>
-
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v4.view.ViewPager
-                android:id="@+id/giphy_pager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    </android.support.design.widget.CoordinatorLayout>
-
-    <ImageView android:id="@+id/giphy_logo"
-               android:src="@drawable/poweredby_giphy"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               android:layout_alignParentBottom="true"
-               android:padding="10dp"
-               android:background="@color/black"/>
-
-</RelativeLayout>

res/layout/giphy_activity_toolbar.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="horizontal">
-
-        <ImageView android:id="@+id/action_icon"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_gravity="center_vertical"
-                   android:gravity="center_vertical"
-                   android:clickable="true"
-                   android:background="@drawable/circle_touch_highlight_background"
-                   android:src="@drawable/ic_search_white_24dp" />
-
-        <LinearLayout android:id="@+id/toggle_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="match_parent"
-                      android:orientation="horizontal">
-
-            <EditText android:id="@+id/search_view"
-                      android:layout_height="wrap_content"
-                      android:layout_width="0px"
-                      android:layout_weight="1"
-                      android:layout_marginLeft="5dp"
-                      android:layout_marginStart="5dp"
-                      android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
-                      android:textColor="@color/white"
-                      android:textColorHint="@color/white"
-                      android:textCursorDrawable="@null"
-                      android:maxLines="1"
-                      android:singleLine="true"
-                      android:ellipsize="end"
-                      android:imeOptions="actionSearch"
-                      android:background="@android:color/transparent"
-                      android:layout_gravity="center_vertical"
-                      android:gravity="center_vertical"/>
-
-            <ImageView android:id="@+id/search_clear"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center_vertical"
-                       android:gravity="center_vertical"
-                       android:clickable="true"
-                       android:focusable="true"
-                       android:visibility="invisible"
-                       android:background="@drawable/circle_touch_highlight_background"
-                       android:src="@drawable/ic_clear_white_24dp" />
-
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:gravity="center">
-
-                <ImageView android:id="@+id/view_grid"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:clickable="true"
-                           android:visibility="visible"
-                           android:focusable="true"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_dashboard_white_24dp" />
-
-                <ImageView android:id="@+id/view_stream"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:visibility="gone"
-                           android:clickable="true"
-                           android:focusable="true"
-                           android:background="@drawable/circle_touch_highlight_background"
-                           android:src="@drawable/ic_view_stream_white_24dp" />
-
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</merge>

res/layout/giphy_fragment.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-    <android.support.v7.widget.RecyclerView
-            android:id="@+id/giphy_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"/>
-
-    <ProgressBar android:id="@+id/loading_progress"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center"
-                 android:visibility="visible"
-                 android:indeterminate="true"/>
-
-    <TextView android:id="@+id/no_results"
-              android:text="@string/giphy_fragment__nothing_found"
-              android:gravity="center"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:visibility="gone"
-              android:layout_gravity="center"/>
-
-</FrameLayout>

res/layout/giphy_thumbnail.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             xmlns:tools="http://schemas.android.com/tools">
-
-    <org.thoughtcrime.securesms.giph.ui.AspectRatioImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="fitXY" />
-
-    <ProgressBar android:id="@+id/gif_progress"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:indeterminate="true"
-                 android:visibility="gone"
-                 tools:visibility="visible"
-                 android:layout_gravity="center"
-                 android:gravity="center"/>
-
-</FrameLayout>

res/layout/shared_contact_view.xml

@@ -1,87 +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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/contact_avatar"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"/>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                    android:id="@+id/contact_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    style="@style/Signal.Text.Body"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:fontFamily="sans-serif-medium"
-                    android:textSize="16sp"
-                    tools:text="Peter Parker"/>
-
-                <TextView
-                    android:id="@+id/contact_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Signal.Text.Caption"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:textColor="@color/grey_600"
-                    tools:text="(610) 555-5555"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <org.thoughtcrime.securesms.components.ConversationItemFooter
-            android:id="@+id/contact_footer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="4dp"
-            android:elevation="9dp"
-            android:orientation="horizontal" />
-
-        <TextView
-            android:id="@+id/contact_action_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/message_bubble_bottom_padding"
-            android:gravity="center"
-            android:padding="10dp"
-            style="@style/Signal.Text.Preview"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif-medium"
-            android:textColor="@color/core_blue"
-            android:background="?attr/shared_contact_item_button_color"
-            android:foreground="?attr/selectableItemBackground"
-            tools:text="Add to Contacts"/>
-
-    </LinearLayout>
-
-</merge>

res/values-ar/strings.xml

@@ -320,12 +320,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">فشل دائما في اتصال سيجنال!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">سيجنال لم يتمكن من التسجيل مع خدمات جوجل بلاي، وتم تعطيل رسائل ومكالمات سيجنال. رجاء محاولة إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">خطأ أثناء جلب كامل دقة صورة GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">صور GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">لصاقات</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
   <string name="GroupCreateActivity_actionbar_edit_title">تدقيق المجموعة</string>
   <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
@@ -791,11 +788,9 @@
   <string name="IdentityUtil_untrusted_dialog_one">لقد تغير رقم أمانك مع %s الآن.</string>
   <string name="IdentityUtil_untrusted_dialog_two">لقد تغير الآن بيان سلامة المحادثة مع %1$s و%2$s.</string>
   <string name="IdentityUtil_untrusted_dialog_many">لقد تغير رقم أمانك مع %1$s و  %2$s و %3$s الآن.</string>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">ابحث في صور GIF واللصاقات</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">لا يوجد شيء</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">تعذر التقاط السجلات من هاتفك. يمكنك استخدام ADB للحصول على سجل التشغيل  بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
   <string name="log_submit_activity__submitting">إرسال</string>

res/values-be/strings.xml

@@ -94,8 +94,7 @@
   <string name="ExportFragment_cancel">Адмена</string>
   <string name="ExportFragment_exporting">Экспарт</string>
   <!--GcmRefreshJob-->
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Новая група</string>
   <string name="GroupCreateActivity_group_name_hint">Імя групы</string>
@@ -276,8 +275,8 @@
   <!--expiration-->
   <string name="expiration_off">Выкл</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <!--giphy_fragment-->
+
+
   <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">Дзякуй за вашу дапамогу!</string>

res/values-bg/strings.xml

@@ -261,12 +261,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманентна Сигнал комуникационна грешка!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Сигнал не успя да се регистрира с Google Play Services. Сигнал съообщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителние.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Грешка при вземането на GIF в пълна резолюция</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-ове</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Стикери</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Промяна на групата</string>
   <string name="GroupCreateActivity_group_name_hint">Име на групата</string>
@@ -711,11 +708,9 @@
     <item quantity="one">%d друг</item>
     <item quantity="other">%d други</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Търсене сред GIF-ове и стикери</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Няма нищо открито</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Неуспешно прочитане на доклада на Вашето устройство. Все пак може да използвате ADB, за да получите доклада.</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
   <string name="log_submit_activity__submitting">Изпращане</string>

res/values-ca/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">La comunicació del Delta Chat falla contínuament!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">El Delta Chat no s\'ha pogut registrar al Google Play Services. Els missatges i les trucades del Delta Chat s\'han inhabilitat, registreu-vos de nou a Configuració &gt; Avançada.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">S\'ha produït un error en recuperar el GIF a resolució completa</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Adhesius</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Edita el grup</string>
   <string name="GroupCreateActivity_group_name_hint">Nom del grup</string>
@@ -723,11 +720,9 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
     <item quantity="one">%d altre</item>
     <item quantity="other">%d més</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Cerca GIF i adhesius</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">No s\'ha trobat res</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">No s\'ha pogut llegir el registre del dispositiu. Podeu fer servir ADB per obtindre un registre de depuració.</string>
   <string name="log_submit_activity__thanks">Gràcies per ajudar-nos!</string>
   <string name="log_submit_activity__submitting">S\'està enviant</string>

res/values-cs/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Chyba při získávání GIF v plném rozlišení</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFy</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Nálepky</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editovat skupinu</string>
   <string name="GroupCreateActivity_group_name_hint">Název skupiny</string>
@@ -769,11 +766,9 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
     <item quantity="many">%d ostatních</item>
     <item quantity="other">%d ostatních</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Hledat GIFy an nálepky</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nenalezeno</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Na vašem zařízení nelze číst log. Můžete místo toho použít pro získání logu ADB.</string>
   <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
   <string name="log_submit_activity__submitting">Odesílání</string>

res/values-da/strings.xml

@@ -245,12 +245,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl i Delta Chat-kommunikationen!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat var ude af stand til at registrere med Google Play Services. Delta Chat beskeder og opkald blev deaktiveret, prøv venligst at registrere igen i Indstillinger &gt; Advanceret.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Der skete en fejl i, mens vi hentede GIF i fuld opløsning.</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Klistermærke</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Rediger gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
@@ -649,11 +646,9 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
     <item quantity="one">%d anden</item>
     <item quantity="other">%d andre</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Søg i GIFs og klistermærker</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Fandt ingenting</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke tilgå loggen på din enhed. Du kan alternativt benytte ADB for at få en debug log.</string>
   <string name="log_submit_activity__thanks">Tak for hjælpen!</string>
   <string name="log_submit_activity__submitting">Sender</string>

res/values-de/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Delta Chat-Kommunikationsfehler!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat konnte nicht für die Google-Play-Dienste registriert werden. Delta Chat-Nachrichten und -Anrufe wurden daher deaktiviert. Bitte registriere Delta Chat im Menü »Einstellungen« &gt; »Weitere Einstellungen« erneut.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Fehler beim Abruf des GIFs in voller Auflösung</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Sticker</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Gruppe bearbeiten</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
@@ -718,11 +715,9 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
     <item quantity="one">%d weiterer</item>
     <item quantity="other">%d weitere</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFs und Sticker suchen</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nichts gefunden</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Das Diagnoseprotokoll auf deinem Gerät konnte nicht gelesen werden. Du kannst allerdings immer noch ADB verwenden, um ein Diagnoseprotokoll zu erhalten.</string>
   <string name="log_submit_activity__thanks">Danke für deine Hilfe!</string>
   <string name="log_submit_activity__submitting">Übermitteln</string>

res/values-el/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Delta Chat δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Delta Chat έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Πρόβλημα κατά την ανάκτηση της πλήρους ανάλυσης της εικόνας GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">Εικόνες GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Αυτοκόλλητα</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Επεξεργασία ομάδας</string>
   <string name="GroupCreateActivity_group_name_hint">Όνομα ομάδας</string>
@@ -722,11 +719,9 @@
     <item quantity="one">%d άλλος/η</item>
     <item quantity="other">%d άλλοι/ες</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Αναζήτηση GIFs και αυτοκολλήτων</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Δε βρέθηκε τίποτα</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Αποτυχία ανάγνωσης αρχείου καταγραφής συμβάντων για τη συσκευή σου. Μπορείς να χρησιμοποιήσεις το ADB για να πάρεις ένα αρχείο συμβάντων αποσφαλμάτωσης.</string>
   <string name="log_submit_activity__thanks">Ευχαριστούμε για τη βοήθειά σου!</string>
   <string name="log_submit_activity__submitting">Αποστολή</string>

res/values-es/strings.xml

@@ -277,12 +277,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">¡Fallo permanente de comunicación de Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat fué incapaz de registrarse con Google Play Services. Los mensajes y llamadas de Delta Chat han sido desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Error al obtener un GIF a resolución completa</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Pegatinas (stickers)</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nombre del grupo</string>
@@ -797,11 +794,9 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
     <item quantity="one">%d otro</item>
     <item quantity="other">%d otros</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Buscar GIFs y pegatinas (stickers)</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">No se encontró nada</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">No se pudo leer el registro (log) en su dispositivo. Aún puede usar ADB para obtener un registro de depuración en su lugar.</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>

res/values-et/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Püsiv Signali ühendusviga!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ei saanud registreerida teenusega Google Play Services. Signali sõnumid ja kõned on keelatud, palun proovi taas-registreerida menüüs Seaded &gt; Täpsem.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Täisresolutsiooniga GIFi vastuvõtmisel esines viga</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFid</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Kleepsud</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uus grupp</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Muuda gruppi</string>
   <string name="GroupCreateActivity_group_name_hint">Grupi nimi</string>
@@ -729,11 +726,9 @@
     <item quantity="one">%d teine</item>
     <item quantity="other">%d teist</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Otsi GIFe ja kleepse</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Midagi ei leitud</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Ei saanud sinu seadmes lugeda logi. Sa võid siiski kasutada ADB-d, et saada selle asemel silumislogi.</string>
   <string name="log_submit_activity__thanks">Täname abi eest!</string>
   <string name="log_submit_activity__submitting">Saatmine</string>

res/values-eu/strings.xml

@@ -266,12 +266,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Delta Chat behin betiko komunikazio hutsegitea!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ez da gai izan Google Play Zerbitzuekin erregistratzeko. Delta Chat mezu eta deiak desgaitu egin dira, mesedez saiatu bererregistratzen Ezarpenak &gt; Aurreratua menuan.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Errorea bereizmen osoko GIFa eskuratzerakoan</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFak</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Eranskailuak</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Talde berria</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Taldea editatu</string>
   <string name="GroupCreateActivity_group_name_hint">Taldearen izena</string>
@@ -727,11 +724,9 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
     <item quantity="one">%d gehiago</item>
     <item quantity="other">%d gehiago</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIF eta eranskailuak bilatu</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ez da ezer aurkitu</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Ezin izan da gailuko erregistroa irakurri.  Dena den, ordenagailuko ADB programa erabil dezakezu arazketa-erregistroa eskuratzeko.</string>
   <string name="log_submit_activity__thanks">Eskerrik asko zure laguntzagatik!</string>
   <string name="log_submit_activity__submitting">Bidaltzen</string>

res/values-fa/strings.xml

@@ -247,12 +247,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ارتباط سیگنال بطور کل قطع شده است</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">نرم‌افزار سیگنال نمی‌تواند از طریق خدمات Google Play، شما را ثبت‌نام کند. پیام‌ها و تماس‌های سیگنال، غیرفعال شده‌اند، لطفاً تلاش کنید از طریق تنظیمات مجدداً ثبت‌نام کنید.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">خطا در هنگام دریافت GIF با کیفیت کامل</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">گیف ها</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">استیکر ها</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">گروه جدید</string>
   <string name="GroupCreateActivity_actionbar_edit_title">ویرایش گروه</string>
   <string name="GroupCreateActivity_group_name_hint">نام گروه</string>
@@ -625,11 +622,9 @@
     <item quantity="one">%d دیگران</item>
     <item quantity="other">%d دیگران</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">جست‌وجوی فایل گیف و استیکر</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">چیزی یافت نشد</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">نمی توانیم فایل گزارش را در دستگاه شما بخوانیم.شما می توانید از طریق ADB گزارش دیباگ را دریافت کنید.</string>
   <string name="log_submit_activity__thanks">تشکر از کمک شما!</string>
   <string name="log_submit_activity__submitting">ارسال</string>

res/values-fi/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pysyvä Delta Chat-yhteysvirhe!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi Delta Chat-viestit ja puhelut ovat otettu pois käytöstä. Kokeile rekisteröityä uudelleen Signalin lisäasetuksista.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Täysikokoisen GIFin lataaminen epäonnistui</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFit</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Tarrat</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Muokkaa ryhmää</string>
   <string name="GroupCreateActivity_group_name_hint">Ryhmän nimi</string>
@@ -723,11 +720,9 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
     <item quantity="one">%d muu</item>
     <item quantity="other">%d muuta</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Etsi GIFejä ja tarroja</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Mitään ei löytynyt</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Lokin lukeminen laitteestasi epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokin noutamiseen.</string>
   <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
   <string name="log_submit_activity__submitting">Lähetetään</string>

res/values-fr/strings.xml

@@ -277,12 +277,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec de communication Delta Chat permanent !</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat n’a pas réussi à s’inscrire auprès des Services Google Play. Les appels et messages Delta Chat ont été désactivés. Veuillez essayer de vous réinscrire dans Paramètres &gt; Avancé.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Erreur de récupération du GIF à pleine résolution</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Autocollants</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Modifier le groupe</string>
   <string name="GroupCreateActivity_group_name_hint">Nom du groupe</string>
@@ -787,11 +784,9 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i
     <item quantity="one">%d autre</item>
     <item quantity="other">%d autres</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Chercher des GIF et des autocollants</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Aucun résultat</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Impossible de lire le journal de votre appareil. Vous pouvez toujours utiliser ADB pour obtenir un journal de débogage.</string>
   <string name="log_submit_activity__thanks">Nous vous remercions pour votre aide !</string>

res/values-ga/strings.xml

@@ -219,10 +219,7 @@
   <string name="ExperienceUpgradeActivity_signal_profiles_are_here">Tá próifíl Delta Chat anseo</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Fadhb cumarsáid Delta Chat buan!</string>
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFeanna</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Greamáin</string>
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Baicle nua</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Athraigh an bhaicle</string>
@@ -615,10 +612,8 @@ a shonrú</string>
     <item quantity="many">%d eile</item>
     <item quantity="other">%d eile</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Cuardaigh GIFs agus greamáin</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Níor aimsíodh dada</string>
+
+
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">Go raibh maith agat as ucht do chabhair!</string>
   <string name="log_submit_activity__submitting">Ag seol isteach</string>

res/values-gl/strings.xml

@@ -261,11 +261,8 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Erro de comunicación permanente!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Non foi posible rexistrar Delta Chat con Servizos de Google Play. As mensaxes e chamadas de Delta Chat foron desactivadas; tenta volver facer o rexistro en Axustes&gt;Avanzado.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Erro ao recuperar o GIF coa resolución completa</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Adhesivos</string>
+
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Novo grupo</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editar grupo</string>
@@ -718,10 +715,8 @@
     <item quantity="one">%d máis</item>
     <item quantity="other">%dmáis</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Buscar GIF e adhesivos</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Non se atopou nada</string>
+
+
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Non se puido ler o rexistro do teu dispositivo. Aínda podes utilizar ADB para obter no seu lugar un rexistro de depuración.</string>
   <string name="log_submit_activity__thanks">Grazas pola túa axuda!</string>

res/values-hr/strings.xml

@@ -275,12 +275,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna greška u Delta Chat komunikaciji!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat se nije uspješno registrirao na Google Play Services. Delta Chat poruke i pozivi su onemogućeni, pokušajte se ponovno registrirati kroz Postavke &gt; Napredno.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Greška pri dohvaćanju GIFa pune rezolucije</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFovi</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Naljepnice</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova grupa</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Uredi grupu</string>
   <string name="GroupCreateActivity_group_name_hint">Naziv grupe</string>
@@ -685,11 +682,9 @@ Primljena poruka razmjene ključeva za pogrešnu inačicu protokola.</string>
     <item quantity="few">%d druga</item>
     <item quantity="other">%d drugih</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Pretraži GIFove i naljepnice</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ništa nije pronađeno.</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Čitanje zapisa na Vašem uređaju nije moguće. Još uvijek možete koristiti ADB za pristup debug zapisu.</string>
   <string name="log_submit_activity__thanks">Hvala na pomoći!</string>
   <string name="log_submit_activity__submitting">Slanje</string>

res/values-hu/strings.xml

@@ -278,12 +278,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Elhúzódó Delta Chat kommunikációs hiba!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Delta Chat nem tudott beregisztrálni a Google Play Szolgáltatásokra. A Delta Chat üzenetek és hívások ezért le lettek tiltva. Kérlek próbálj meg újraregisztrálni a Beállítások &gt; Haladó-ban!</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Hiba történt a teljes felbontású GIF letöltése során</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-ek</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Matricák</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Új csoport</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Csoport szerkesztése</string>
   <string name="GroupCreateActivity_group_name_hint">Csoport neve</string>
@@ -802,11 +799,9 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
     <item quantity="one">%d további</item>
     <item quantity="other">%d további</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFek és matricák keresése</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nincs találat</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nem lehet beolvasni a naplót készülékeden. Továbbra is használhatod az ADB-t, hogy hozzáférj a hibakeresési naplóhoz.</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>

res/values-in/strings.xml

@@ -251,12 +251,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan permanen komunikasi Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat tidak dapat melakukan registrasi dengan Layanan Google Play. Fitur Delta Chat seperti pesan dan panggilan di nonaktifkan, mohon registrasi ulang melalui Pengaturan &gt; Lanjutan.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Kesalahan saat mengambil berkas GIF dengan resolusi penuh</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Stiker</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup baru</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Ubah grup</string>
   <string name="GroupCreateActivity_group_name_hint">Nama grup</string>
@@ -701,11 +698,9 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <plurals name="identity_others">
     <item quantity="other">%d yang lain</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Cari GIF dan stiker</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Tidak ada yang ditemukan</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Tidak bisa membaca catatan log pada perangkat Anda. Anda masih bisa menggunakan ADB untuk mengambil log celah keamanan.</string>
   <string name="log_submit_activity__thanks">Terima kasih atas bantuan Anda!</string>
   <string name="log_submit_activity__submitting">Mengirimkan</string>

res/values-it/strings.xml

@@ -266,12 +266,9 @@
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Comunicazione Delta Chat fallita definitivamente!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat è stato impossibilitato a registrarsi con i sevizi di Google Play.
 I suoi messaggi e le chiamate sono state disabilitate, si prega di provare e ri-registrare in Impostazioni &gt; Avanzate.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Errore nel prelevare la GIF in risoluzione massima</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Adesivi</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuovo gruppo</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Modifica gruppo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome del gruppo</string>
@@ -722,11 +719,9 @@ Ricevuto un messaggio di scambio chiavi per una versione di protocollo non valid
     <item quantity="one">%d altro</item>
     <item quantity="other">%d altri</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Cerca GIF ed adesivi</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Non trovato</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Non è possibile leggere i log dal tuo dispositivo. Puoi provare ad usare ADB per ottenere i log di debug</string>
   <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
   <string name="log_submit_activity__submitting">Invio in corso</string>

res/values-iw/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">כישלון תקשורת קבוע של Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat לא היה יכול להירשם עם שירותי Google Play. הודעות ושיחות של Delta Chat הושבתו, אנא נסה להירשם מחדש בהגדרות &lt; מתקדם.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">שגיאה באחזור GIF ברזולוציה מלאה</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">קובצי GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">מדבקות</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">קבוצה חדשה</string>
   <string name="GroupCreateActivity_actionbar_edit_title">ערוך קבוצה</string>
   <string name="GroupCreateActivity_group_name_hint">שם הקבוצה</string>
@@ -768,11 +765,9 @@
     <item quantity="many">%d אחרים</item>
     <item quantity="other">%d אחרים</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">חיפוש קובצי GIF ומדבקות</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">לא נמצא דבר</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">לא ניתן לקרוא את היומן במכשיר שלך. עדיין אפשר להשתמש ב־ADB כדי לקבל יומן תיקון שגיאות.</string>
   <string name="log_submit_activity__thanks">תודה על העזרה שלך!</string>
   <string name="log_submit_activity__submitting">מגיש</string>

res/values-ja/strings.xml

@@ -251,12 +251,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">永続的なSignal通信のエラー！</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google PlayサービスにSignalを登録できなかったため、Signalのメッセージと通話は無効になっています。設定 &gt; 詳細設定で再登録を試してください。</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">GIFファイルの取り込みでエラー</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">ステッカー</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新規グループ</string>
   <string name="GroupCreateActivity_actionbar_edit_title">グループを編集する</string>
   <string name="GroupCreateActivity_group_name_hint">グループ名</string>
@@ -691,11 +688,9 @@
   <plurals name="identity_others">
     <item quantity="other">ほか%d人</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFやステッカーを検索</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">何も見つかりませんでした</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">デバイス上のログを読めません。ただしADBを使ってデバッグログを読むことはできます。</string>
   <string name="log_submit_activity__thanks">ご協力ありがとうございます！</string>
   <string name="log_submit_activity__submitting">送信中</string>

res/values-km-rKH/strings.xml

@@ -246,12 +246,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ការបរាជ័យក្នុងការទំនាក់ទំនង ស៊ីហ្គណល អចិន្រ្តៃយ៍!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">ស៊ីហ្គណល មិនអាចចុះឈ្មោះជាមួយ Google Play Services។ ការផ្ញើសារ​ និងការហៅចេញស៊ីហ្គណល ត្រូវបានបិទ សូមព្យាយាមចុះឈ្មោះសារជាថ្មីក្នុង ការកំណត់ &gt; កម្រិតខ្ពស់។</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">មានបញ្ហានៅពេលទាញយករូបភាព GIF ពេញខ្នាត</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">ស្ទីកគ័រ</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">ក្រុមថ្មី</string>
   <string name="GroupCreateActivity_actionbar_edit_title">កែប្រែក្រុម</string>
   <string name="GroupCreateActivity_group_name_hint">ឈ្មោះក្រុម</string>
@@ -687,11 +684,9 @@
   <plurals name="identity_others">
     <item quantity="other">%dផ្សេង</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">ស្វែករក GIFs និងស្ទីកគ័រ</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">ពុំរកមិនឃើញអ្វីទេ</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">មិនអាចអានកំណត់ហេតុនៅលើឧបករណ៍របស់អ្នកបានទេ។ អ្នកនៅតែអាចប្រើ ADB ដើម្បីទាញយកកំណត់ត្រាកំហុសជំនួសបាន។​</string>
   <string name="log_submit_activity__thanks">អរគុណសម្រាប់ការជួយរបស់អ្នក!</string>
   <string name="log_submit_activity__submitting">កំពុងបញ្ជូន</string>

res/values-ko/strings.xml

@@ -223,12 +223,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">영구적인 Delta Chat 통신 실패!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal은 Google Play 서비스에 등록할 수 없습니다. Delta Chat 메시지와 통화는 사용 중지되었으므로 Delta Chat 설정 메뉴에서 재가입해 주세요.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">최대 해상도 GIF 파일을 받는 동안 오류 발생</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF 파일</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">스티커</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">그룹 만들기</string>
   <string name="GroupCreateActivity_actionbar_edit_title">그룹 편집</string>
   <string name="GroupCreateActivity_group_name_hint">그룹 이름</string>
@@ -590,11 +587,9 @@
   <string name="expiration_days_abbreviated">%d일</string>
   <string name="expiration_weeks_abbreviated">%d주</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIF 파일과 스티커 검색</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">찾지 못하였습니다.</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">기기에서 로그 가져올 수 없지만 ADB로 수동 가져올 수 있음</string>
   <string name="log_submit_activity__thanks">도와주셔서 감사합니다.</string>

res/values-ku/strings.xml

@@ -260,12 +260,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Ragihandina Signalê çênabe!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Li Google Play Services Delta Chat nikaribû qeydbike. Peyam û gaziyên Signalê hatin seqetkirin, ka li Şikil &gt; Taybet biceribîne dîsa qeydbikin.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">GIF bi kalîteya bilid nehat vekirin</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Koma nû</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Weşandina kom</string>
   <string name="GroupCreateActivity_group_name_hint">Navê kom</string>
@@ -713,11 +710,9 @@
     <item quantity="one">%da din</item>
     <item quantity="other">%dên din</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Li GIF û sticker bigerre</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Tiştek nehat peydakirin</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Tomar li cihazê te nikarim bixwînim. Lê belê ji bo tomara çareserî tu dikarî ADB bikarbînî.</string>
   <string name="log_submit_activity__thanks">Ji ber alîkariya te sipas!</string>
   <string name="log_submit_activity__submitting">Wedişînin...</string>

res/values-lg/strings.xml

@@ -185,11 +185,8 @@ a</string>
   <string name="ExportFragment_export_successful">Okufulumya kuwedde bulungi</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat tasobodde kwewandisa ku mpereza ya Google Play store, Obubaka ku Delta Chat n\'amasimu bigyiddwako, bambi gezaako oddemu wewandiise mu kweroboza &gt; Okwawaggulu</string>
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">Ekifananyi ekizanya</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Enkwaso</string>
-  <!--GroupCreateActivity-->
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ekibinja ekipya</string>
   <string name="GroupCreateActivity_group_name_hint">Erinya ly\'ekibinja</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Akaboondo ka mms akapya</string>
@@ -488,11 +485,9 @@ gy\'olonze (%s) sintuufu.</string>
   <string name="expiration_days_abbreviated">%dnnaku</string>
   <string name="expiration_weeks_abbreviated">%dwiiki</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Noonya GIFs ne sticka</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Tewali kisangidwa</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Tesobodde ku soma kabonero ku kyuma kyo. Okyasobola okukozesa ABD okufuna akaboneero ka debug.</string>
   <string name="log_submit_activity__thanks">Webale obuyambi bwo</string>

res/values-lt/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Ilgalaikė Delta Chat susisiekimo triktis!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat nepavyko prisiregistruoti prie „Google Play“ paslaugų. Delta Chat žinutės ir skambučiai buvo išjungti, prašome pabandyti iš naujo registruotis skyrelyje Nustatymai (angl. Settings) &gt; Išplėstiniai (angl. Advanced).</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Klaida, gaunant pilnos raiškos GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Paveiksliukai</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nauja grupė</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Taisyti grupę</string>
   <string name="GroupCreateActivity_group_name_hint">Grupės pavadinimas</string>
@@ -777,11 +774,9 @@
     <item quantity="many">dar %d</item>
     <item quantity="other">dar %d</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Ieškoti GIF ir paveikslėlių</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nieko nerasta</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nepavyko perskaityti žurnalo jūsų įrenginyje. Jūs vis dar galite naudoti ADB, kad vietoj to, gautumėte derinimo žurnalą.</string>
   <string name="log_submit_activity__thanks">Ačiū už jūsų pagalbą!</string>
   <string name="log_submit_activity__submitting">Pateikiama</string>

res/values-mk/strings.xml

@@ -114,8 +114,7 @@
   <string name="ExportFragment_cancel">Откажи</string>
   <string name="ExportFragment_exporting">Се експортира</string>
   <!--GcmRefreshJob-->
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_group_name_hint">Наслов на група</string>
@@ -350,8 +349,8 @@
   <!--expiration-->
   <string name="expiration_off">Исклучи</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <!--giphy_fragment-->
+
+
   <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">Ви благодариме за вашата помош!</string>

res/values-my/strings.xml

@@ -246,12 +246,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Delta Chat ဆက်သွယ်မှု လုံးဝမလုပ်နိုင်ပါ။</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ကို Google Play Services ဖြင့် မှတ်ပုံတင်၍မရနိုင်ပါ။ Delta Chat စာတိုနှင့် ဖုန်းခေါ်ဆိုမှု ကိုပိတ်လိုက်သည်။ ပြင်ဆင်ခြင်း &gt; အဆင့်မြင့်တွင် ပြန်လည်မှတ်ပုံတင်ကြည့်ပါ။ </string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">GIF ပုံ၏ မူရင်းအရည်အသွေးကို ပြသရန်အခက်အခဲရှိ </string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">စတစ်ကာများ </string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">အဖွဲ့အသစ်</string>
   <string name="GroupCreateActivity_actionbar_edit_title">အဖွဲ့ကို ပြင်မည်</string>
   <string name="GroupCreateActivity_group_name_hint">အဖွဲ့နာမည်</string>
@@ -688,11 +685,9 @@
   <plurals name="identity_others">
     <item quantity="other">%dအခြား</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFs နှင့် စတစ်ကာများကိုရှာဖွေခြင်း</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">ဘာမှ မတွေ့ဘူး</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">သင့်ဖုန်းတွင်မှတ်တမ်းကို ဖတ်၍မရပါ။ မှတ်တမ်းကို ပြန်ထုတ်ယူရန် ADB ကိုအသုံးပြုနိုင်ပါသည်။ </string>
   <string name="log_submit_activity__thanks">ကူညီပေးတာ ကျေးဇူးပါ။</string>
   <string name="log_submit_activity__submitting">ပေးပို့တင်ပြခြင်း</string>

res/values-nb/strings.xml

@@ -261,12 +261,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Varig Delta Chat-kommunikasjonsfeil.</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat klarte ikke å registrere seg som Google Play-tjeneste. Delta Chat-meldinger og samtaler er derfor slått av. Prøv å registrere programmet på nytt under Innstillinger &gt; Avansert.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Feil under henting av GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Klistremerker</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Rediger gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
@@ -713,11 +710,9 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
     <item quantity="one">%d annen</item>
     <item quantity="other">%d andre</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Søk GIFs og klistremerker</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ingenting funnet</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Klarte ikke å lese enhetslogg. Du kan fortsatt bruke ADB for å få en feilsøkingslogg i stedet.</string>
   <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
   <string name="log_submit_activity__submitting">Innsending</string>

res/values-nl/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanente Delta Chat-communicatiefout!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat was niet in staat met Google Play services te registreren. Delta Chat berichten en oproepen zijn nu uitgeschakeld, probeer opnieuw te registreren via Instellingen &gt; Geavanceerd.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Fout bij het ophalen van de GIF in volledige resolutie</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nieuwe groep</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Groep bijwerken</string>
   <string name="GroupCreateActivity_group_name_hint">Groepsnaam</string>
@@ -721,11 +718,9 @@ Sleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</strin
     <item quantity="one">%d andere</item>
     <item quantity="other">%d anderen</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFs en stickers zoeken</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Niets gevonden</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kon geen logs van je apparaat verzamelen. Je kan nog wel ADB gebruiken om debuglogs te verzamelen.</string>
   <string name="log_submit_activity__thanks">Bedankt voor je hulp!</string>
   <string name="log_submit_activity__submitting">Indienen</string>

res/values-nn/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Varig Delta Chat-kommunikasjonsfeil.</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat klarte ikkje å registrera seg som Google Play-teneste. Delta Chat-meldingar og samtalar er difor slått av. Prøv å registrera programmet på nytt under Innstillingar &gt; Avansert.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Klarte ikkje henta GIF i full storleik</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-ar</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Klistremerke</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Rediger gruppa</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenamn</string>
@@ -722,11 +719,9 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
     <item quantity="one">%d annan</item>
     <item quantity="other">%d andre</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Søk Gif-ar og klistremerke</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ikkje noko funne</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Klarte ikkje å lesa einingsloggen. Du kan enno bruka ADB for å få ein feilsøkingslogg i staden.</string>
   <string name="log_submit_activity__thanks">Takk for hjelpa!</string>
   <string name="log_submit_activity__submitting">Innsending</string>

res/values-pl/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanentny błąd komunikacji Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat nie był w stanie zarejestrować się z Google Play Services. Wiadomości i połączenia Delta Chat zostały wyłączone. Proszę spróbuj ponownie zarejestrować się poprzez pójście do Ustawienia &gt; Zaawansowane.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Błąd podczas pobierania pliku GIF w pełnej rozdzielczości</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">Gify</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Naklejki</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nowa grupa</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Edytuj grupę</string>
   <string name="GroupCreateActivity_group_name_hint">Nazwa grupy</string>
@@ -767,11 +764,9 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
     <item quantity="many">%d innych</item>
     <item quantity="other">%d innych</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Szukaj gifów i naklejek</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nic nie znaleziono</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nie udało się otworzyć dziennika na tym urządzeniu. Mimo tego, nadal możesz używać ADB aby wyświetlić dziennik debugowania.</string>
   <string name="log_submit_activity__thanks">Dziękujemy za Twoją pomoc!</string>
   <string name="log_submit_activity__submitting">Wysyłanie</string>

res/values-pt-rBR/strings.xml

@@ -248,12 +248,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Delta Chat não pôde cadastrar-se no Serviços Google Play. Mensagens e chamadas Delta Chat foram desabilitadas; tente recadastrar em Configurações &gt; Avançado.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Erro ao restaurar GIF com resolução total</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Novo grupo</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome do grupo</string>
@@ -694,11 +691,9 @@
     <item quantity="one">%d outro</item>
     <item quantity="other">%d outros</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Procurar GIFs e stickers</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nada encontrado</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível ler o log no seu dispositivo. Você pode usar o ADB para obter um log de depuração.</string>
   <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
   <string name="log_submit_activity__submitting">Enviando</string>

res/values-pt/strings.xml

@@ -261,12 +261,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha de comunicação do Delta Chat permanente!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Delta Chat não se conseguiu registar com os Serviços Google Play. As mensagens e chamadas do Delta Chat estão desativadas, por favor tente registar-se novamente em Definições &gt; Avançadas.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Erro a obter o GIF de resolução integral</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Autocolantes</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grupo novo</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editar o grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome do grupo</string>
@@ -710,11 +707,9 @@ Mensagem de troca de chaves inválida para esta versão do protocolo.
     <item quantity="one">%d outro</item>
     <item quantity="other">%d outros</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Pesquisar GIFs e autocolantes</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nada foi encontrado</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possivel ler o log no seu dispositivo. Poderá ainda usar ADB para efetuar o debugging do log.</string>
   <string name="log_submit_activity__thanks">Obrigado pela sua ajuda!</string>
   <string name="log_submit_activity__submitting">A enviar</string>

res/values-ro/strings.xml

@@ -279,12 +279,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Eroare permanentă de comunicare cu Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat nu s-a putut înregistra la Google Play Services. Mesajele și apelurile Delta Chat au fost dezactivate, te rog încearcă să te înregistrezi din nou din meniul Setări &gt; Avansat.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">A apărut o eroare la obținerea GIF-ului la rezoluție maximă</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-uri</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Autocolante</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Editați grupul</string>
   <string name="GroupCreateActivity_group_name_hint">Nume grup</string>
@@ -748,11 +745,9 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
     <item quantity="few">%d alții</item>
     <item quantity="other">%d alții</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Căutați GIF-uri și autocolante</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nu s-a găsit nimic</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Fișierul jurnal nu a putut fi citit de pe dispozitivul tău. Poţi folosi în schimb ADB pentru a obţine jurnalul de depanare.</string>
   <string name="log_submit_activity__thanks">Vă mulțumim pentru ajutor!</string>
   <string name="log_submit_activity__submitting">Se trimite</string>

res/values-ru/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Неустранимая ошибка соединения!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat не смог зарегистрироваться в службах Google Play. Сообщения и звонки через Delta Chat отключены. Пожалуйста, попробуйте зарегистрироваться снова через меню Наcтройки &gt; Расширенные.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Ошибка при получении полноразмерного GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-анимации</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Стикеры</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Новая группа</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Редактировать группу</string>
   <string name="GroupCreateActivity_group_name_hint">Название группы</string>
@@ -768,11 +765,9 @@
     <item quantity="many">%d прочие</item>
     <item quantity="other">%d другими</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Найти GIF-анимации и стикеры</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Ничего не найдено</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не удается прочитать журнал отладки вашего устройства. Тем не менее, вы можете получить его при помощи ADB.</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
   <string name="log_submit_activity__submitting">Отправка</string>

res/values-sk/strings.xml

@@ -259,12 +259,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikácie Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat sa nebol schopný registrovať cez Google Play Services. Delta Chat správy a hovory boli vypnuté, prosím zaregistrujte sa opätovne cez Nastavenia &gt; Rozšírené.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Chyba pri prijímaní plného rozlíšenia GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFy</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Nálepky</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Upraviť skupinu</string>
   <string name="GroupCreateActivity_group_name_hint">Názov skupiny</string>
@@ -681,11 +678,9 @@ Bola prijatá správa vzájomnej výmeny kľúčov s neplatnou verziou protokolu
     <item quantity="many">%d ďalších</item>
     <item quantity="other">%d ďalších</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Hľadať GIFy a nálepky</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nič sa nenašlo</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nepodarilo sa prečítať záznam z vášho zariadenia. Na získanie záznamu ladenia môžete použiť ADB.</string>
   <string name="log_submit_activity__thanks">Ďakujem za tvoju pomoc!</string>
   <string name="log_submit_activity__submitting">Posielanie</string>

res/values-sl/strings.xml

@@ -293,12 +293,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna okvara pri komunikaciji aplikacije Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Registracija z Google Play Services ni bila uspešna. Podatkovna komunikacija je izklopljena, prosimo, poskusite s ponovno registracijo v meniju Nastavive &gt; Napredno.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Napaka pri pridobivanju GIF-a v polni ločljivosti</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF-i</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Nalepke</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova skupina</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Uredi skupino</string>
   <string name="GroupCreateActivity_group_name_hint">Ime skupine</string>
@@ -768,11 +765,9 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
     <item quantity="few">%d drugi</item>
     <item quantity="other">%d drugih</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Iskanje po GIF-ih in nalepkah</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Nič ni bilo najdeno</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Sistemski dnevnik vaše naprave ni dostopen. Za oddajo sistemske zabeležbe lahko uporabite ADB.</string>
   <string name="log_submit_activity__thanks">Hvala za pomoč!</string>
   <string name="log_submit_activity__submitting">Oddajam</string>

res/values-sq/strings.xml

@@ -230,12 +230,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dështim i pëhershëm komunikimi nga Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat nuk mundi të regjistrohet me serviset Google Play. Porositë dhe thirrjet Delta Chat janë të pamundësuara, ju lutemi regjistrohuni në Rregullimet &gt; Të avancuara.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Gabim gjatë marrjes së GIF-it me rezolucion të plotë</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFe</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Afishe</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup i ri</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Edito grupin</string>
   <string name="GroupCreateActivity_group_name_hint">Emri i grupit</string>
@@ -616,11 +613,9 @@ U pranua porosi për shkëmbim çelësash për një version protokolli të pavle
     <item quantity="one">%d</item>
     <item quantity="other">%d të tjerë</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Kërko GIFe dhe afishe</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Asgjë nuk u gjetë</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Historia në pajisjen tuaj nuk mund të lexohet. Mund të përdorni ADB për ta lexuar historinë e gabimeve të përmirsuara.</string>
   <string name="log_submit_activity__thanks">Faleminderit për ndihmën!</string>
   <string name="log_submit_activity__submitting">Duke dorëzuar</string>

res/values-sr/strings.xml

@@ -243,12 +243,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Трајни неуспех комуникације Сигнала!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Сигнал није успео да се пријави на Гуглов Плеј сервис. Комуникација преко канала података је онемогућена, покушајте поново да се пријавите преко Поставке &gt; Напредно.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Грешка при добављању ГИФ сличице пуне резолуције</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">ГИФ сличице</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Налепнице</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Уређивање групе</string>
   <string name="GroupCreateActivity_group_name_hint">Назив групе</string>
@@ -633,11 +630,9 @@
   <string name="expiration_days_abbreviated">%d д</string>
   <string name="expiration_weeks_abbreviated">%d с</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Тражите ГИФ сличице и налепнице</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Нема резултата</string>
-  <!--import_export_fragment-->
+
+
+    <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не могу да очитам дневник на вашем уређају. Можете да искористите АДБ да бисте добавили дневник исправљања грешака.</string>
   <string name="log_submit_activity__thanks">Хвала вам на помоћи!</string>

res/values-sv/strings.xml

@@ -261,12 +261,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent kommunikationsfel med Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat kunde inte registrera med Google Play-tjänster. Meddelanden och samtal med Delta Chat har avaktiverats, vänligen försök återregistrera i inställningar &gt; Avancerat.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Fel vid hämtning av full upplösning GIF</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF:ar</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny grupp</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Ändra grupp</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppnamn</string>
@@ -708,11 +705,9 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
     <item quantity="one">%d annan</item>
     <item quantity="other">%d andra</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Sök GIF-bilder och stickers</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Inget hittat</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunde inte läsa loggen från din enhet. Du kan fortfarande använda ADB för att få en logg.</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
   <string name="log_submit_activity__submitting">Skickar</string>

res/values-ta/strings.xml

@@ -160,8 +160,7 @@
   <string name="ExportFragment_exporting">ஏற்றுமதி செய்யப்படுகிறது</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play சேவை உடன் TextSecure-ஐ பதிவு செய்ய இயலவில்லை. இணையதளம் வழியாக தொடர்புடையாடல் முடக்கப்பட்டுள்ளது, TextSecure அமைப்புகள் மெனுவில் மறுபதிவுச்செய்ய முயற்சிக்கவும்</string>
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">புதிய குழு</string>
   <string name="GroupCreateActivity_group_name_hint">குழுவின் பெயர்</string>
@@ -415,8 +414,8 @@
   <!--expiration-->
   <string name="expiration_off">அணை</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <!--giphy_fragment-->
+
+
   <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">உங்கள் உதவிக்கு நன்றி!</string>

res/values-te/strings.xml

@@ -253,12 +253,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">సిగ్నల్ లో శాశ్వత సమాచార వైఫల్యం!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">గూగ్లె ప్లే సదుపాయలతొ సిగ్నల్ నమోదు కాలెదు. సిగ్నల్ సందెశాలు మరియు  కాల్స్ నిలిపివేయబడ్డాయి. దయచేసి ఆధునిక అమరికలు లో మళ్ళి నమోదు చెసుకొనగలరు.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">పూతి స్పష్టత జి.ఐ.ఎఫ్. ను తిరిగి రప్పించుట లొ లొపము</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">గిఫ్ లు</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">స్టిక్కర్లు</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">కొత్త సమూహం</string>
   <string name="GroupCreateActivity_actionbar_edit_title">సమూహాన్ని మార్చు</string>
   <string name="GroupCreateActivity_group_name_hint">సమూహం పేరు</string>
@@ -684,11 +681,9 @@
   <!--unverified safety numbers-->
   <string name="IdentityUtil_unverified_banner_one">%s తో మీ భద్రతా నంబరు మారింది మరియు ధృవీకరించబడలేదు</string>
   <string name="IdentityUtil_untrusted_dialog_one">%s తో మీ భద్రతా నంబర్ ఇప్పుడు మార్చబడింది.</string>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">జిఫ్‌లు మరియు స్టిక్కర్లు వెతుకు</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">ఏమీ దొరకలేదు</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">మీ పరికరంలో లాగ్ చదవలేము. మీరు దీనికి బదులుగా ఒక డీబగ్ లాగ్ పొందడానికి  ADB  ని ఉపయోగించవచ్చు.</string>
   <string name="log_submit_activity__thanks">మీ సహాయానికి ధన్యవాదాలు!</string>
   <string name="log_submit_activity__submitting">సమర్పిస్తోంది</string>

res/values-th/strings.xml

@@ -249,12 +249,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">การสื่อสารของ Delta Chat ล้มเหลวอย่างถาวร!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat ไม่สามารถลงทะเบียนกับ Google Play Services การรับส่งข้อความและการโทร Delta Chat ได้ถูกปิด กรุณาลองลงทะเบียนอีกครั้งใน การตั้งค่า &gt; ขั้นสูง</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">เกิดข้อผิดพลาดระหว่างดึง GIF ความละเอียดสูง</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">สติกเกอร์</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">กลุ่มใหม่</string>
   <string name="GroupCreateActivity_actionbar_edit_title">แก้ไขกลุ่ม</string>
   <string name="GroupCreateActivity_group_name_hint">ชื่อกลุ่ม</string>
@@ -698,11 +695,9 @@
   <plurals name="identity_others">
     <item quantity="other">%d อื่น ๆ</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">ค้นหา GIF และสติกเกอร์</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">ไม่พบสิ่งใด</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">ไม่สามารถอ่านปูมบนอุปกรณ์ของคุณได้ คุณยังสามารถใช้ ADB เพื่อเข้าถึงปูมดีบัก</string>
   <string name="log_submit_activity__thanks">ขอบคุณสำหรับความช่วยเหลือของคุณ!</string>
   <string name="log_submit_activity__submitting">กำลังส่ง</string>

res/values-tr/strings.xml

@@ -265,12 +265,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kalıcı Delta Chat haberleşme hatası!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat Google Play Servislerine kayıt olamadı. Delta Chat mesajları ve aramaları devre dışı bırakıldı, Lütfen Ayarlar &gt; Gelişmiş kısmından tekrardan kayıt olmayı deneyin.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Tam çözünürlüklü GIF alınırken hata</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIFler</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Çıkartmalar</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Yeni grup</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Grubu düzenle</string>
   <string name="GroupCreateActivity_group_name_hint">Grup adı</string>
@@ -723,11 +720,9 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
     <item quantity="one">%d diğer</item>
     <item quantity="other">%d diğer</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">GIFleri ve çıkartmaları ara</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Hiçbir şey bulunamadı</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Cihazınızda bulunan log kayıtları okunamadı. ADB kullanarak log kayıtlarına erişim sağlayabilirsiniz.</string>
   <string name="log_submit_activity__thanks">Yardımınız için teşekkürler!</string>
   <string name="log_submit_activity__submitting">Gönderiliyor</string>

res/values-uk/strings.xml

@@ -289,12 +289,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Постійний збій зв\'язку Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat не зміг зареєструватись у сервісах Google Play. Виклики та повідомлення Delta Chat наразі вимкнено, спробуйте перереєструватися у Налаштуваннях &gt; Додатково.</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Помилка при отриманні GIF у повному розширенні</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">Наліпки</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_edit_title">Редагувати групу</string>
   <string name="GroupCreateActivity_group_name_hint">Назва групи</string>
@@ -765,11 +762,9 @@
     <item quantity="many">%d інших</item>
     <item quantity="other">%d інших</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">Пошук GIF та наліпок</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">Нічого не знайдено</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Помилка читання журналу відлагодження з вашого пристрою. Ви також можете використати ADB для отримання журналу.</string>
   <string name="log_submit_activity__thanks">Дякуємо за вашу допомогу!</string>
   <string name="log_submit_activity__submitting">Надсилання</string>

res/values-vi/strings.xml

@@ -188,8 +188,7 @@ Bạn sẽ phải đăng ký lại số điện thoại để sử dụng Delta
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Lỗi thường trực khi giao tiếp qua Delta Chat!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat không thể đăng ký với Google Play Services. Cuộc gọi và tin nhắn Delta Chat đã ngừng hoạt động, hãy thử đăng ký lại từ mục Cài đặt &gt; Nâng cao.</string>
-  <!--GiphyActivity-->
-  <!--GiphyFragmentPageAdapter-->
+
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Tạo nhóm mới</string>
   <string name="GroupCreateActivity_group_name_hint">Tên nhóm</string>
@@ -489,8 +488,8 @@ Nhận thông tin trao đổi chìa khóa về phiên bản giao thức không h
   <!--expiration-->
   <string name="expiration_off">Tắt</string>
   <!--unverified safety numbers-->
-  <!--giphy_activity-->
-  <!--giphy_fragment-->
+
+
   <!--import_export_fragment-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__thanks">Cám ơn sự trợ giúp của bạn!</string>

res/values-zh-rCN/strings.xml

@@ -247,12 +247,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">暗号持续连接失效！</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">暗号无法在 Google Play 服务中注册。暗号消息和呼叫已经被金庸。请尝试在设置 &gt; 高级中重新注册。</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">获得原分辨率的GIF图片时出错</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">GIF图片</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">表情</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新群组</string>
   <string name="GroupCreateActivity_actionbar_edit_title">编辑群组</string>
   <string name="GroupCreateActivity_group_name_hint">群组名称</string>
@@ -683,11 +680,9 @@
   <plurals name="identity_others">
     <item quantity="other">%d 个其他人</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">搜索 GIF图片与表情</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">无结果</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">无法在您的设备上读取日志。您仍然可以使用 ADB 来获得调试日志。</string>
   <string name="log_submit_activity__thanks">感谢！</string>
   <string name="log_submit_activity__submitting">正在提交</string>

res/values-zh-rTW/strings.xml

@@ -251,12 +251,9 @@
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Delta Chat 持續發生傳輸異常！</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat 無法順利與 Google Play Services 註冊，Delta Chat 訊息與通話已經停用，請嘗試在設定 &gt; 進階中重新註冊。</string>
-  <!--GiphyActivity-->
-  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">在下載完整解析度的 GIF 時發生錯誤</string>
-  <!--GiphyFragmentPageAdapter-->
-  <string name="GiphyFragmentPagerAdapter_gifs">動態圖檔</string>
-  <string name="GiphyFragmentPagerAdapter_stickers">貼圖</string>
-  <!--GroupCreateActivity-->
+
+
+    <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新增群組</string>
   <string name="GroupCreateActivity_actionbar_edit_title">編輯群組</string>
   <string name="GroupCreateActivity_group_name_hint">群組名稱</string>
@@ -701,11 +698,9 @@ signal 訊息</string>
   <plurals name="identity_others">
     <item quantity="other">%d 其他人</item>
   </plurals>
-  <!--giphy_activity-->
-  <string name="giphy_activity_toolbar__search_gifs_and_stickers">搜尋動態圖檔與貼圖</string>
-  <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">未找到任何東西</string>
-  <!--log_submit_activity-->
+
+
+    <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">無法在您的設備上讀取日誌。您仍然可以使用 ADB 來獲得偵錯紀錄。</string>
   <string name="log_submit_activity__thanks">感謝您的協助！</string>
   <string name="log_submit_activity__submitting">上傳中</string>

res/values/attrs.xml

@@ -241,15 +241,6 @@
         </attr>
     </declare-styleable>
 
-    <declare-styleable name="VerificationCodeView">
-        <attr name="vcv_spacing" format="dimension"/>
-        <attr name="vcv_inputWidth" format="dimension"/>
-        <attr name="vcv_inputHeight" format="dimension"/>
-        <attr name="vcv_inputColor" format="color"/>
-        <attr name="vcv_textSize" format="dimension"/>
-        <attr name="vcv_textColor" format="color"/>
-    </declare-styleable>
-
     <declare-styleable name="QuoteView">
         <attr name="message_type" format="enum">
             <enum name="preview" value="0" />
@@ -260,13 +251,6 @@
         <attr name="quote_colorSecondary" format="color" />
     </declare-styleable>
 
-    <declare-styleable name="SharedContactView">
-        <attr name="contact_titleColor" format="color" />
-        <attr name="contact_captionColor" format="color" />
-        <attr name="contact_footerIconColor" format="color" />
-        <attr name="contact_footerAlpha" format="float" />
-    </declare-styleable>
-
     <declare-styleable name="DocumentView">
         <attr name="doc_titleColor" format="color" />
         <attr name="doc_captionColor" format="color" />

res/values/strings.xml

@@ -195,21 +195,21 @@
     </plurals>
     <string name="ConversationFragment_save_to_sd_card">Save to storage?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
-        <item quantity="one">Saving this media to storage will allow any other apps on your device to access it.\n\nContinue?</item>
-        <item quantity="other">Saving all %1$d media to storage will allow any other apps on your device to access them.\n\nContinue?</item>
+        <item quantity="one">Saving this file to storage will allow any other apps on your device to access it.\n\nContinue?</item>
+        <item quantity="other">Saving all %1$d files to storage will allow any other apps on your device to access them.\n\nContinue?</item>
     </plurals>
     <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
-        <item quantity="one">Error while saving attachment to storage!</item>
-        <item quantity="other">Error while saving attachments to storage!</item>
+        <item quantity="one">Error while saving file to storage!</item>
+        <item quantity="other">Error while saving file to storage!</item>
     </plurals>
     <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string>
     <plurals name="ConversationFragment_saving_n_attachments">
-        <item quantity="one">Saving attachment</item>
-        <item quantity="other">Saving %1$d attachments</item>
+        <item quantity="one">Saving file</item>
+        <item quantity="other">Saving %1$d files</item>
     </plurals>
     <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
-        <item quantity="one">Saving attachment to storage...</item>
-        <item quantity="other">Saving %1$d attachments to storage...</item>
+        <item quantity="one">Saving file to storage...</item>
+        <item quantity="other">Saving %1$d files to storage...</item>
     </plurals>
     <string name="ConversationFragment_pending">Pending...</string>
     <string name="ConversationFragment_push">Data (Delta Chat)</string>
@@ -327,14 +327,6 @@
     <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Delta Chat communication failure!</string>
     <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Delta Chat was unable to register with Google Play Services. Delta Chat messages and calls have been disabled, please try re-registering in Settings &gt; Advanced.</string>
 
-
-    <!-- GiphyActivity -->
-    <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Error while retrieving full resolution GIF</string>
-
-    <!-- GiphyFragmentPageAdapter -->
-    <string name="GiphyFragmentPagerAdapter_gifs">GIFs</string>
-    <string name="GiphyFragmentPagerAdapter_stickers">Stickers</string>
-    
     <!-- GroupCreateActivity -->
     <string name="GroupCreateActivity_actionbar_title">New group</string>
     <string name="GroupCreateActivity_actionbar_verified_title">New verified group</string>
@@ -894,12 +886,6 @@
         <item quantity="other">%d others</item>
     </plurals>
 
-    <!-- giphy_activity -->
-    <string name="giphy_activity_toolbar__search_gifs_and_stickers">Search GIFs and stickers</string>
-
-    <!-- giphy_fragment -->
-    <string name="giphy_fragment__nothing_found">Nothing found</string>
-
     <!-- log_submit_activity -->
     <string name="log_submit_activity__log_fetch_failed">Could not read the log on your device. You can still use ADB to get a debug log instead.</string>
     <string name="log_submit_activity__thanks">Thanks for your help!</string>
@@ -1536,5 +1522,6 @@
     <string name="conversation__no_messages">No messages.</string>
     <string name="permanent_notification_subtitle">Tap to open.</string>
     <string name="error_no_network">Network unavailable.</string>
+    <string name="summary_draft">Draft</string>
 
 </resources>

res/xml/preferences_manual_mms.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_apn_mmsc_custom_host"
-            android:key="pref_apn_mmsc_host"
-            android:title="@string/preferences__mmsc_url"
-            android:inputType="textUri" />
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_apn_mms_custom_proxy"
-            android:key="pref_apn_mms_proxy"
-            android:title="@string/preferences__mms_proxy_host"
-            android:inputType="textUri" />
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_apn_mms_custom_proxy_port"
-            android:key="pref_apn_mms_proxy_port"
-            android:title="@string/preferences__mms_proxy_port"
-            android:inputType="number"/>
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_apn_mmsc_custom_username"
-            android:key="pref_apn_mmsc_username"
-            android:title="@string/preferences__mmsc_username"
-            android:inputType="textNoSuggestions"/>
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_apn_mmsc_custom_password"
-            android:key="pref_apn_mmsc_password"
-            android:title="@string/preferences__mmsc_password"
-            android:inputType="textVisiblePassword"/>
-
-    <org.thoughtcrime.securesms.components.CustomDefaultPreference
-            app:custom_pref_toggle="pref_custom_mms_user_agent"
-            android:key="pref_mms_user_agent"
-            android:title="@string/preferences__mms_user_agent"
-            android:inputType="textNoSuggestions"/>
-
-</PreferenceScreen>

res/xml/preferences_sms_mms.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="true"
-                        android:key="pref_all_sms"
-                        android:summary="@string/preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages"
-                        android:title="@string/preferences__pref_all_sms_title" />
-
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="true"
-                        android:key="pref_all_mms"
-                        android:summary="@string/preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages"
-                        android:title="@string/preferences__pref_all_mms_title" />
-
-    <Preference android:key="pref_set_default"
-                android:title="@string/ApplicationPreferencesActivity_sms_disabled"
-                android:summary="@string/ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app" />
-
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="false"
-                        android:key="pref_delivery_report_sms"
-                        android:summary="@string/preferences__request_a_delivery_report_for_each_sms_message_you_send"
-                        android:title="@string/preferences__sms_delivery_reports" />
-
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="false"
-                        android:key="pref_wifi_sms"
-                        android:title="@string/preferences__support_wifi_calling"
-                        android:summary="@string/preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi"/>
-
-    <Preference android:key="pref_mms_preferences"
-                android:title="@string/preferences__advanced_mms_access_point_names"/>
-
-</PreferenceScreen>

src/com/b44t/messenger/DcChat.java

@@ -28,8 +28,6 @@ public class DcChat {
     public native boolean isUnpromoted      ();
     public native boolean isSelfTalk        ();
     public native boolean isVerified        ();
-    public native String  getDraft          ();
-    public native long    getDraftTimestamp ();
 
     // working with raw c-data
     private long        chatCPtr;    // CAVE: the name is referenced in the JNI

src/com/b44t/messenger/DcChatlist.java

@@ -1,6 +1,7 @@
 package com.b44t.messenger;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 public class DcChatlist {
 
@@ -19,7 +20,21 @@ public class DcChatlist {
     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())); }
+    public @NonNull DcLot   getSummary(int index, @Nullable DcChat chat) { return new DcLot(getSummaryCPtr(index, chat==null? 0 : chat.getChatCPtr())); }
+
+    public class Item {
+        public DcLot summary;
+        public int   msgId;
+        public int   chatId;
+    }
+
+    public Item getItem(int index) {
+        Item item = new Item();
+        item.summary = getSummary(index, null);
+        item.msgId   = getMsgId(index);
+        item.chatId  = getChatId(index);
+        return item;
+    }
 
     // working with raw c-data
     private long        chatlistCPtr;    // CAVE: the name is referenced in the JNI

src/com/b44t/messenger/DcContext.java

@@ -1,6 +1,7 @@
 package com.b44t.messenger;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 public class DcContext {
 
@@ -106,7 +107,8 @@ public class DcContext {
     public native boolean      isContactInChat      (int chat_id, int contact_id);
     public native int          addContactToChat     (int chat_id, int contact_id);
     public native int          removeContactFromChat(int chat_id, int contact_id);
-    public native void         setDraft             (int chat_id, String draft/*null=delete*/);
+    public native void         setDraft             (int chat_id, DcMsg msg/*null=delete*/);
+    public @Nullable DcMsg     getDraft             (int chat_id) { return new DcMsg(getDraftCPtr(chat_id)); }
     public native int          setChatName          (int chat_id, String name);
     public native int          setChatProfileImage  (int chat_id, String name);
     public native int[]        getChatMsgs          (int chat_id, int flags, int marker1before);
@@ -146,5 +148,6 @@ public class DcContext {
     private native long getChatlistCPtr  (int listflags, String query, int queryId);
     private native long getChatCPtr      (int chat_id);
     private native long getMsgCPtr       (int id);
+    private native long getDraftCPtr    (int id);
     private native long getContactCPtr   (int id);
 }

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -32,10 +32,8 @@ import com.b44t.messenger.DcEventCenter;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobmanager.dependencies.DependencyInjector;
 import org.thoughtcrime.securesms.jobmanager.persistence.JavaJobSerializer;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.webrtc.PeerConnectionFactory;
@@ -43,7 +41,7 @@ import org.webrtc.PeerConnectionFactory.InitializationOptions;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
-import org.whispersystems.libsignal.util.AndroidSignalProtocolLogger;
+import org.thoughtcrime.securesms.util.AndroidSignalProtocolLogger;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -56,11 +54,10 @@ import java.util.Set;
  *
  * @author Moxie Marlinspike
  */
-public class ApplicationContext extends MultiDexApplication implements DependencyInjector, DefaultLifecycleObserver {
+public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {
 
   private static final String TAG = ApplicationContext.class.getName();
 
-  private ExpiringMessageManager expiringMessageManager;
   private JobManager             jobManager;
 
   private volatile boolean isAppVisible;
@@ -81,7 +78,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     initializeRandomNumberFix();
     initializeLogging();
     initializeJobManager();
-    initializeExpiringMessageManager();
     //initializeSignedPreKeyCheck(); -- keys are generated in the core, however, not sure if this is needed for the lock screen
     initializePeriodicTasks();
     initializeWebRtc();
@@ -100,18 +96,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     ScreenLockUtil.shouldLockApp = true;
   }
 
-  @Override
-  public void injectDependencies(Object object) {
-  }
-
   public JobManager getJobManager() {
     return jobManager;
   }
 
-  public ExpiringMessageManager getExpiringMessageManager() {
-    return expiringMessageManager;
-  }
-
   public boolean isAppVisible() {
     return isAppVisible;
   }
@@ -150,16 +138,11 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   private void initializeJobManager() {
     this.jobManager = JobManager.newBuilder(this)
                                 .withName("TextSecureJobs")
-                                .withDependencyInjector(this)
                                 .withJobSerializer(new JavaJobSerializer())
                                 .withConsumerThreads(5)
                                 .build();
   }
 
-  private void initializeExpiringMessageManager() {
-    this.expiringMessageManager = new ExpiringMessageManager(this);
-  }
-
   private void initializePeriodicTasks() {
     //DirectoryRefreshListener.schedule(this); -- directory in this sense seems to be the address book
     //LocalBackupListener.schedule(this); -- disabled for now, there is no automatic backup; maybe the implicit IMAP backup is sufficient

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -44,10 +44,9 @@ import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
-import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Prefs;
 
 /**
  * The Activity for application preference display and management.
@@ -123,14 +122,10 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-    if (key.equals(TextSecurePreferences.THEME_PREF)) {
+    if (key.equals(Prefs.THEME_PREF)) {
       recreate();
-    } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
+    } else if (key.equals(Prefs.LANGUAGE_PREF)) {
       recreate();
-
-      Intent intent = new Intent(this, KeyCachingService.class);
-      intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT);
-      startService(intent);
     }
   }
 

src/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -1,9 +1,7 @@
 package org.thoughtcrime.securesms;
 
-import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
@@ -17,7 +15,7 @@ import android.view.WindowManager;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Prefs;
 
 import java.lang.reflect.Field;
 import java.util.Timer;
@@ -104,7 +102,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
 
   private void initializeScreenshotSecurity() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
-            TextSecurePreferences.isScreenSecurityEnabled(this))
+            Prefs.isScreenSecurityEnabled(this))
     {
       getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     } else {
@@ -136,11 +134,4 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     ActivityCompat.startActivity(this, intent, bundle);
   }
 
-  @TargetApi(VERSION_CODES.LOLLIPOP)
-  protected void setStatusBarColor(int color) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setStatusBarColor(color);
-    }
-  }
-
 }

src/org/thoughtcrime/securesms/BasicIntroFragment.java

@@ -1,54 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class BasicIntroFragment extends Fragment {
-
-  private static final String ARG_DRAWABLE = "drawable";
-  private static final String ARG_TEXT     = "text";
-  private static final String ARG_SUBTEXT  = "subtext";
-
-  private int drawable;
-  private int text;
-  private int subtext;
-
-  public static BasicIntroFragment newInstance(int drawable, int text, int subtext) {
-    BasicIntroFragment fragment = new BasicIntroFragment();
-    Bundle args = new Bundle();
-    args.putInt(ARG_DRAWABLE, drawable);
-    args.putInt(ARG_TEXT, text);
-    args.putInt(ARG_SUBTEXT, subtext);
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  public BasicIntroFragment() {}
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    if (getArguments() != null) {
-      drawable = getArguments().getInt(ARG_DRAWABLE);
-      text     = getArguments().getInt(ARG_TEXT    );
-      subtext  = getArguments().getInt(ARG_SUBTEXT );
-    }
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                           Bundle savedInstanceState) {
-    View v = inflater.inflate(R.layout.color_fragment, container, false);
-
-    ((ImageView)v.findViewById(R.id.watermark)).setImageResource(drawable);
-    ((TextView)v.findViewById(R.id.blurb)).setText(text);
-    ((TextView)v.findViewById(R.id.subblurb)).setText(subtext);
-
-    return v;
-  }
-}

src/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -29,9 +29,6 @@ public interface BindableConversationItem extends Unbindable {
   void setEventListener(@Nullable EventListener listener);
 
   interface EventListener {
-    void onQuoteClicked(DcMsg messageRecord);
-    void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView);
-    void onAddToContactsClicked(@NonNull Contact contact);
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
   }

src/org/thoughtcrime/securesms/BlockedContactsActivity.java

@@ -1,30 +1,30 @@
 package org.thoughtcrime.securesms;
 
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ListFragment;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
 
-import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.database.loaders.BlockedContactsLoader;
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcEventCenter;
+
+import org.thoughtcrime.securesms.connect.ApplicationDcContext;
+import org.thoughtcrime.securesms.connect.DcContactsLoader;
+import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.preferences.BlockedContactListItem;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
 
@@ -62,80 +62,96 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
   }
 
   public static class BlockedContactsFragment
-      extends ListFragment
-      implements LoaderManager.LoaderCallbacks<Cursor>, ListView.OnItemClickListener
-  {
+          extends Fragment
+          implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>,
+          DcEventCenter.DcEventDelegate, ContactSelectionListAdapter.ItemClickListener {
+
+    private RecyclerView recyclerView;
+
+    private SwipeRefreshLayout swipeRefreshLayout;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-      return inflater.inflate(R.layout.blocked_contacts_fragment, container, false);
+      View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
+      recyclerView  = ViewUtil.findById(view, R.id.recycler_view);
+      swipeRefreshLayout  = ViewUtil.findById(view, R.id.swipe_refresh);
+      recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+      return view;
     }
 
     @Override
     public void onCreate(Bundle bundle) {
       super.onCreate(bundle);
-      setListAdapter(new BlockedContactAdapter(getActivity(), GlideApp.with(this), null));
       getLoaderManager().initLoader(0, null, this);
     }
 
     @Override
     public void onActivityCreated(Bundle bundle) {
       super.onActivityCreated(bundle);
-      getListView().setOnItemClickListener(this);
+      initializeAdapter();
+    }
+
+    private void initializeAdapter() {
+      ContactSelectionListAdapter adapter = new ContactSelectionListAdapter(getActivity(),
+              GlideApp.with(this),
+              this,
+              false,
+              false);
+      recyclerView.setAdapter(adapter);
+      swipeRefreshLayout.setRefreshing(false);
+      swipeRefreshLayout.setEnabled(false);
     }
 
     @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-      return new BlockedContactsLoader(getActivity());
+    public Loader<DcContactsLoader.Ret> onCreateLoader(int id, Bundle args) {
+      return new DcContactsLoader(getActivity(), -1, null, false, true);
     }
 
     @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(data);
-      }
+    public void onLoadFinished(Loader<DcContactsLoader.Ret> loader, DcContactsLoader.Ret data) {
+      getContactSelectionListAdapter().changeData(data);
     }
 
     @Override
-    public void onLoaderReset(Loader<Cursor> loader) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(null);
-      }
+    public void onLoaderReset(Loader<DcContactsLoader.Ret> loader) {
+      getContactSelectionListAdapter().changeData(null);
     }
 
     @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-      Recipient recipient = ((BlockedContactListItem)view).getRecipient();
-      Intent    intent    = new Intent(getActivity(), RecipientPreferenceActivity.class);
-      intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress());
-
-      startActivity(intent);
-    }
-
-    private static class BlockedContactAdapter extends CursorAdapter {
-
-      private final GlideRequests glideRequests;
-
-      BlockedContactAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, @Nullable Cursor c) {
-        super(context, c);
-        this.glideRequests = glideRequests;
-      }
-
-      @Override
-      public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return LayoutInflater.from(context)
-                             .inflate(R.layout.blocked_contact_list_item, parent, false);
-      }
-
-      @Override
-      public void bindView(View view, Context context, Cursor cursor) {
-        String    address   = cursor.getString(1);
-        Recipient recipient = Recipient.from(context, Address.fromSerialized(address), true);
-
-        ((BlockedContactListItem) view).set(glideRequests, recipient);
+    public void handleEvent(int eventId, Object data1, Object data2) {
+      if (eventId==DcContext.DC_EVENT_CONTACTS_CHANGED) {
+        restartLoader();
       }
     }
 
+    private void restartLoader() {
+      getLoaderManager().restartLoader(0, null, BlockedContactsFragment.this);
+    }
+
+    private ContactSelectionListAdapter getContactSelectionListAdapter() {
+      return (ContactSelectionListAdapter) recyclerView.getAdapter();
+    }
+
+    @Override
+    public void onItemClick(ContactSelectionListItem item, boolean handleActionMode) {
+      new AlertDialog.Builder(getActivity())
+              .setTitle(R.string.RecipientPreferenceActivity_unblock_this_contact_question)
+              .setMessage(R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
+              .setCancelable(true)
+              .setNegativeButton(android.R.string.cancel, null)
+              .setPositiveButton(R.string.RecipientPreferenceActivity_unblock, (dialog, which) -> unblockContact(item.getContactId())).show();
+    }
+
+    private void unblockContact(int contactId) {
+      ApplicationDcContext dcContext = DcHelper.getContext(getContext());
+      dcContext.blockContact(contactId, 0);
+      restartLoader();
+    }
+
+    @Override
+    public void onItemLongClick(ContactSelectionListItem view) {
+      // Not needed
+    }
   }
 
 }

src/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -20,17 +20,15 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.Log;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 
 /**
@@ -61,7 +59,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
-      int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
+      int displayMode = Prefs.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
                                                                  : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_GROUPS;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }

src/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -30,9 +30,9 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.view.ActionMode;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.view.ActionMode;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -63,7 +63,6 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -118,7 +117,7 @@ public class ContactSelectionListFragment extends    Fragment
     super.onStart();
     this.getLoaderManager().initLoader(0, null, this);
     Permissions.with(this)
-               .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
+               .request(Manifest.permission.READ_CONTACTS)
                .ifNecessary()
                .onAllGranted(this::handleContactPermissionGranted)
                .execute();
@@ -240,9 +239,10 @@ public class ContactSelectionListFragment extends    Fragment
 
   private void initializeCursor() {
     ContactSelectionListAdapter adapter = new ContactSelectionListAdapter(getActivity(),
-                                                                          GlideApp.with(this),
-                                                                          new ListClickListener(),
-                                                                          isMulti());
+            GlideApp.with(this),
+            new ListClickListener(),
+            isMulti(),
+            true);
     selectedContacts = adapter.getSelectedContacts();
     recyclerView.setAdapter(adapter);
     recyclerView.addItemDecoration(new StickyHeaderDecoration(adapter, true, true));
@@ -278,7 +278,7 @@ public class ContactSelectionListFragment extends    Fragment
       listflags = DcContext.DC_GCL_VERIFIED_ONLY;
     }
 
-    return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks);
+    return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks, false);
   }
 
   @Override

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -16,18 +16,18 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
@@ -65,15 +65,12 @@ import org.thoughtcrime.securesms.ConversationAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.connect.DcMsgListLoader;
-import org.thoughtcrime.securesms.contactshare.Contact;
-import org.thoughtcrime.securesms.contactshare.ContactUtil;
-import org.thoughtcrime.securesms.contactshare.SharedContactDetailsActivity;
 import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.CommunicationActions;
+import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -457,24 +454,20 @@ public class ConversationFragment extends Fragment
   }
 
   private void handleSaveAttachment(final DcMsg message) {
-    /* TODO
-    SaveAttachmentTask.showWarningDialog(getActivity(), new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        for (Slide slide : message.getSlideDeck().getSlides()) {
-          if ((slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument()) && slide.getUri() != null) {
-            SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity());
-            saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(slide.getUri(), slide.getContentType(), message.getDateReceived(), slide.getFileName().orNull()));
-            return;
-          }
-        }
-
-        Log.w(TAG, "No slide with attachable media found, failing nicely.");
-        Toast.makeText(getActivity(),
-                       getResources().getQuantityString(R.plurals.ConversationFragment_error_while_saving_attachments_to_sd_card, 1),
-                       Toast.LENGTH_LONG).show();
-      }
+    SaveAttachmentTask.showWarningDialog(getContext(), (dialogInterface, i) -> {
+      Permissions.with(this)
+          .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+          .ifNecessary()
+          .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
+          .onAnyDenied(() -> Toast.makeText(getContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
+          .onAllGranted(() -> {
+            SaveAttachmentTask saveTask = new SaveAttachmentTask(getContext());
+            SaveAttachmentTask.Attachment attachment = new SaveAttachmentTask.Attachment(
+                Uri.fromFile(message.getFileAsFile()), message.getFilemime(), message.getDateReceived(), message.getFilename());
+            saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachment);
+          })
+          .execute();
     });
-    */
   }
 
   public void reloadList() {
@@ -763,90 +756,22 @@ public class ConversationFragment extends Fragment
       }
     }
 
-    @Override
-    public void onQuoteClicked(DcMsg messageRecord) {
-      if (messageRecord.getQuote() == null) {
-        Log.w(TAG, "Received a 'quote clicked' event, but there's no quote...");
-        return;
-      }
-
-      new AsyncTask<Void, Void, Integer>() {
-        @Override
-        protected Integer doInBackground(Void... voids) {
-          if (getActivity() == null || getActivity().isFinishing()) {
-            Log.w(TAG, "Task to retrieve quote position started after the fragment was detached.");
-            return 0;
-          }
-          return DatabaseFactory.getMmsSmsDatabase(getContext())
-                                .getQuotedMessagePosition(threadId,
-                                                          messageRecord.getQuote().getId(),
-                                                          messageRecord.getQuote().getAuthor(),
-                                                          getListAdapter().getItemCount());
-        }
-
-        @Override
-        protected void onPostExecute(Integer position) {
-          if (getActivity() == null || getActivity().isFinishing()) {
-            Log.w(TAG, "Task to retrieve quote position finished after the fragment was detached.");
-            return;
-          }
-
-          if (position >= 0 && position < getListAdapter().getItemCount()) {
-            list.scrollToPosition(position);
-            getListAdapter().pulseHighlightItem(position);
-          } else {
-            Toast.makeText(getContext(), getResources().getText(R.string.ConversationFragment_quoted_message_not_found), Toast.LENGTH_SHORT).show();
-            if (position < 0) {
-              Log.w(TAG, "Tried to navigate to quoted message, but it was deleted.");
-            } else {
-              Log.w(TAG, "Tried to navigate to quoted message, but it was out of the bounds of the adapter.");
-            }
-          }
-        }
-      }.execute();
-    }
-
-    @Override
-    public void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView) {
-      if (getContext() != null && getActivity() != null) {
-        Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), avatarTransitionView, "avatar").toBundle();
-        ActivityCompat.startActivity(getActivity(), SharedContactDetailsActivity.getIntent(getContext(), contact), bundle);
-      }
-    }
-
-    @Override
-    public void onAddToContactsClicked(@NonNull Contact contactWithAvatar) {
-      if (getContext() != null) {
-        new AsyncTask<Void, Void, Intent>() {
-          @Override
-          protected Intent doInBackground(Void... voids) {
-            return ContactUtil.buildAddToContactsIntent(getContext(), contactWithAvatar);
-          }
-
-          @Override
-          protected void onPostExecute(Intent intent) {
-            startActivityForResult(intent, CODE_ADD_EDIT_CONTACT);
-          }
-        }.execute();
-      }
-    }
-
     @Override
     public void onMessageSharedContactClicked(@NonNull List<Recipient> choices) {
       if (getContext() == null) return;
 
-      ContactUtil.selectRecipientThroughDialog(getContext(), choices, locale, recipient -> {
-        CommunicationActions.startConversation(getContext(), recipient, null);
-      });
+//      ContactUtil.selectRecipientThroughDialog(getContext(), choices, locale, recipient -> {
+//        CommunicationActions.startConversation(getContext(), recipient, null);
+//      });
     }
 
     @Override
     public void onInviteSharedContactClicked(@NonNull List<Recipient> choices) {
       if (getContext() == null) return;
 
-      ContactUtil.selectRecipientThroughDialog(getContext(), choices, locale, recipient -> {
-        CommunicationActions.composeSmsThroughDefaultApp(getContext(), recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
-      });
+//      ContactUtil.selectRecipientThroughDialog(getContext(), choices, locale, recipient -> {
+//        CommunicationActions.composeSmsThroughDefaultApp(getContext(), recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
+//      });
     }
   }
 

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -48,10 +48,8 @@ import org.thoughtcrime.securesms.components.ConversationItemFooter;
 import org.thoughtcrime.securesms.components.ConversationItemThumbnail;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.QuoteView;
-import org.thoughtcrime.securesms.components.SharedContactView;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
-import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -61,13 +59,12 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -108,15 +105,12 @@ public class ConversationItem extends LinearLayout
   private @NonNull  Stub<ConversationItemThumbnail> mediaThumbnailStub;
   private @NonNull  Stub<AudioView>                 audioViewStub;
   private @NonNull  Stub<DocumentView>              documentViewStub;
-  private @NonNull  Stub<SharedContactView>         sharedContactStub;
   private @Nullable EventListener                   eventListener;
 
   private int defaultBubbleColor;
   private int measureCalls;
 
   private final PassthroughClickListener        passthroughClickListener   = new PassthroughClickListener();
-  private final SharedContactEventListener      sharedContactEventListener = new SharedContactEventListener();
-  private final SharedContactClickListener      sharedContactClickListener = new SharedContactClickListener();
 
   private final Context context;
   private final ApplicationDcContext dcContext;
@@ -151,7 +145,6 @@ public class ConversationItem extends LinearLayout
     this.mediaThumbnailStub      = new Stub<>(findViewById(R.id.image_view_stub));
     this.audioViewStub           = new Stub<>(findViewById(R.id.audio_view_stub));
     this.documentViewStub        = new Stub<>(findViewById(R.id.document_view_stub));
-    this.sharedContactStub       = new Stub<>(findViewById(R.id.shared_contact_view_stub));
     this.groupSenderHolder       =            findViewById(R.id.group_sender_holder);
     this.quoteView               =            findViewById(R.id.quote_view);
     this.container               =            findViewById(R.id.container);
@@ -296,7 +289,7 @@ public class ConversationItem extends LinearLayout
 
   private void setAudioViewTint(DcMsg messageRecord, Recipient recipient) {
     if (messageRecord.isOutgoing()) {
-      if (DynamicTheme.LIGHT.equals(TextSecurePreferences.getTheme(context))) {
+      if (DynamicTheme.LIGHT.equals(Prefs.getTheme(context))) {
         audioViewStub.get().setTint(getContext().getResources().getColor(R.color.core_light_60), defaultBubbleColor);
       } else {
         audioViewStub.get().setTint(Color.WHITE, defaultBubbleColor);
@@ -361,7 +354,7 @@ public class ConversationItem extends LinearLayout
   private void setBodyText(DcMsg messageRecord) {
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
-    bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
+    bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, Prefs.getMessageBodyTextSize(context));
 
     String text = messageRecord.getText();
 
@@ -389,7 +382,6 @@ public class ConversationItem extends LinearLayout
       audioViewStub.get().setVisibility(View.VISIBLE);
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
-      if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       //noinspection ConstantConditions
       if(dcChat.getId() == DcChat.DC_CHAT_ID_DEADDROP) {  // no audio on dead drops
@@ -410,7 +402,6 @@ public class ConversationItem extends LinearLayout
       documentViewStub.get().setVisibility(View.VISIBLE);
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
-      if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       //noinspection ConstantConditions
       documentViewStub.get().setDocument(new DocumentSlide(context, messageRecord), showControls);
@@ -425,7 +416,6 @@ public class ConversationItem extends LinearLayout
       mediaThumbnailStub.get().setVisibility(View.VISIBLE);
       if (audioViewStub.resolved())    audioViewStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE);
-      if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       //noinspection ConstantConditions
       mediaThumbnailStub.get().setImageResource(glideRequests,
@@ -449,7 +439,6 @@ public class ConversationItem extends LinearLayout
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
-      if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -491,10 +480,6 @@ public class ConversationItem extends LinearLayout
     mediaThumbnailStub.get().setOutlineCorners(topLeft, topRight, bottomRight, bottomLeft);
   }
 
-  private void setSharedContactCorners(@NonNull DcMsg current, boolean isGroupThread) {
-    sharedContactStub.get().setSingularStyle();
-  }
-
   private void setContactPhoto() {
     if (contactPhoto == null) return;
 
@@ -578,7 +563,6 @@ public class ConversationItem extends LinearLayout
     ViewUtil.updateLayoutParams(footer, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 
     footer.setVisibility(GONE);
-    if (sharedContactStub.resolved()) sharedContactStub.get().getFooter().setVisibility(GONE);
     if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().getFooter().setVisibility(GONE);
 
     ConversationItemFooter activeFooter = getActiveFooter(current);
@@ -644,46 +628,6 @@ public class ConversationItem extends LinearLayout
 
   /// Event handlers
 
-  private class SharedContactEventListener implements SharedContactView.EventListener {
-    @Override
-    public void onAddToContactsClicked(@NonNull Contact contact) {
-      if (eventListener != null && batchSelected.isEmpty()) {
-        eventListener.onAddToContactsClicked(contact);
-      } else {
-        passthroughClickListener.onClick(sharedContactStub.get());
-      }
-    }
-
-    @Override
-    public void onInviteClicked(@NonNull List<Recipient> choices) {
-      if (eventListener != null && batchSelected.isEmpty()) {
-        eventListener.onInviteSharedContactClicked(choices);
-      } else {
-        passthroughClickListener.onClick(sharedContactStub.get());
-      }
-    }
-
-    @Override
-    public void onMessageClicked(@NonNull List<Recipient> choices) {
-      if (eventListener != null && batchSelected.isEmpty()) {
-        eventListener.onMessageSharedContactClicked(choices);
-      } else {
-        passthroughClickListener.onClick(sharedContactStub.get());
-      }
-    }
-  }
-
-  private class SharedContactClickListener implements View.OnClickListener {
-    @Override
-    public void onClick(View view) {
-//      if (eventListener != null && batchIsEmpty() && messageRecord.isMms() && !((MmsDcMsg) messageRecord).getSharedContacts().isEmpty()) {
-//        eventListener.onSharedContactDetailsClicked(((MmsDcMsg) messageRecord).getSharedContacts().get(0), sharedContactStub.get().getAvatarView());
-//      } else {
-        passthroughClickListener.onClick(view);
-//      }
-    }
-  }
-
   private void handleDeadDropClick() {
     new AlertDialog.Builder(context)
       .setPositiveButton(android.R.string.ok, (dialog, which) -> {