Bump version to 4.7.4

// FREEBIE

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to 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, not questions or comments.
+
+If you are looking for support, please see our support center instead:
+https://support.whispersystems.org/
+or email support@whispersystems.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
+- [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
+
+----------------------------------------
+
+### 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 -->
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!-- 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/WhisperSystems/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/WhisperSystems/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/)
+- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in the commit message of my first commit
+
+----------
+
+### 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.
+-->

.gitignore

@@ -20,3 +20,7 @@ signing.properties
 library/lib/
 library/obj/
 ffpr
+test/androidTestEspresso/res/values/arrays.xml
+obj/
+jni/libspeex/.deps/
+*.sh

.travis.yml

@@ -1,7 +0,0 @@
-language: android
-android:
-  components:
-    - platform-tools
-    - build-tools-19.1.0
-    - android-19
-    - extra-android-m2repository

.tx/config

@@ -1,9 +1,9 @@
 [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 = 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,lt_LT:lt,km_KH:km-rKH
 
 
-[textsecure-official.master]
+[signal-android.master]
 file_filter = res/values-<lang>/strings.xml
 source_file = res/values/strings.xml
 source_lang = en

AndroidManifest.xml

@@ -1,16 +1,24 @@
 <?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"
-      android:versionCode="122"
-      android:versionName="2.16.2">
+          package="org.thoughtcrime.securesms">
 
-    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip"/>
+    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message"/>
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
                 android:protectionLevel="signature" />
 
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+    <uses-feature android:name="android.hardware.location" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <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="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -33,16 +41,66 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <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.ACCESS_COARSE_LOCATION"/>
+    <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" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+
+    <!-- For conversation 'shortcuts' on the desktop -->
+    <uses-permission android:name="android.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"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
+    <!-- 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.READ_LOGS"/>
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+
     <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
                 android:protectionLevel="signature" />
     <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
 
     <application android:name=".ApplicationContext"
                  android:icon="@drawable/icon"
+                 android:roundIcon="@drawable/icon_circle"
                  android:label="@string/app_name"
-                 android:theme="@style/TextSecure.LightTheme">
+                 android:supportsRtl="true"
+                 tools:replace="android:allowBackup"
+                 android:allowBackup="false"
+                 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" />
@@ -50,12 +108,31 @@
     <meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
                android:value="GlideModule" />
 
+    <meta-data android:name="com.google.android.gms.car.application"
+               android:resource="@xml/automotive_app_desc" />
+
+    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
+              android:excludeFromRecents="true"
+              android:screenOrientation="portrait"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:launchMode="singleTask"/>
+
     <activity android:name=".CountrySelectionActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ImportExportActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <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=".PromptMmsActivity"
               android:label="Configure MMS Settings"
               android:windowSoftInputMode="stateUnchanged"
@@ -88,8 +165,15 @@
             <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=".ConversationListActivity"
@@ -105,13 +189,42 @@
         <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="@drawable/icon" />
+        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
+            android:resource="@drawable/icon" />
+
     </activity-alias>
 
+    <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=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               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=".ConversationPopupActivity"
+              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:excludeFromRecents="true"
+              android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".MessageDetailsActivity"
@@ -134,10 +247,15 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".ExperienceUpgradeActivity"
+              android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+              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.LightIntroTheme"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -149,8 +267,8 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:label="@string/AndroidManifest__select_contacts"
-              android:windowSoftInputMode="stateVisible"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
@@ -158,11 +276,9 @@
           android:windowSoftInputMode="stateHidden"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ViewIdentityActivity"
-              android:label="@string/AndroidManifest__public_identity_key"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ViewLocalIdentityActivity"
+    <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"
@@ -170,7 +286,6 @@
               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"
@@ -183,6 +298,10 @@
     <activity android:name=".RegistrationProgressActivity"
               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"
               android:label="@string/AndroidManifest__log_submit"
               android:windowSoftInputMode="stateHidden"
@@ -196,6 +315,7 @@
 
     <activity android:name=".MediaOverviewActivity"
               android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DummyActivity"
@@ -210,7 +330,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">
@@ -224,10 +344,48 @@
             <data android:scheme="mms" />
             <data android:scheme="mmsto" />
         </intent-filter>
+        <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.contact" />
+        </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"/>
+
+    <activity android:name=".BlockedContactsActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".scribbles.ScribbleActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".scribbles.StickerSelectActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
 
+    <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:name=".service.RegistrationService"/>
@@ -246,6 +404,27 @@
         </intent-filter>
     </service>
 
+    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.accounts.AccountAuthenticator" />
+        </intent-filter>
+        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
+    </service>
+
+    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.content.SyncAdapter"/>
+        </intent-filter>
+        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
+    </service>
+
+    <service android:name=".service.DirectShareService"
+             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+        <intent-filter>
+            <action android:name="android.service.chooser.ChooserTargetService" />
+        </intent-filter>
+    </service>
 
     <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
         <intent-filter>
@@ -289,18 +468,43 @@
 
     <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.RemoteReplyReceiver"
+              android:enabled="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>
+
+
     <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"
@@ -312,22 +516,55 @@
 
     <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.PersistentConnectionBootListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        </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"/>
+            <data android:scheme="package" />
+        </intent-filter>
+    </receiver>
+
+    <receiver
+        android:name=".service.PanicResponderListener"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="info.guardianproject.panic.action.TRIGGER" />
+        </intent-filter>
+    </receiver>
+
+    <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>

BUILDING.md

@@ -1,30 +1,31 @@
-Building TextSecure
-=====================
+Building Signal
+===============
 
 Basics
 ------
 
-TextSecure uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.
+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 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/WhisperSystems/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
-    * SDK Platform
+    * Android SDK Build Tools (see buildToolsVersion in build.gradle)
+    * SDK Platform (API level 22)
     * 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:
 
@@ -38,8 +39,8 @@ Source assets tend to be large binary blobs, which are best stored outside of gi
 Sample command for generating our audio placeholder image:
 
 ```bash
-pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 "#000" 0.54 _light
-pngs_from_svg.py ic_audio.svg /path/to/TextSecure/res/ 150 "#fff" 1.0 _dark
+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
@@ -48,13 +49,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.
-3. Make sure the latest "Android SDK build-tools" is installed in the Android Studio SDK.
-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".
-5. Paste the URL for the TextSecure project when prompted (https://github.com/WhisperSystems/TextSecure.git).
-6. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
-7. Default config options should be good enough.
-8. Project initialisation and build should proceed.
+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/WhisperSystems/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
 -----------------
@@ -67,3 +69,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
+

CONTRIBUTING.md

@@ -0,0 +1,88 @@
+# Contributing to Signal Android
+
+Thank you for deciding to help this project! If you have contributed to other open source projects before please note that some conventions here might be a bit different than what you are used to. Reading this document will save you, other contributors and the developers time.
+
+
+## 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
+
+Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/signal-android/). Please submit your corrections there.
+
+
+## Issues
+
+### Useful bug reports
+1. Please search both open and closed issues first to make sure your issue is not a duplicate.
+1. Read the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
+
+### Issue tracker is for bugs
+The main purpose of this issue tracker is to track bugs for the Android client. Relevant, concise and to the point comments that help to solve the issue are very welcome.
+
+##### Send support questions to support
+Please do **not** ask support questions at the issue tracker. We want to help you using Signal and we have created our support system just for that. You can reach support by sending email to support@whispersystems.org or by going to our [Support Center](http://support.whispersystems.org). You can also search for existing troubleshooting articles at the [Support Center](http://support.whispersystems.org).
+
+##### Not a discussion forum
+Please do **not** use this issue tracker as a discussion forum. Discussion related to the bug in question should of course go to the issue itself. However other discussion should take place at the [community forum](https://whispersystems.discoursehosting.net). You can use that forum to discuss any Signal related topics or to just hang out with your fellow users.
+
+### Don't bump issues
+Every time someone comments on an issue, GitHub sends email to [everyone who is watching](https://github.com/WhisperSystems/Signal-Android/watchers) the repository (currently around 500 people). Thus bumping issues with :+1:s, _me toos_ or asking for updates generates a lot of unnecessary email notifications. Moreover bumping an issue does not help solve it. Please be respectful of everyone's time and only comment if you have relevant new information to add.
+
+### Open issues
+
+#### If it's open it's tracked
+Have you followed all the points in the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) but nobody has commented on your issue? Is there no milestone or person assigned to it? Don't worry, the developers read every issue and if it's open it means it's tracked and taken into account. It might just take time as other issues have higher priority. And remember that this is an open source project: Everyone is encouraged to take an active role in fixing open issues.
+
+### Closed issues
+
+#### "My issue was closed without giving a reason!"
+Please understand that writing detailed explanations every time for every issue someone comes up with takes time. Sometimes a reason has been posted earlier to another related issue which you can search for. It's also possible that your issue was not in line with the guidelines of the project (see especially the [Development Ideology](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md#development-ideology)), or it was decided that the issue is not something that Signal should do at this time.
+
+
+## Pull requests
+
+### Sign the Contributor Licence Agreement (CLA)
+You need to sign our CLA before your pull request can be merged. You can sign it at: https://whispersystems.org/cla/
+
+### Follow the Code Style Guidelines
+Before submitting a pull request please check that your code adheres to the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).
+
+### Submit only complete PRs and test them
+Please do not submit pull requests that are still a work in progress. Pull requests should be ready for a merge when you submit them. Also please do not submit pull requests that you have not tested.
+
+### Smaller is better
+Please do not try to change too much at once. Big changes are less likely to be merged. If you are a first time contributor start with small and simple PRs to get to know the codebase.
+
+### Merging can sometimes take a while
+If your pull request follows all the advice above but still has not been merged it usually means the developers haven't simply had the time to review it yet. We understand that this might feel frustrating. We are sorry!
+
+### Bithub
+Accepted pull requests will be rewarded with Bitcoins! After your pull request has been merged you will automatically receive an email to the address you have specified as your Git commit email. Follow the instructions in the email to claim your coins. If you wish to submit your contribution for free please add the word `FREEBIE` in your Git commit message. You may wish to explore some previously merged commits to see how it all works.
+
+
+## How can I contribute?
+Anyone can help by
+- advising new people about the guidelines of this project
+ - redirecting support questions to support@whispersystems.org and the [support site](https://support.whispersystems.org)
+ - redirecting non-bug related discussions to the [community forum](https://whispersystems.discoursehosting.net)
+- improving documentation in the [wiki](https://github.com/WhisperSystems/Signal-Android/wiki)
+- [translating](https://www.transifex.com/projects/p/signal-android/)
+- finding and marking duplicate issues
+- trying to reproduce issues
+- finding solutions to open issues and posting relevant findings as comments
+- submitting pull requests
+- testing other people's pull requests
+- spreading the joy of Signal to your friends and family
+- donating money to our [BitHub](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b) or through the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/)
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

Dockerfile

@@ -0,0 +1,26 @@
+FROM ubuntu:14.04.3
+
+RUN dpkg --add-architecture i386 && \
+    apt-get update -y && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository -y ppa:openjdk-r/ppa && \
+    apt-get update -y && \
+    apt-get install -y libc6:i386=2.19-0ubuntu6.7 libncurses5:i386=5.9+20140118-1ubuntu1 libstdc++6:i386=4.8.4-2ubuntu1~14.04.1 lib32z1=1:1.2.8.dfsg-1ubuntu1 wget openjdk-8-jdk=8u72-b15-1~trusty1 git unzip && \
+    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-25
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.0
+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}

README.md

@@ -1,53 +1,47 @@
-# 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&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&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-play-badge.png" height=36px /></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/WhisperSystems/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 in two steps:
+You can subscribe to Signal Android Beta releases here:
+https://play.google.com/apps/testing/org.thoughtcrime.securesms
  
-1. Join the [TextSecure Beta Google+ Community](https://plus.google.com/communities/114424213916773497091).
-1. After you've joined the community, [subscribe to the beta](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/WhisperSystems/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/WhisperSystems/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://whispersystems.discoursehosting.net) 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:
+This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal. 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!
-
-whispersystems@lists.riseup.net
-
-https://lists.riseup.net/www/info/whispersystems
+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://whispersystems.discoursehosting.net).
 
 ## Contributing Funds
-[![Donate](https://www.coinbase.com/assets/buttons/donation_large-36ee936185fdf9a88e3a28cc685fb9b7.png)](https://coinbase.com/checkouts/d29fd4c37ca442393e32fdcb95304701)
+[![Donate](https://cloud.githubusercontent.com/assets/3121306/11278543/d46e03d0-8eeb-11e5-9691-0da1bf643192.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
 
 You can add funds to BitHub to directly help further development efforts.
 
@@ -56,12 +50,12 @@ Help
 ## Support
 For troubleshooting and questions, please visit our support center!
 
-http://support.whispersystems.org/
+https://support.whispersystems.org/
 
 ## Documentation
 Looking for documentation? Check out the wiki!
 
-https://github.com/WhisperSystems/TextSecure/wiki
+https://github.com/WhisperSystems/Signal-Android/wiki
 
 # Legal things
 ## Cryptography Notice
@@ -77,6 +71,6 @@ 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

androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java

@@ -1,63 +0,0 @@
-package org.thoughtcrime.securesms.database;
-
-import android.net.Uri;
-
-import org.thoughtcrime.securesms.TextSecureTestCase;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import ws.com.google.android.mms.pdu.PduPart;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class PartDatabaseTest extends TextSecureTestCase {
-  private static final long PART_ID = 1L;
-
-  private PartDatabase database;
-
-  @Override
-  public void setUp() {
-    database = spy(DatabaseFactory.getPartDatabase(getInstrumentation().getTargetContext()));
-  }
-
-  public void testTaskNotRunWhenThumbnailExists() throws Exception {
-    when(database.getPart(eq(PART_ID))).thenReturn(getPduPartSkeleton("x/x"));
-    doReturn(mock(InputStream.class)).when(database).getDataStream(any(MasterSecret.class), anyLong(), eq("thumbnail"));
-
-    database.getThumbnailStream(null, PART_ID);
-
-    verify(database, never()).updatePartThumbnail(any(MasterSecret.class), anyLong(), any(PduPart.class), any(InputStream.class), anyFloat());
-  }
-
-  public void testTaskRunWhenThumbnailMissing() throws Exception {
-    when(database.getPart(eq(PART_ID))).thenReturn(getPduPartSkeleton("image/png"));
-    doReturn(null).when(database).getDataStream(any(MasterSecret.class), anyLong(), eq("thumbnail"));
-    doNothing().when(database).updatePartThumbnail(any(MasterSecret.class), anyLong(), any(PduPart.class), any(InputStream.class), anyFloat());
-
-    try {
-      database.new ThumbnailFetchCallable(mock(MasterSecret.class), PART_ID).call();
-      throw new AssertionError("didn't try to generate thumbnail");
-    } catch (FileNotFoundException fnfe) {
-      // success
-    }
-  }
-
-  private PduPart getPduPartSkeleton(String contentType) {
-    PduPart part = new PduPart();
-    part.setContentType(contentType.getBytes());
-    part.setDataUri(Uri.EMPTY);
-    return part;
-  }
-}

androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java

@@ -1,154 +0,0 @@
-package org.thoughtcrime.securesms.jobs;
-
-import android.test.AndroidTestCase;
-
-import org.thoughtcrime.securesms.TextSecureTestCase;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
-import org.whispersystems.libaxolotl.ecc.Curve;
-import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
-import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
-import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
-import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import dagger.Module;
-import dagger.ObjectGraph;
-import dagger.Provides;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-public class CleanPreKeysJobTest extends TextSecureTestCase {
-
-  public void testSignedPreKeyRotationNotRegistered() throws IOException, MasterSecretJob.RequirementNotMetException {
-    TextSecureAccountManager accountManager    = mock(TextSecureAccountManager.class);
-    SignedPreKeyStore        signedPreKeyStore = mock(SignedPreKeyStore.class);
-    MasterSecret             masterSecret      = mock(MasterSecret.class);
-    when(accountManager.getSignedPreKey()).thenReturn(null);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    cleanPreKeysJob.onRun(masterSecret);
-
-    verify(accountManager).getSignedPreKey();
-    verifyNoMoreInteractions(signedPreKeyStore);
-  }
-
-  public void testSignedPreKeyEviction() throws Exception {
-    SignedPreKeyStore        signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    TextSecureAccountManager accountManager            = mock(TextSecureAccountManager.class);
-    SignedPreKeyEntity       currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-    MasterSecret             masterSecret              = mock(MasterSecret.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(new SignedPreKeyRecord(2, 11, Curve.generateKeyPair(), new byte[32]));
-      add(new SignedPreKeyRecord(4, System.currentTimeMillis() - 100, Curve.generateKeyPair(), new byte[64]));
-      add(currentRecord);
-      add(new SignedPreKeyRecord(3, System.currentTimeMillis() - 90, Curve.generateKeyPair(), new byte[64]));
-      add(new SignedPreKeyRecord(1, 10, Curve.generateKeyPair(), new byte[32]));
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    cleanPreKeysJob.onRun(masterSecret);
-
-    verify(signedPreKeyStore).removeSignedPreKey(eq(1));
-    verify(signedPreKeyStore, times(1)).removeSignedPreKey(anyInt());
-  }
-
-  public void testSignedPreKeyNoEviction() throws Exception {
-    SignedPreKeyStore        signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    TextSecureAccountManager accountManager            = mock(TextSecureAccountManager.class);
-    SignedPreKeyEntity       currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(currentRecord);
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    verify(signedPreKeyStore, never()).removeSignedPreKey(anyInt());
-  }
-
-  public void testConnectionError() throws Exception {
-    SignedPreKeyStore        signedPreKeyStore = mock(SignedPreKeyStore.class);
-    TextSecureAccountManager accountManager    = mock(TextSecureAccountManager.class);
-    MasterSecret             masterSecret      = mock(MasterSecret.class);
-
-    when(accountManager.getSignedPreKey()).thenThrow(new PushNetworkException("Connectivity error!"));
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    try {
-      cleanPreKeysJob.onRun(masterSecret);
-      throw new AssertionError("should have failed!");
-    } catch (IOException e) {
-      assertTrue(cleanPreKeysJob.onShouldRetry(e));
-    }
-  }
-
-  @Module(injects = {CleanPreKeysJob.class})
-  public static class TestModule {
-    private final TextSecureAccountManager accountManager;
-    private final SignedPreKeyStore        signedPreKeyStore;
-
-    private TestModule(TextSecureAccountManager accountManager, SignedPreKeyStore signedPreKeyStore) {
-      this.accountManager    = accountManager;
-      this.signedPreKeyStore = signedPreKeyStore;
-    }
-
-    @Provides TextSecureAccountManager provideTextSecureAccountManager() {
-      return accountManager;
-    }
-
-    @Provides
-    AxolotlStorageModule.SignedPreKeyStoreFactory provideSignedPreKeyStore() {
-      return new AxolotlStorageModule.SignedPreKeyStoreFactory() {
-        @Override
-        public SignedPreKeyStore create(MasterSecret masterSecret) {
-          return signedPreKeyStore;
-        }
-      };
-    }
-  }
-
-}

androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java

@@ -1,155 +0,0 @@
-/**
- * Copyright (C) 2015 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.thoughtcrime.securesms.service;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.provider.Telephony;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import org.mockito.ArgumentCaptor;
-import org.thoughtcrime.securesms.TextSecureTestCase;
-
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class SmsListenerTest extends TextSecureTestCase {
-
-  private static final String CHALLENGE_SMS_3_3         = "Your TextSecure verification code: 337-337";
-  private static final String CHALLENGE_SMS_3_4         = "Your TextSecure verification code: 337-1337";
-  private static final String CHALLENGE_SMS_4_3         = "Your TextSecure verification code: 1337-337";
-  private static final String CHALLENGE_SMS_4_4         = "Your TextSecure verification code: 1337-1337";
-  private static final String CHALLENGE_SMS_4_4_PREPEND = "XXXYour TextSecure verification code: 1337-1337";
-  private static final String CHALLENGE_SMS_4_4_APPEND  = "Your TextSecure verification code: 1337-1337XXX";
-  private static final String[] CHALLENGE_SMS = {
-      CHALLENGE_SMS_3_3, CHALLENGE_SMS_3_4,         CHALLENGE_SMS_4_3,
-      CHALLENGE_SMS_4_4, CHALLENGE_SMS_4_4_PREPEND, CHALLENGE_SMS_4_4_APPEND
-  };
-
-  private static final String CHALLENGE_3_3 = "337337";
-  private static final String CHALLENGE_3_4 = "3371337";
-  private static final String CHALLENGE_4_3 = "1337337";
-  private static final String CHALLENGE_4_4 = "13371337";
-  private static final String[] CHALLENGES = {
-      CHALLENGE_3_3, CHALLENGE_3_4, CHALLENGE_4_3,
-      CHALLENGE_4_4, CHALLENGE_4_4, CHALLENGE_4_4,
-  };
-
-  /*
-  credit :D
-  http://stackoverflow.com/a/12338541
-   */
-  @SuppressWarnings("unchecked")
-  private static byte[] buildSmsPdu(String sender, String body) throws Exception{
-    byte[]   scBytes     = PhoneNumberUtils.networkPortionToCalledPartyBCD("0000000000");
-    byte[]   senderBytes = PhoneNumberUtils.networkPortionToCalledPartyBCD(sender);
-    int      lsmcs       = scBytes.length;
-    byte[]   dateBytes   = new byte[7];
-    Calendar calendar    = new GregorianCalendar();
-
-    dateBytes[0] = reverseByte((byte) (calendar.get(Calendar.YEAR)));
-    dateBytes[1] = reverseByte((byte) (calendar.get(Calendar.MONTH) + 1));
-    dateBytes[2] = reverseByte((byte) (calendar.get(Calendar.DAY_OF_MONTH)));
-    dateBytes[3] = reverseByte((byte) (calendar.get(Calendar.HOUR_OF_DAY)));
-    dateBytes[4] = reverseByte((byte) (calendar.get(Calendar.MINUTE)));
-    dateBytes[5] = reverseByte((byte) (calendar.get(Calendar.SECOND)));
-    dateBytes[6] = reverseByte((byte) ((calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET)) / (60 * 1000 * 15)));
-
-    ByteArrayOutputStream bo = new ByteArrayOutputStream();
-    bo.write(lsmcs);
-    bo.write(scBytes);
-    bo.write(0x04);
-    bo.write((byte) sender.length());
-    bo.write(senderBytes);
-    bo.write(0x00);
-    bo.write(0x00);
-    bo.write(dateBytes);
-
-    String sReflectedClassName   = "com.android.internal.telephony.GsmAlphabet";
-    Class  cReflectedNFCExtras   = Class.forName(sReflectedClassName);
-    Method stringToGsm7BitPacked = cReflectedNFCExtras.getMethod("stringToGsm7BitPacked", new Class[] { String.class });
-
-    stringToGsm7BitPacked.setAccessible(true);
-    byte[] bodybytes = (byte[]) stringToGsm7BitPacked.invoke(null, body);
-    bo.write(bodybytes);
-
-    return bo.toByteArray();
-  }
-
-  private static byte reverseByte(byte b) {
-    return (byte) ((b & 0xF0) >> 4 | (b & 0x0F) << 4);
-  }
-
-  @SuppressLint("NewApi")
-  private Intent buildSmsReceivedIntent(String smsBody) throws Exception {
-    final Intent smsIntent = mock(Intent.class);
-    final Bundle smsExtras = new Bundle();
-    final byte[] smsPdu    = buildSmsPdu("15555555555", smsBody);
-
-    smsExtras.putSerializable("pdus", new Object[]{smsPdu});
-
-    when(smsIntent.getAction()).thenReturn(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
-    when(smsIntent.getExtras()).thenReturn(smsExtras);
-
-    return smsIntent;
-  }
-
-  public void testReceiveChallenges() throws Exception {
-    final SmsListener smsListener = new SmsListener();
-
-    for (int i = 0; i < CHALLENGES.length; i++) {
-      final String CHALLENGE     = CHALLENGES[i];
-      final String CHALLENGE_SMS = SmsListenerTest.CHALLENGE_SMS[i];
-
-      final Context                mockContext     = mock(Context.class);
-      final SharedPreferences      mockPreferences = mock(SharedPreferences.class);
-      final ArgumentCaptor<Intent> intentCaptor    = ArgumentCaptor.forClass(Intent.class);
-
-      when(mockContext.getPackageName()).thenReturn(getContext().getPackageName());
-      when(mockContext.getSharedPreferences(anyString(), anyInt())).thenReturn(mockPreferences);
-      when(mockPreferences.getBoolean(contains("pref_verifying"), anyBoolean())).thenReturn(true);
-
-      try {
-        smsListener.onReceive(mockContext, buildSmsReceivedIntent(CHALLENGE_SMS));
-      } catch (IllegalStateException e) {
-        Log.d(getClass().getName(), "some api levels are picky with abortBroadcast()");
-      }
-
-      verify(mockContext, times(1)).sendBroadcast(intentCaptor.capture());
-
-      final Intent sendIntent = intentCaptor.getValue();
-      assertTrue(sendIntent.getAction().equals(RegistrationService.CHALLENGE_EVENT));
-      assertTrue(sendIntent.getStringExtra(RegistrationService.CHALLENGE_EXTRA).equals(CHALLENGE));
-    }
-  }
-}

androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java

@@ -1,35 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.test.AndroidTestCase;
-
-import junit.framework.AssertionFailedError;
-
-import org.thoughtcrime.securesms.TextSecureTestCase;
-import org.whispersystems.textsecure.api.util.InvalidNumberException;
-import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class PhoneNumberFormatterTest extends TextSecureTestCase {
-  private static final String LOCAL_NUMBER = "+15555555555";
-
-  public void testFormatNumberE164() throws Exception, InvalidNumberException {
-    assertThat(PhoneNumberFormatter.formatNumber("(555) 555-5555", LOCAL_NUMBER)).isEqualTo(LOCAL_NUMBER);
-    assertThat(PhoneNumberFormatter.formatNumber("555-5555", LOCAL_NUMBER)).isEqualTo(LOCAL_NUMBER);
-    assertThat(PhoneNumberFormatter.formatNumber("(123) 555-5555", LOCAL_NUMBER)).isNotEqualTo(LOCAL_NUMBER);
-  }
-
-  public void testFormatNumberEmail() throws Exception {
-    try {
-      PhoneNumberFormatter.formatNumber("person@domain.com", LOCAL_NUMBER);
-      throw new AssertionFailedError("should have thrown on email");
-    } catch (InvalidNumberException ine) {
-      // success
-    }
-  }
-
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-  }
-}

apkdiff/apkdiff.py

@@ -0,0 +1,78 @@
+#! /usr/bin/env python
+
+import sys
+from zipfile import ZipFile
+
+class ApkDiff:
+
+    IGNORE_FILES = ["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"]
+
+    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      = filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist())
+        destinationInfoList = 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 != "" or destinationChunk != "":
+            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])