Bump version to 4.49.1

Updated language translations.
Use lighter-weight shadow view.
2026-05-08 09:18:39 +01:00 · 2019-10-18 13:58:59 -04:00 · 2019-10-18 13:58:35 -04:00 · 2019-10-18 13:51:56 -04:00 · 2019-10-18 13:09:20 -04:00 · 2019-10-18 13:09:20 -04:00
6501 changed files with 214019 additions and 862934 deletions
@@ -0,0 +1,45 @@
 <!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
 You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
 Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
 If you would like to discuss a new feature or submit suggestions, please visit the community forum:
 https://community.signalusers.org
 If you are looking for support, please visit our support center:
 https://support.signal.org/
 or email support@signal.org
 Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
 - [ ] I have searched open and closed issues for duplicates
 - [ ] I am submitting a bug report for existing functionality that does not work as intended
 - [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
 - [ ] This isn't a feature request or a discussion topic
 ----------------------------------------
 ### Bug description
 Describe here the issue that you are experiencing.
 ### Steps to reproduce
 - using hyphens as bullet points
 - list the steps
 - that reproduce the bug
 **Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
 **Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
 ### Screenshots
 <!-- you can drag and drop images below -->
 ### Device info
 <!-- replace the examples with your info -->
 **Device:** Manufacturer Model XVI
 **Android version:** 0.0.0
 **Signal version:** 0.0.0
 ### Link to debug log
 <!-- immediately after the bug has happened capture a debug log via Signal's advanced settings and paste the link below -->
@@ -0,0 +1,23 @@
 <!-- You can remove this first section if you have contributed before -->
 ### First time contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project
 - [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I am following the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines)
 - [ ] I have tested my contribution on these devices:
 * Device A, Android X.Y.Z
 * Device B, Android Z.Y
 * Virtual device W, Android Y.Y.Z
 - [ ] My contribution is fully baked and ready to be merged as is
 - [ ] I ensure that all the open issues my contribution fixes are mentioned in the commit message of my first commit using the `Fixes #1234` [syntax](https://help.github.com/articles/closing-issues-via-commit-messages/)
 ----------
 ### Description
 <!--
 Describe briefly what your pull request proposes to fix. Especially if you have more than one commit, it is helpful to give a summary of what your contribution as a whole is trying to solve.
 Also, please describe shortly how you tested that your fix actually works.
 -->
@@ -1,4 +1,5 @@
 .classpath
 captures/
 project.properties
 .project
 .settings
@@ -8,7 +9,6 @@ gen/
 *.iml
 out
 tests
 lint.xml
 local.properties
 ant.properties
 .DS_Store
@@ -23,3 +23,5 @@ ffpr
 test/androidTestEspresso/res/values/arrays.xml
 obj/
 jni/libspeex/.deps/
 *.sh
 pkcs11.password
@@ -1,7 +0,0 @@
 language: android
 android:
  components:
    - platform-tools
    - build-tools-19.1.0
    - android-19
    - extra-android-m2repository
@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in
+lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
-
+[signal-android.master]
 [textsecure-official.master]
 file_filter = res/values-<lang>/strings.xml
 source_file = res/values/strings.xml
 source_lang = en
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools"
-          package="org.thoughtcrime.securesms"
+          package="org.thoughtcrime.securesms">
      android:versionCode="158"
      android:versionName="3.0.1">
-    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
+    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2"/>
    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                android:label="Access to TextSecure Secrets"
@@ -18,7 +16,10 @@
    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
    <uses-permission android:name="android.permission.READ_PROFILE"/>
    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -26,27 +27,41 @@
                     tools:ignore="ProtectedPermissions"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
    <uses-permission android:name="android.permission.READ_SMS"/>
    <uses-permission android:name="android.permission.SEND_SMS"/>
    <uses-permission android:name="android.permission.WRITE_SMS"/>
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
    <!-- For sending/receiving events -->
    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
    <uses-permission android:name="android.permission.READ_CALENDAR"/>
    <!-- Normal -->
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.READ_CALL_LOG" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-    <!-- For sending location tiles in the future -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
    <!-- So we can add a TextSecure 'Account' -->
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
@@ -56,10 +71,7 @@
    <!-- For conversation 'shortcuts' on the desktop -->
    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
-
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
    <!-- For sending/receiving events -->
    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
    <uses-permission android:name="android.permission.READ_CALENDAR"/>
    <!-- For fixing MMS -->
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -68,50 +80,55 @@
    <!-- Set image as wallpaper -->
    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
    <!-- Permissions from RedPhone -->
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+
    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
    <uses-permission android:name="android.permission.CALL_PHONE" />
    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
                android:protectionLevel="signature" />
    <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
    <application android:name=".ApplicationContext"
-                 android:icon="@drawable/icon"
+                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name"
                 android:supportsRtl="true"
                 tools:replace="android:allowBackup"
                 android:allowBackup="false"
-                 android:theme="@style/TextSecure.LightTheme">
+                 android:theme="@style/TextSecure.LightTheme"
                 android:largeHeap="true">
    <meta-data
            android:name="com.google.android.geo.API_KEY"
            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
    <meta-data android:name="com.google.android.gms.version"
               android:value="@integer/google_play_services_version" />
-    <meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
+    <meta-data android:name="com.google.android.gms.car.application"
-               android:value="GlideModule" />
+               android:resource="@xml/automotive_app_desc" />
-    <activity android:name="org.thoughtcrime.redphone.RedPhone"
+    <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
    <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
              android:theme="@style/TextSecure.LightTheme.WebRTCCall"
              android:excludeFromRecents="true"
              android:screenOrientation="portrait"
              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
-              android:launchMode="singleTask">
+              android:launchMode="singleTask"/>
    <activity android:name=".InviteActivity"
              android:theme="@style/TextSecure.HighlightTheme"
              android:windowSoftInputMode="stateHidden"
              android:parentActivityName=".ConversationListActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <meta-data
            android:name="android.support.PARENT_ACTIVITY"
            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
    </activity>
    <activity android:name=".CountrySelectionActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".ImportExportActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".PromptMmsActivity"
              android:label="Configure MMS Settings"
              android:windowSoftInputMode="stateUnchanged"
@@ -131,8 +148,10 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".ShareActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:excludeFromRecents="true"
              android:launchMode="singleTask"
              android:taskAffinity=""
              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
@@ -144,13 +163,37 @@
            <data android:mimeType="image/*" />
            <data android:mimeType="text/plain" />
            <data android:mimeType="video/*" />
            <data android:mimeType="application/*"/>
            <data android:mimeType="text/*"/>
            <data android:mimeType="*/*"/>
        </intent-filter>
        <meta-data
                android:name="android.service.chooser.chooser_target_service"
                android:value=".service.DirectShareService" />
    </activity>
    <activity android:name=".stickers.StickerPackPreviewActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:launchMode="singleTask"
              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="sgnl"
                  android:host="addstickers" />
        </intent-filter>
    </activity>
    <activity android:name=".ConversationListActivity"
              android:label="@string/app_name"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:exported="true" />
@@ -161,18 +204,39 @@
        <intent-filter>
            <action android:name="android.intent.action.MAIN" />
            <category android:name="android.intent.category.LAUNCHER" />
            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
        </intent-filter>
-
+        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
                   android:resource="@mipmap/ic_launcher" />
        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
                   android:resource="@mipmap/ic_launcher" />
    </activity-alias>
-    <activity android:name=".ConversationActivity"
+    <activity android:name=".ConversationListArchiveActivity"
              android:label="@string/AndroidManifest_archived_conversations"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:parentActivityName=".ConversationListActivity">
        <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
    </activity>
    <activity android:name=".conversation.ConversationActivity"
              android:windowSoftInputMode="stateUnchanged"
              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:parentActivityName=".ConversationListActivity">
        <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
    </activity>
-    <activity android:name=".ConversationPopupActivity"
+    <activity android:name=".longmessage.LongMessageActivity" />
    <activity android:name=".conversation.ConversationPopupActivity"
              android:windowSoftInputMode="stateVisible"
              android:launchMode="singleTask"
              android:taskAffinity=""
@@ -195,7 +259,7 @@
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <activity android:name=".DatabaseUpgradeActivity"
+    <activity android:name=".migrations.ApplicationMigrationActivity"
              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -208,19 +272,18 @@
    <activity android:name=".PassphraseCreateActivity"
              android:label="@string/AndroidManifest__create_passphrase"
              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightIntroTheme"
+              android:theme="@style/TextSecure.LightNoActionBar"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".PassphrasePromptActivity"
              android:label="@string/AndroidManifest__enter_passphrase"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightIntroTheme"
              android:windowSoftInputMode="stateAlwaysVisible"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".NewConversationActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:windowSoftInputMode="stateAlwaysVisible"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".PushContactSelectionActivity"
@@ -228,11 +291,14 @@
          android:windowSoftInputMode="stateHidden"
          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <activity android:name=".ViewIdentityActivity"
+    <activity android:name=".giph.ui.GiphyActivity"
-              android:label="@string/AndroidManifest__public_identity_key"
+              android:theme="@style/TextSecure.LightNoActionBar"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <activity android:name=".ViewLocalIdentityActivity"
+        <activity android:name=".mediasend.MediaSendActivity"
                  android:theme="@style/TextSecure.FullScreenMedia"
                  android:windowSoftInputMode="stateHidden"
                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".PassphraseChangeActivity"
@@ -240,21 +306,37 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".VerifyIdentityActivity"
              android:label="@string/AndroidManifest__verify_identity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".ApplicationPreferencesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.MAIN" />
            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
        </intent-filter>
    </activity>
-    <activity android:name=".RegistrationActivity"
+    <activity android:name=".registration.RegistrationNavigationActivity"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightRegistrationTheme"
              android:windowSoftInputMode="stateUnchanged"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <activity android:name=".RegistrationProgressActivity"
+    <activity android:name=".revealable.ViewOnceMessageActivity"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.FullScreenMedia"
              android:windowSoftInputMode="stateHidden"
              android:excludeFromRecents="true"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-     <activity android:name=".DeviceListActivity"
+    <activity android:name=".stickers.StickerManagementActivity"
-               android:label="@string/AndroidManifest_manage_linked_devices"
+              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightTheme"
              android:windowSoftInputMode="stateUnchanged"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
     <activity android:name=".DeviceActivity"
               android:label="@string/AndroidManifest__linked_devices"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".LogSubmitActivity"
@@ -269,7 +351,9 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".MediaOverviewActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:windowSoftInputMode="stateHidden"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".DummyActivity"
@@ -284,7 +368,7 @@
              android:finishOnTaskLaunch="true" />
    <activity android:name=".PlayServicesProblemActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:theme="@style/TextSecure.DialogActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".SmsSendtoActivity">
@@ -305,6 +389,20 @@
        </intent-filter>
    </activity>
    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
              android:excludeFromRecents="true"
              android:theme="@style/NoAnimation.Theme.BlackScreen"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
        </intent-filter>
    </activity>
    <activity android:name=".RecipientPreferenceActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -313,14 +411,60 @@
              android:theme="@style/TextSecure.LightTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
+    <activity android:name=".scribbles.StickerSelectActivity"
              android:theme="@style/TextSecure.DarkTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-    <service android:enabled="true" android:name="org.thoughtcrime.redphone.RedPhoneService"/>
+    <activity android:name=".scribbles.NewStickerSelectActivity"
              android:theme="@style/TextSecure.DarkTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
              android:theme="@style/TextSecure.DarkTheme"/>
    <activity android:name=".CreateProfileActivity"
              android:theme="@style/TextSecure.LightRegistrationTheme"
              android:windowSoftInputMode="stateVisible"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity android:name=".ClearProfileAvatarActivity"
              android:theme="@style/Theme.AppCompat.Dialog.Alert"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:icon="@drawable/clear_profile_avatar"
              android:label="@string/AndroidManifest_remove_photo">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
            <category android:name="android.intent.category.DEFAULT"/>
        </intent-filter>
    </activity>
    <activity android:name=".contactshare.ContactShareEditActivity"
              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=".ShortcutLauncherActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:exported="true"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
    <activity
            android:name=".maps.PlacePickerActivity"
            android:label="@string/PlacePickerActivity_title"
            android:theme="@style/TextSecure.LightNoActionBar" />
    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
-    <service android:enabled="true" android:name=".service.KeyCachingService"/>
+    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.RegistrationService"/>
+    <service android:enabled="true" android:name=".service.IncomingMessageObserver$ForegroundService"/>
    <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
    <service android:name=".service.QuickResponseService"
             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
@@ -350,12 +494,20 @@
        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
    </service>
-    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
+    <service android:name=".service.DirectShareService"
             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
        <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            <action android:name="android.service.chooser.ChooserTargetService" />
            <category android:name="org.thoughtcrime.securesms" />
        </intent-filter>
-    </receiver>
+    </service>
    <service android:name=".service.GenericForegroundService"/>
    <service android:name=".gcm.FcmService">
        <intent-filter>
            <action android:name="com.google.firebase.MESSAGING_EVENT" />
        </intent-filter>
    </service>
    <receiver android:name=".service.SmsListener"
              android:permission="android.permission.BROADCAST_SMS"
@@ -392,60 +544,193 @@
    <receiver android:name=".notifications.MarkReadReceiver"
              android:enabled="true"
-              android:exported="true">
+              android:exported="false">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
        </intent-filter>
    </receiver>
-    <receiver android:name=".notifications.WearReplyReceiver"
+    <receiver android:name=".notifications.RemoteReplyReceiver"
              android:enabled="true"
-              android:exported="true">
+              android:exported="false">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
              android:exported="false">
        <intent-filter>
          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
              android:exported="false">
        <intent-filter>
          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".service.ExpirationListener" />
    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
    <provider android:name=".providers.PartProvider"
              android:grantUriPermissions="true"
              android:exported="false"
              android:authorities="org.thoughtcrime.provider.securesms" />
    <provider android:name=".providers.MmsBodyProvider"
              android:grantUriPermissions="true"
              android:exported="false"
              android:authorities="org.thoughtcrime.provider.securesms.mms" />
-    <receiver android:name=".service.RegistrationNotifier"
+    <provider android:name="androidx.core.content.FileProvider"
-              android:exported="false">
+              android:authorities="org.thoughtcrime.securesms.fileprovider"
              android:exported="false"
              android:grantUriPermissions="true">
        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
    </provider>
    <provider android:name=".database.DatabaseContentProviders$Conversation"
              android:authorities="org.thoughtcrime.securesms.database.conversation"
              android:exported="false" />
    <provider android:name=".database.DatabaseContentProviders$ConversationList"
              android:authorities="org.thoughtcrime.securesms.database.conversationlist"
              android:exported="false" />
    <provider android:name=".database.DatabaseContentProviders$Attachment"
              android:authorities="org.thoughtcrime.securesms.database.attachment"
              android:exported="false" />
    <provider android:name=".database.DatabaseContentProviders$Sticker"
              android:authorities="org.thoughtcrime.securesms.database.sticker"
              android:exported="false" />
    <provider android:name=".database.DatabaseContentProviders$StickerPack"
              android:authorities="org.thoughtcrime.securesms.database.stickerpack"
              android:exported="false" />
    <provider android:name="androidx.camera.camera2.impl.Camera2Initializer"
              android:authorities="${applicationId}.camerax-init"
              android:exported="false"
              android:enabled="false" />
    <receiver android:name=".service.BootReceiver">
        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.REGISTRATION_EVENT" />
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
            <action android:name="org.thoughtcrime.securesms.RESTART"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".service.DirectoryRefreshListener">
        <intent-filter>
            <action android:name="org.whispersystems.whisperpush.DIRECTORY_REFRESH"/>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>
    <receiver android:name=".service.RotateSignedPreKeyListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>
    <receiver android:name=".service.RotateSenderCertificateListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>
    <receiver android:name=".service.LocalBackupListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>
    <receiver android:name=".service.PersistentConnectionBootListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".notifications.LocaleChangedReceiver">
        <intent-filter>
            <action android:name="android.intent.action.LOCALE_CHANGED"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
        </intent-filter>
    </receiver>
-    <receiver android:name=".notifications.MessageNotifier$DeleteReceiver">
+    <receiver android:name=".notifications.DeleteNotificationReceiver">
        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.DELETE_REMINDER_ACTION"/>
+            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
        </intent-filter>
    </receiver>
    <receiver android:name=".ExperienceUpgradeActivity$AppUpgradeReceiver">
        <intent-filter>
-            <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+            <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
            <data android:scheme="package" />
        </intent-filter>
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION"/>
        </intent-filter>
    </receiver>
    <receiver
        android:name=".service.PanicResponderListener"
        android:exported="true">
        <intent-filter>
            <action android:name="info.guardianproject.panic.action.TRIGGER" />
        </intent-filter>
    </receiver>
    <service
        android:name=".gcm.FcmJobService"
        android:permission="android.permission.BIND_JOB_SERVICE"
        android:enabled="@bool/enable_job_service"
        tools:targetApi="26" />
    <service
        android:name=".jobmanager.JobSchedulerScheduler$SystemService"
        android:permission="android.permission.BIND_JOB_SERVICE"
        android:enabled="@bool/enable_job_service"
        tools:targetApi="26" />
    <service
        android:name=".jobmanager.KeepAliveService"
        android:enabled="@bool/enable_alarm_manager" />
    <receiver
        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
        android:enabled="@bool/enable_alarm_manager" />
    <!-- Probably don't need this one -->
    <receiver
        android:name=".jobmanager.BootReceiver"
        android:enabled="true">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>
    <uses-library android:name="org.apache.http.legacy" android:required="false"/>
    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
 </application>
 </manifest>
@@ -1,45 +1,48 @@
-Building TextSecure
+Building Signal
-=====================
+===============
 Basics
 ------
-TextSecure uses [Gradle](http://gradle.org) to build the project and to maintain
+Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.
+dependencies.  However, you needn't install it yourself; the
 "gradle wrapper" `gradlew`, mentioned below, will do that for you.
-Building TextSecure
+Building Signal
-------------------
+---------------
-The following steps should help you (re)build TextSecure from the command line.
+The following steps should help you (re)build Signal from the command line.
-1. Checkout the source somewhere on your filesystem with 
+1. Checkout the Signal-Android project source with the command:
-        git clone https://github.com/WhisperSystems/TextSecure.git
+        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 somewhere on your system.
+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
+    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform
+    * 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.
+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=\<path to your sdk installation\>
+        sdk.dir=/Application/android-sdk-macosx
-5. Execute Gradle:
+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. We host ours in a [Pixelapse repository](https://www.pixelapse.com/openwhispersystems/projects/signal-android/). 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).
+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/TextSecure/res/ 150 --color #000 --opacity 0.54 --suffix _light
+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/TextSecure/res/ 150 --color #fff --opacity 1.00 --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
@@ -48,13 +51,14 @@ 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. Make sure the "Android Support Repository" is installed in the Android Studio SDK.
+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. Make sure the latest "Android SDK build-tools" is installed in the Android Studio SDK.
+3. From the Quickstart panel, choose "Configure" then "SDK Manager".
-4. Create a new Android Studio project. from the Quickstart pannel (use File > Close Project to see it), choose "Checkout from Version Control" then "git".
+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. Paste the URL for the TextSecure project when prompted (https://github.com/WhisperSystems/TextSecure.git).
+5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
+6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
-7. Default config options should be good enough.
+7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-8. Project initialisation and build should proceed.
+9. Default config options should be good enough.
 9. Project initialisation and build should proceed.
 Contributing code
 -----------------
@@ -67,3 +71,4 @@ 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
@@ -0,0 +1,89 @@
 # Contributing to Signal Android
 Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors.
 ## Development Ideology
 Truths which we believe to be self-evident:
 1. **The answer is not more options.**  If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere.
 1. **The user doesn't know what a key is.**  We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible.
 1. **There are no power users.**  The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them.
 1. **If it's "like PGP," it's wrong.**  PGP is our guide for what not to do.
 1. **It's an asynchronous world.**  Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message.
 1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.
 ## Translations
 Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/signalapp/signal-android/).
 ## Issues
 ### Useful bug reports
 1. Please search both open and closed issues to make sure your bug report is not a duplicate.
 1. Read the [guide to submitting useful bug reports](https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
 ### The issue tracker is for bugs, not feature requests
 The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the Android client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly.
 ### Send support questions to support
 You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker.
 ### GitHub is not a generic discussion forum
 Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category.
 ### Don't bump issues
 Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-Android/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add.
 ### Open issues
 #### If it's open, it's tracked
 The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues.
 ### Closed issues
 #### "My issue was closed without giving a reason!"
 Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues.
 ## Pull requests
 ### Smaller is better
 Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop).
 Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code.
 ### Sign the Contributor License Agreement (CLA)
 You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged.
 ### Follow the Code Style Guidelines
 Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.
 ### Submit finished and well-tested pull requests
 Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.
 ### Merging can sometimes take a while
 If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/).
 ## How can I contribute?
 There are several other ways to get involved:
 * Help new users learn about Signal.
  * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/).
  * Redirect non-bug discussions to the [community forum](https://community.signalusers.org).
 * Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki).
 * Join the community of volunteer translators on Transifex:
  * [Android](https://www.transifex.com/signalapp/signal-android/)
  * [iOS](https://www.transifex.com/signalapp/signal-ios/)
  * [Desktop](https://www.transifex.com/signalapp/signal-desktop/)
 * Find and mark duplicate issues.
 * Try to reproduce issues and help with troubleshooting.
 * Discover solutions to open issues and post any relevant findings.
 * Test other people's pull requests.
 * Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/).
 * Share Signal with your friends and family.
 Signal is made for you. Thank you for your feedback and support.
@@ -0,0 +1,25 @@
 FROM ubuntu:17.10
 RUN dpkg --add-architecture i386 && \
    apt-get update -y && \
    apt-get install -y software-properties-common && \
    apt-get update -y && \
    apt-get install -y libc6:i386=2.26-0ubuntu2.1 libncurses5:i386=6.0+20160625-1ubuntu1 libstdc++6:i386=7.2.0-8ubuntu3.2 lib32z1=1:1.2.11.dfsg-0ubuntu2 wget openjdk-8-jdk=8u171-b11-0ubuntu0.17.10.1 git unzip opensc pcscd && \
    rm -rf /var/lib/apt/lists/* && \
    apt-get autoremove -y && \
    apt-get clean
 ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz
 ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME}
 ENV ANDROID_API_LEVELS android-28
 ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /usr/local/ && \
    wget -q ${ANDROID_SDK_URL} && \
    tar -xzf ${ANDROID_SDK_FILENAME} && \
    rm ${ANDROID_SDK_FILENAME} 
 RUN echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS}
 RUN echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository
 RUN echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION}
 RUN rm -rf ${ANDROID_HOME}/tools && unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
@@ -1,65 +1,52 @@
-# TextSecure [![Build Status](https://travis-ci.org/WhisperSystems/TextSecure.svg?branch=master)](https://travis-ci.org/WhisperSystems/TextSecure)
+# Signal Android 
-TextSecure is a messaging app for simple private communication with friends.
+Signal is a messaging app for simple private communication with friends.
-TextSecure uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.
+Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.
 Currently available on the Play store.
-*[![Play Store Badge](https://developer.android.com/images/brand/en_app_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms)*
+<a href='https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80px'/></a>
 ## Contributing Bug reports
 We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked!
-https://github.com/WhisperSystems/TextSecure/issues
+https://github.com/signalapp/Signal-Android/issues
 ## Joining the Beta
 Want to live life on the bleeding edge and help out with testing?
-You can subscribe to TextSecure Beta releases here:
+You can subscribe to Signal Android Beta releases here:
 https://play.google.com/apps/testing/org.thoughtcrime.securesms
 If you're interested in a life of peace and tranquility, stick with the standard releases.
 ## Contributing Translations
-Interested in helping to translate TextSecure? Contribute here:
+Interested in helping to translate Signal? Contribute here:
-https://www.transifex.com/projects/p/textsecure-official/
+https://www.transifex.com/projects/p/signal-android/
 ## Contributing Code
-Instructions on how to setup your development environment and build TextSecure can be found in  [BUILDING.md](https://github.com/WhisperSystems/TextSecure/blob/master/BUILDING.md).
+Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/signalapp/Signal-Android/blob/master/BUILDING.md).
-If you're new to the TextSecure codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
-For larger changes and feature ideas, we ask that you propose it on the mailing list for a high-level discussion before implementation.
+For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.
 This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to TextSecure. The current BitHub price for an accepted pull request is:
 [![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/)
 ## Contributing Ideas
-Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the mailing list!
+Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
 whispersystems@lists.riseup.net
 https://lists.riseup.net/www/info/whispersystems
 ## Contributing Funds
 [![Donate](https://www.coinbase.com/assets/buttons/donation_large-5e1b50d6490970e32b80023f3070b1d77afc621b9e64ac996596a67a4671967b.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
 You can add funds to BitHub to directly help further development efforts.
 Help
 ====
 ## Support
 For troubleshooting and questions, please visit our support center!
-http://support.whispersystems.org/
+https://support.signal.org/
 ## Documentation
 Looking for documentation? Check out the wiki!
-https://github.com/WhisperSystems/TextSecure/wiki
+https://github.com/signalapp/Signal-Android/wiki
 # Legal things
 ## Cryptography Notice
@@ -75,6 +62,8 @@ The form and manner of this distribution makes it eligible for export under the
 Copyright 2011 Whisper Systems
-Copyright 2013-2014 Open Whisper Systems
+Copyright 2013-2017 Open Whisper Systems
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 Google Play and the Google Play logo are trademarks of Google Inc.
@@ -0,0 +1,287 @@
 # Reproducible Builds
 ## TL;DR
 You can just use these [instructions](https://signal.org/blog/reproducible-android/) from the official announcement at Open Whisper Systems's blog:
 ```
 # Clone the Signal Android source repository
 $ git clone https://github.com/signalapp/Signal-Android.git && cd Signal-Android
 # Check out the release tag for the version you'd like to compare
 $ git checkout v[the version number]
 # Build using the Docker environment
 $ docker run --rm -v $(pwd):/project -w /project whispersystems/signal-android:1.3 ./gradlew clean assembleRelease
 # Verify the APKs
 $ python3 apkdiff/apkdiff.py build/outputs/apks/project-release-unsigned.apk path/to/SignalFromPlay.apk
 ```
 Note that the instructions above use a pre-built Signal Docker image from [Docker Hub](https://hub.docker.com/u/whispersystems/). If you wish to compile the image yourself, continue reading the longer version below.
 ***
 ## Introduction
 Since version 3.15.0 Signal for Android has supported reproducible builds. This is achieved by replicating the build environment as a Docker image. You'll need to build the image, run a container instance of it, compile Signal inside the container and finally compare the resulted APK to the APK that is distributed in the Google Play Store.
 The command line parts in this guide are written for Linux but with some little modifications you can adapt them to macOS (OS X) and Windows. In the following sections we will use `3.15.2` as an example Signal version. You'll just need to replace all occurrences of `3.15.2` with the version number you are about to verify.
 ## Setting up directories
 First let's create a new directory for this whole reproducible builds project. In your home folder (`~`), create a new directory called `reproducible-signal`.
 ```
 user@host:$ mkdir ~/reproducible-signal
 ```
 Next create another directory inside `reproducible-signal` called `apk-from-google-play-store`.
 ```
 user@host:$ mkdir ~/reproducible-signal/apk-from-google-play-store
 ```
 We will use this directory to share APKs between the host OS and the Docker container.
 Finally create one more directory inside `reproducible-signal` called `image-build-context`.
 ```
 user@host:$ mkdir ~/reproducible-signal/image-build-context
 ```
 This directory will be used later to build our Docker image.
 ## Getting the Google Play Store version of Signal APK
 To compare the APKs we of course need a version of Signal from the Google Play Store.
 First make sure that the Signal version you want to verify is installed on your Android device. You'll need `adb` for this part.
 Plug your device to your computer and run this command to pull the APK from the device:
 ```
 user@host:$ adb pull $(adb shell pm path org.thoughtcrime.securesms | grep /base.apk | awk -F':' '{print $2}') ~/reproducible-signal/apk-from-google-play-store/Signal-$(adb shell dumpsys package org.thoughtcrime.securesms | grep versionName | awk -F'=' '{print $2}').apk
 ```
 This will pull a file into `~/reproducible-signal/apk-from-google-play-store/` with the name `Signal-<version>.apk`
 Alternatively, you can do this step-by-step:
 ```
 user@host:$ adb shell pm path org.thoughtcrime.securesms
 ```
 This will output something like:
 ```
 package:/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk
 ```
 The output will tell you where the Signal APK is located in your device. (In this example the path is `/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk`)
 Now using this information, pull the APK from your device to the `reproducible-signal/apk-from-google-play-store` directory you created before:
 ```
 user@host:$ adb pull \
              /data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk \
              ~/reproducible-signal/apk-from-google-play-store/Signal-3.15.2.apk
 ```
 We will use this APK in the final part when we compare it with the self-built APK from GitHub.
 ## Identifying the ABI
 Since v4.37.0, the APKs have been split by ABI, the CPU architecture of the target device. Google play will serve the correct one to you for your device.
 To identify which ABIs the google play APK supports, we can look inside the APK, which is just a zip file:
 ```
 user@host:$ unzip -l ~/reproducible-signal/apk-from-google-play-store/Signal-*.apk | grep lib/
 ```
 Example:
 ```
  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
 ```
 As there is just one sub directory of `lib/` called `armeabi-v7a`, that is your ABI. Make a note of that for later. If you see more than one subdirectory of `lib/`:
 ```
  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
  2111376  00-00-1980 00:00   lib/x86/libconscrypt_jni.so
   201056  00-00-1980 00:00   lib/x86/libcurve25519.so
  7303888  00-00-1980 00:00   lib/x86/libjingle_peerconnection_so.so
     5596  00-00-1980 00:00   lib/x86/libnative-utils.so
  3977636  00-00-1980 00:00   lib/x86/libsqlcipher.so
 ```
 Then that means you have the `universal` APK.
 ## Installing Docker
 Install Docker by following the instructions for your platform at https://docs.docker.com/engine/installation/
 Your platform might also have its own preferred way of installing Docker. E.g. Ubuntu has its own Docker package (`docker.io`) if you do not want to follow Docker's instructions.
 In the following sections we will assume that your Docker installation works without issues. So after installing, please make sure that everything is running smoothly before continuing.
 ## Building a Docker image for Signal
 #### Grabbing the `Dockerfile`
 First you will need the `Dockerfile` for Signal Android. It comes bundled with Signal's source code. The `Dockerfile` contains instructions on how to automatically build a Docker image for Signal. You just need to run it and it builds itself.
 Download the `Dockerfile` to the `image-build-context` directory.
 ```
 user@host:$ wget -O ~/reproducible-signal/image-build-context/Dockerfile_v3.15.2 \
                    https://raw.githubusercontent.com/signalapp/Signal-Android/v3.15.2/Dockerfile
 ```
 Note that the `Dockerfile` is specific to the Signal version you want to compare to. Again you have to adjust the URL above to match the right version. (Though sometimes the file might not be up to date, see the [Troubleshooting section](#troubleshooting))
 #### Building the image
 Now we have everything we need to build the Docker image for Signal. Go to the `image-build-context` directory:
 ```
 user@host:$ cd ~/reproducible-signal/image-build-context
 ```
 And list the contents.
 ```
 user@host:$ ls
 ```
 The output should look like this:
 ```
 Dockerfile_v3.15.2
 ```
 Now in this directory build the image using `Dockerfile_v3.15.2`:
 ```
 user@host:$ docker build --file Dockerfile_v3.15.2 --tag signal-android .
 ```
 (Note that there is a dot at the end of that command!)
 Wait a few years for the build to finish... :construction_worker:
 (Depending on your computer and network connection, this may take several minutes.)
 :calendar: :sleeping:
 After the build has finished, you may wish to list all your Docker images to see that it's really there:
 ```
 user@host:$ docker images
 ```
 Output should look something like this:
 ```
 REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
 signal-android      latest              c6b84450b896        46 seconds ago      2.94 GB
 ubuntu              14.04.3             8693db7e8a00        9 weeks ago         187.9 MB
 ```
 ## Compiling Signal inside a container
 Next we will run a container of the image we just built, grab Signal's source code and compile Signal.
 First go to the `reproducible-signal` directory:
 ```
 user@host:$ cd ~/reproducible-signal/
 ```
 To run a new ephemeral container with an interactive terminal session execute the following long command:
 ```
 user@host:$ docker run \
              --name signal \
              --rm \
              --interactive \
              --tty \
              --volume $(pwd)/apk-from-google-play-store:/signal-build/apk-from-google-play-store \
              --workdir /signal-build \
              signal-android
 ```
 Now you are inside the container.
 Grab Signal's source code from GitHub and go to the repository directory:
 ```
 root@container:# git clone https://github.com/signalapp/Signal-Android.git
 root@container:# cd Signal-Android
 ```
 Before you can compile, you **must** ensure that you are at the right commit. In other words you **must** checkout the version you wish to verify (here we are verifying 3.15.2):
 ```
 root@container:# git checkout --quiet v3.15.2
 ```
 Now you may compile the release APK by running:
 ```
 root@container:# ./gradlew clean assemblePlayRelease --exclude-task signProductionPlayRelease
 ```
 This will take a few minutes :sleeping:
 #### Checking if the APKs match
 After the build has completed successfully we can finally compare if the APKs match. For the comparison we need of course the Google Play Store version of Signal APK which you copied to the `apk-from-google-play-store` directory in the beginning of this guide. Because we used that directory as a `--volume` parameter for our container, we can see all the files in that directory within our container.
 So now we can compare the APKs using the `apkdiff.py` tool.
 The above build step produced several APKs, one for each supported ABI and one universal one. You will need to determine the correct APK to compare.
 Currently, the most common ABI is `armeabi-v7a`. Other options at this time include `x86` and `universal`. In the future it will also include 64-bit options, such as `x86_64` and `arm64-v8a`.
 See [Identifying the ABI](#identifying-the-abi) above if you don't know the ABI of your play store APK.
 Once you have determined the ABI, add an `abi` environment variable. For example, suppose we determine that `armeabi-v7a` is the ABI google play has served:
 ```
 root@container:# export abi=armeabi-v7a
 ```
 And the diff script to compare:
 ```
 root@container:# python3 apkdiff/apkdiff.py \
                   build/outputs/apk/play/release/*play-$abi-release-unsigned*.apk \
                   ../apk-from-google-play-store/Signal-3.15.2.apk
 ```
 Output:
 ```
 APKs match!
 ```
 If you get `APKs match!`, you have successfully verified that the Google Play release matches with your own self-built version of Signal. Congratulations! Your APKs are a match made in heaven! :sparkles:
 If you get `APKs don't match!`, you did something wrong in the previous steps. See the [Troubleshooting section](#troubleshooting) for more info.
 ## Comparing next time
 If the build environment (i.e. `Dockerfile`) has not changed, you don't need to build the image again to verify a newer APK. You can just [run the container again](#compiling-signal-inside-a-container).
 ## Troubleshooting
 If you cannot get things to work, please do not open an issue or comment on an existing issue at GitHub. Instead, ask for help at https://community.signalusers.org/c/development
 Some common issues why things may not work:
 - some pinned packages in the `Dockerfile` are not available anymore and building of the Docker image fails
 - the Android packages in the Docker image are outdated and compiling Signal fails
 - you built the Docker image with a wrong version of the `Dockerfile`
 - you didn't checkout the correct Signal version tag with Git before compiling
 - the ABI you selected is not the correct ABI, particularly if you see an error along the lines of `Sorted manifests don't match, lib/x86/libcurve25519.so vs lib/armeabi-v7a/libcurve25519.so`.
 - this guide is outdated
 - you are in a dream
 - if you run into this issue: https://issuetracker.google.com/issues/110237303 try to add `resources.arsc` to the list of ignored files and compare again
@@ -0,0 +1,79 @@
 #! /usr/bin/env python3
 import sys
 from zipfile import ZipFile
 class ApkDiff:
    # resources.arsc is ignored due to https://issuetracker.google.com/issues/110237303
    # May be fixed in Android Gradle Plugin 3.4
    IGNORE_FILES = ["META-INF/MANIFEST.MF", "META-INF/SIGNAL_S.RSA", "META-INF/SIGNAL_S.SF", "resources.arsc"]
    def compare(self, sourceApk, destinationApk):
        sourceZip      = ZipFile(sourceApk, 'r')
        destinationZip = ZipFile(destinationApk, 'r')
        if self.compareManifests(sourceZip, destinationZip) and self.compareEntries(sourceZip, destinationZip) == True:
            print("APKs match!")
        else:
            print("APKs don't match!")
    def compareManifests(self, sourceZip, destinationZip):
        sourceEntrySortedList      = sorted(sourceZip.namelist())
        destinationEntrySortedList = sorted(destinationZip.namelist())
        for ignoreFile in self.IGNORE_FILES:
            while ignoreFile in sourceEntrySortedList: sourceEntrySortedList.remove(ignoreFile)
            while ignoreFile in destinationEntrySortedList: destinationEntrySortedList.remove(ignoreFile)
        if len(sourceEntrySortedList) != len(destinationEntrySortedList):
            print("Manifest lengths differ!")
        for (sourceEntryName, destinationEntryName) in zip(sourceEntrySortedList, destinationEntrySortedList):
            if sourceEntryName != destinationEntryName:
                print("Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName))
                return False
        return True
    def compareEntries(self, sourceZip, destinationZip):
        sourceInfoList      = list(filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist()))
        destinationInfoList = list(filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist()))
        if len(sourceInfoList) != len(destinationInfoList):
            print("APK info lists of different length!")
            return False
        for sourceEntryInfo in sourceInfoList:
            for destinationEntryInfo in list(destinationInfoList):
                if sourceEntryInfo.filename == destinationEntryInfo.filename:
                    sourceEntry      = sourceZip.open(sourceEntryInfo, 'r')
                    destinationEntry = destinationZip.open(destinationEntryInfo, 'r')
                    if self.compareFiles(sourceEntry, destinationEntry) != True:
                        print("APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename))
                        return False
                    destinationInfoList.remove(destinationEntryInfo)
                    break
        return True
    def compareFiles(self, sourceFile, destinationFile):
        sourceChunk      = sourceFile.read(1024)
        destinationChunk = destinationFile.read(1024)
        while sourceChunk != b"" or destinationChunk != b"":
            if sourceChunk != destinationChunk:
                return False
            sourceChunk      = sourceFile.read(1024)
            destinationChunk = destinationFile.read(1024)
        return True
 if __name__ == '__main__':
    if len(sys.argv) != 3:
        print("Usage: apkdiff <pathToFirstApk> <pathToSecondApk>")
        sys.exit(1)
    ApkDiff().compare(sys.argv[1], sys.argv[2])
--- a/Show More
+++ b/Show More