Bump version to 3.31.1

// FREEBIE

.github/ISSUE_TEMPLATE.md

@@ -4,7 +4,7 @@ You can also preview your report before submitting it. You may remove sections t
 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:
-http://support.whispersystems.org/
+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 -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 ### 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 Licence Agreement](https://whispersystems.org/cla/)
+- [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->

.gitignore

@@ -23,3 +23,4 @@ ffpr
 test/androidTestEspresso/res/values/arrays.xml
 obj/
 jni/libspeex/.deps/
+*.sh

.tx/config

@@ -1,6 +1,6 @@
 [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
 
 
 [signal-android.master]

AndroidManifest.xml

@@ -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"
-      android:versionCode="225"
-      android:versionName="3.26.2">
+          package="org.thoughtcrime.securesms">
 
-    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview"/>
+    <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"/>
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
@@ -84,6 +82,7 @@
     <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" />
@@ -95,7 +94,8 @@
                  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"
@@ -117,6 +117,14 @@
               android:launchMode="singleTask">
     </activity>
 
+    <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>
+
+
     <activity android:name=".CountrySelectionActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -167,6 +175,10 @@
             <data android:mimeType="video/*" />
         </intent-filter>
 
+        <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value=".service.DirectShareService" />
+
     </activity>
 
     <activity android:name=".ConversationListActivity"
@@ -344,7 +356,7 @@
         </intent-filter>
     </activity>
 
-    <activity android:name="org.thoughtcrime.redphone.RedPhoneShare"
+    <activity android:name="org.thoughtcrime.redphone.VoiceCallShare"
               android:excludeFromRecents="true"
               android:theme="@style/NoAnimation.Theme.BlackScreen"
               android:launchMode="singleTask"
@@ -378,6 +390,7 @@
     <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
 
     <service android:enabled="true" android:name="org.thoughtcrime.redphone.RedPhoneService"/>
+    <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"/>
@@ -412,6 +425,13 @@
         <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>
             <action android:name="com.google.android.c2dm.intent.RECEIVE" />
@@ -512,6 +532,12 @@
         </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"/>

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # 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 have been used to. Reading this document will save you, other contributors and the developers time.
+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
@@ -36,17 +36,17 @@ Please do **not** ask support questions at the issue tracker. We want to help yo
 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 just generate unnecessary email notifications. Moreover bumping an issue does not help solving it. Please be respectful to everyone's time and try to only comment when you have relevant new information to add.
+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 priorities. And remember that this is an open source project: Anyone is encouraged to take an active role in fixing open issues.
+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 just simply decided that the issue is not something that Signal should do at this time.
+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
@@ -55,7 +55,7 @@ Please understand that writing detailed explanations every time for every issue
 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).
+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.
@@ -71,11 +71,11 @@ Accepted pull requests will be rewarded with Bitcoins! After your pull request h
 
 
 ## How can I contribute?
-Any one can help by
+Anyone can help by
 - advising new people about the guidelines of this project
- - redirecting support questions to support@whispersystems.org and the [support site](http://support.whispersystems.org)
+ - 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 at the [wiki](https://github.com/WhisperSystems/Signal-Android/wiki)
+- 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

README.md

@@ -50,7 +50,7 @@ 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!

build.gradle

@@ -1,3 +1,5 @@
+import java.security.MessageDigest
+
 buildscript {
     repositories {
         maven {
@@ -25,10 +27,10 @@ repositories {
         url "https://raw.github.com/whispersystems/maven/master/smil/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/"
+        url "https://raw.github.com/whispersystems/maven/master/photoview/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/photoview/releases/"
+        url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/"
     }
     maven { // textdrawable
         url 'https://dl.bintray.com/amulyakhare/maven'
@@ -57,9 +59,10 @@ dependencies {
 
     compile 'org.whispersystems:jobmanager:1.0.2'
     compile 'org.whispersystems:libpastelog:1.0.7'
-    compile 'org.whispersystems:signal-service-android:2.4.4'
+    compile 'org.whispersystems:signal-service-android:2.5.3'
+    compile 'org.whispersystems:webrtc-android:M57'
 
-    compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
+    compile "me.leolin:ShortcutBadger:1.10-WS1"
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.jpardogo.materialtabstrip:library:1.0.9'
     compile 'org.w3c:smil:1.0.0'
@@ -68,7 +71,7 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.makeramen:roundedimageview:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.5'
-    compile 'de.greenrobot:eventbus:2.4.0'
+    compile 'org.greenrobot:eventbus:3.0.0'
     compile 'pl.tajchert:waitingdots:0.1.0'
     compile 'com.soundcloud.android:android-crop:0.9.10@aar'
     compile 'com.melnykov:floatingactionbutton:1.3.0'
@@ -88,6 +91,9 @@ dependencies {
     compile ('cn.carbswang.android:NumberPickerView:1.0.9') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
+    compile ('com.tomergoldst.android:tooltips:1.0.6') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1'
@@ -123,8 +129,9 @@ dependencyVerification {
         'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b',
         'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
         'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
-        'org.whispersystems:signal-service-android:27f3f686d9d9f855360307b4b641e666246e7b617020e271df66cb4bdcc26f2a',
-        'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
+        'org.whispersystems:signal-service-android:28a5368cb1336106ba7732aeaf0c5a33ef8fb22500c41f38ad8147375f59073b',
+        'org.whispersystems:webrtc-android:acf78f6148c2e946b846cc5395887079ba37ddb892bf0d993fed18f1b9f521f8',
+        'me.leolin:ShortcutBadger:e8e39df8a59d8211a30f40b1eeab21b3fa57b3f3e0f03abb995f82d66588778c',
         'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
         'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
         'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
@@ -133,7 +140,7 @@ dependencyVerification {
         'com.github.bumptech.glide:glide:76ef123957b5fbaebb05fcbe6606dd58c3bc3fcdadb257f99811d0ac9ea9b88b',
         'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
         'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
-        'de.greenrobot:eventbus:61d743a748156a372024d083de763b9e91ac2dcb3f6a1cbc74995c7ddab6e968',
+        'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c',
         'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
         'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
         'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
@@ -146,6 +153,7 @@ dependencyVerification {
         'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
         'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe',
         'cn.carbswang.android:NumberPickerView:18b3c316d62c7c277978a8d4ed57a5b8f4e943762264960f579a8a549c756729',
+        'com.tomergoldst.android:tooltips:4c56697dd1ad64b8066535c61f961a6d901e7ae5d97ae27084ba40ad620349b6',
         'com.android.support:support-annotations:fb941680f43afbd70ce01ec3cc837a5037f0a774701b12a9fd3090bd4727cf15',
         'com.android.support:support-v4:ed4cda7c752f51d33f9bbdfff3422b425b323d356cd1bdc9786aa413c912e594',
         'com.android.support:support-vector-drawable:2697503d3e8e709023ae176ba5db7f98ca0aa0b4e6290aedcb3c371904806bf7',
@@ -157,27 +165,28 @@ dependencyVerification {
         'com.google.android.gms:play-services-basement:95dd882c5ffba15b9a99de3fefb05d3a01946623af67454ca00055d222f85a8d',
         'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
         'org.whispersystems:signal-protocol-android:1b4b9d557c8eaf861797ff683990d482d4aa8e9f23d9b17ff0cc67a02f38cb19',
-        'org.whispersystems:signal-service-java:df0e83633ff4078cd276838c8942b953f670c61a5f2615ae2a89c75c19fc1bec',
+        'org.whispersystems:signal-service-java:969b4e1fb0b87e553d8b231a090002a03748e0444fa23afa1bc6f7065e8039ff',
         'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
         'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
         'com.google.android.gms:play-services-tasks:69ec265168e601d0203d04cd42e34bb019b2f029aa1e16fabd38a5153eea2086',
         'org.whispersystems:curve25519-android:bf6c34223d45d2f2813a8efcab9923caf99115115c760c9acea680bcb42d23c0',
         'org.whispersystems:signal-protocol-java:a835cd0609cf116a74651bd0aa748db9392bba48c2d2af787757b8a1b50d131c',
-        'com.googlecode.libphonenumber:libphonenumber:7214dc6dfc6243e34fb1a3e02ad15331bfff6ab902d679e3ba337695265c21ca',
         'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
-        'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af',
+        'com.googlecode.libphonenumber:libphonenumber:141ebcafba7070a13d879c44e7648ddbe10beab665cb64d7b0c1bea93afb8dc2',
         'com.fasterxml.jackson.core:jackson-databind:835097bcdd11f5bc8a08378c70d4c8054dfa4b911691cc2752063c75534d198d',
+        'com.squareup.okhttp3:okhttp:a992938d7203ca557cd7a116f002e8c427ec9cdae7ea852441abb8aec891f948',
         'org.whispersystems:curve25519-java:00f1d4919f759055f41f7853a3d475dc7c8decf0dbf045ae93414f8f23b066cc',
-        'com.squareup.okio:okio:5e1098bd3fdee4c3347f5ab815b40ba851e4ab1b348c5e49a5b0362f0ce6e978',
         'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
         'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
+        'com.squareup.okio:okio:8c5436cadfab36bbd97db5f5c43b7bfdb5bf2f5f894ec8709b1929f14bdd010c',
         'com.android.support:support-media-compat:8d6a1a5ba3d9eb1a25cb8f21bb312ac6280202e3d2900cb0b447d065d0d8a125',
         'com.android.support:support-core-utils:a7649e18c04143dde40c218c5ce9a030e7ae674089cd7b18c6cf8ed2a22cf01a',
         'com.android.support:support-fragment:1294500b357f52cf3779e2521c79f54ae7844f3b9a5f6727495dbbda7f231377',
     ]
 }
 
+
 android {
     compileSdkVersion 25
     buildToolsVersion '23.0.3'
@@ -188,11 +197,15 @@ android {
     }
 
     defaultConfig {
+        versionCode 246
+        versionName "3.31.1"
+
         minSdkVersion 9
         targetSdkVersion 22
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
+        project.ext.set("archivesBaseName", "Signal");
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
@@ -239,8 +252,10 @@ android {
                           'proguard-glide.pro',
                           'proguard-shortcutbadger.pro',
                           'proguard-retrofit.pro',
+                          'proguard-webrtc.pro',
+                          'proguard.cfg'
+            testProguardFiles 'proguard-automation.pro',
                           'proguard.cfg'
-            testProguardFiles 'proguard-automation.pro'
         }
         release {
             minifyEnabled true
@@ -249,6 +264,28 @@ android {
         }
     }
 
+    productFlavors {
+        play {
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+        }
+
+        website {
+            ext.websiteUpdateUrl = "https://updates.signal.org/android"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+        }
+    }
+
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            output.outputFile = new File(
+                    output.outputFile.parent,
+                    output.outputFile.name.replace(".apk", "-${variant.versionName}.apk"))
+        }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -266,6 +303,8 @@ android {
         test {
             java.srcDirs = ['test/unitTest/java']
         }
+
+        website.manifest.srcFile 'website/AndroidManifest.xml'
     }
 
      lintOptions {
@@ -273,10 +312,48 @@ android {
     }
 }
 
+task assembleWebsiteDescriptor << {
+    android.applicationVariants.all { variant ->
+        if (variant.name.equals("websiteDebug") ||
+            variant.name.equals("websiteRelease"))
+        {
+            File file = new File(variant.outputs[0].outputFile.path)
+
+            if (file.exists()) {
+                MessageDigest md = MessageDigest.getInstance("SHA-256");
+                file.eachByte 4096, {bytes, size ->
+                    md.update(bytes, 0, size);
+                }
+
+                String digest = md.digest().collect {String.format "%02x", it}.join();
+                String url = variant.productFlavors.get(0).ext.websiteUpdateUrl
+                String apkName = variant.outputs[0].outputFile.name
+
+                String descriptor = "{" +
+                        "\"versionCode\" : $project.android.defaultConfig.versionCode," +
+                        "\"versionName\" : \"$project.android.defaultConfig.versionName\"," +
+                        "\"sha256sum\" : \"$digest\"," +
+                        "\"url\" : \"$url/$apkName\"" +
+                        "}"
+
+                File descriptorFile = new File(variant.outputs[0].outputFile.parent, apkName.replace(".apk", ".json"))
+
+                descriptorFile.write(descriptor)
+            }
+        }
+    }
+}
+
 tasks.whenTaskAdded { task ->
     if (task.name.equals("lint")) {
         task.enabled = false
     }
+
+    if (task.name.equals("assembleWebsiteDebug") ||
+        task.name.equals("assembleWebsiteRelease"))
+    {
+         task.finalizedBy assembleWebsiteDescriptor
+    }
 }
 
 def getLastCommitTimestamp() {

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Sun Aug 28 20:14:40 PDT 2016
+#Thu Mar 09 11:46:40 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

proguard-automation.pro

@@ -9,3 +9,5 @@
 -dontwarn org.hamcrest.**
 -dontwarn org.mockito.**
 -dontwarn com.squareup.**
+
+-dontobfuscate

proguard-webrtc.pro

@@ -0,0 +1,3 @@
+-dontwarn org.webrtc.NetworkMonitorAutoDetect
+-dontwarn android.net.Network
+-keep class org.webrtc.** { *; }

protobuf/Makefile

@@ -0,0 +1,3 @@
+
+all:
+	protoc --java_out=../src/ WebRtcData.proto

protobuf/WebRtcData.proto

@@ -0,0 +1,31 @@
+/**
+ * Copyright (C) 2014-2016 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+package signal;
+
+option java_package         = "org.thoughtcrime.securesms.webrtc";
+option java_outer_classname = "WebRtcDataProtos";
+
+message Connected {
+  optional uint64 id = 1;
+}
+
+message Hangup {
+  optional uint64 id = 1;
+}
+
+message VideoStreamingStatus {
+  optional uint64 id      = 1;
+  optional bool   enabled = 2;
+}
+
+message Data {
+
+  optional Connected            connected            = 1;
+  optional Hangup               hangup               = 2;
+  optional VideoStreamingStatus videoStreamingStatus = 3;
+
+}

res/anim/slide_from_top.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
+    <alpha android:duration="1"
+           android:fromAlpha="0"
+           android:toAlpha="1"/>
+
     <translate
             android:duration="250"
             android:fromYDelta="-100%"

res/drawable/circle_alpha.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval" >
+    <solid android:color="#22000000" />
+</shape>

res/drawable/conversation_item_header_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="#bb999999" />
+    <corners android:radius="3dp" />
+</shape>

res/drawable/conversation_item_header_background_dark.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="#bb444444" />
+    <corners android:radius="3dp" />
+</shape>

res/drawable/last_seen_divider_text_background_dark.xml

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

res/drawable/last_seen_divider_text_background_light.xml

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

res/drawable/webrtc_bluetooth_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/webrtc_control_background"/>
+    <item android:top="5dp"
+          android:left="5dp"
+          android:right="5dp"
+          android:bottom="5dp"
+          android:drawable="@drawable/ic_bluetooth_white_24dp"/>
+</layer-list>

res/drawable/webrtc_control_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/circle_alpha" android:state_checked="true"/>
+    <item android:drawable="@android:color/transparent" />
+</selector>

res/drawable/webrtc_mute_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/webrtc_control_background"/>
+    <item android:top="5dp"
+          android:left="5dp"
+          android:right="5dp"
+          android:bottom="5dp"
+          android:drawable="@drawable/ic_mic_off_white_24dp"/>
+</layer-list>

res/drawable/webrtc_speaker_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/webrtc_control_background"/>
+    <item android:top="5dp"
+          android:left="5dp"
+          android:right="5dp"
+          android:bottom="5dp"
+          android:drawable="@drawable/ic_volume_up_white_24dp"/>
+</layer-list>

res/drawable/webrtc_video_mute_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/webrtc_control_background"/>
+    <item android:top="5dp"
+          android:left="5dp"
+          android:right="5dp"
+          android:bottom="5dp"
+          android:drawable="@drawable/ic_videocam_white_24dp"/>
+</layer-list>

res/layout/conversation_activity.xml

@@ -23,59 +23,24 @@
                   android:clipToPadding="false"
                   android:clipChildren="false">
 
-        <org.thoughtcrime.securesms.components.reminder.ReminderView
-            android:id="@+id/reminder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+        <ViewStub
+                android:id="@+id/reminder_stub"
+                android:layout="@layout/conversation_activity_reminderview_stub"
+                android:inflatedId="@+id/reminder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
         <FrameLayout android:id="@+id/fragment_content"
                      android:layout_width="match_parent"
                      android:layout_height="0dp"
                      android:layout_weight="1" />
 
-        <FrameLayout android:id="@+id/attachment_editor"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:gravity="center_horizontal"
-                     android:background="?android:windowBackground"
-                     android:visibility="gone">
-
-            <org.thoughtcrime.securesms.components.RemovableEditableMediaView
-                    android:id="@+id/removable_media_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center">
-
-                <org.thoughtcrime.securesms.components.location.SignalMapView
-                        android:id="@+id/attachment_location"
-                        android:layout_width="210dp"
-                        android:layout_height="210dp"
-                        android:layout_gravity="center_horizontal"
-                        android:visibility="gone"/>
-
-                <org.thoughtcrime.securesms.components.ThumbnailView
-                        android:id="@+id/attachment_thumbnail"
-                        android:layout_width="230dp"
-                        android:layout_height="150dp"
-                        android:layout_gravity="center_horizontal"
-                        android:visibility="gone"
-                        android:contentDescription="@string/conversation_activity__attachment_thumbnail"
-                        app:backgroundColorHint="?conversation_background" />
-
-                <org.thoughtcrime.securesms.components.AudioView
-                        android:id="@+id/attachment_audio"
-                        android:layout_width="210dp"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        android:paddingTop="15dp"
-                        android:paddingBottom="15dp"
-                        app:widgetBackground="@color/white"
-                        app:foregroundTintColor="@color/grey_500"
-                        app:backgroundTintColor="@color/white"/>
-
-            </org.thoughtcrime.securesms.components.RemovableEditableMediaView>
-
-        </FrameLayout>
+        <ViewStub
+                android:id="@+id/attachment_editor_stub"
+                android:inflatedId="@+id/attachment_editor"
+                android:layout="@layout/conversation_activity_attachment_editor_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
         <include layout="@layout/conversation_input_panel"/>
 
@@ -102,11 +67,12 @@
                   android:text="160/160 (1)" />
 
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
-                android:id="@+id/emoji_drawer"
+        <ViewStub
+                android:id="@+id/emoji_drawer_stub"
+                android:layout="@layout/conversation_activity_emojidrawer_stub"
+                android:inflatedId="@+id/emoji_drawer"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
+                android:layout_height="wrap_content"/>
 
     </LinearLayout>
 </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>

res/layout/conversation_activity_attachment_editor_stub.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:id="@+id/attachment_editor"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:gravity="center_horizontal"
+             android:background="?android:windowBackground"
+             android:visibility="gone">
+
+    <org.thoughtcrime.securesms.components.RemovableEditableMediaView
+            android:id="@+id/removable_media_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+
+        <org.thoughtcrime.securesms.components.location.SignalMapView
+                android:id="@+id/attachment_location"
+                android:layout_width="210dp"
+                android:layout_height="210dp"
+                android:layout_gravity="center_horizontal"
+                android:visibility="gone"/>
+
+        <org.thoughtcrime.securesms.components.ThumbnailView
+                android:id="@+id/attachment_thumbnail"
+                android:layout_width="230dp"
+                android:layout_height="150dp"
+                android:layout_gravity="center_horizontal"
+                android:visibility="gone"
+                android:contentDescription="@string/conversation_activity__attachment_thumbnail"
+                app:backgroundColorHint="?conversation_background" />
+
+        <org.thoughtcrime.securesms.components.AudioView
+                android:id="@+id/attachment_audio"
+                android:layout_width="210dp"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:paddingTop="15dp"
+                android:paddingBottom="15dp"
+                app:widgetBackground="?conversation_item_bubble_background"
+                app:foregroundTintColor="@color/grey_500"
+                app:backgroundTintColor="?conversation_item_bubble_background"/>
+
+    </org.thoughtcrime.securesms.components.RemovableEditableMediaView>
+
+</FrameLayout>
+

res/layout/conversation_activity_emojidrawer_stub.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/emoji_drawer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />

res/layout/conversation_activity_reminderview_stub.xml

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

res/layout/conversation_fragment.xml

@@ -2,7 +2,9 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="fill_parent"
-             android:layout_height="match_parent">
+             android:layout_height="match_parent"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.v7.widget.RecyclerView
             android:id="@android:id/list"
@@ -11,14 +13,45 @@
             android:scrollbars="vertical"
             android:cacheColorHint="?conversation_background" />
 
+    <TextView android:id="@+id/scroll_date_header"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:gravity="center"
+              android:layout_gravity="center_horizontal|top"
+              android:paddingLeft="6dp"
+              android:paddingRight="6dp"
+              android:paddingTop="3dp"
+              android:paddingBottom="3dp"
+              android:layout_marginTop="3dp"
+              android:textColor="@color/white"
+              android:background="?conversation_item_header_background"
+              android:textSize="14sp"
+              android:visibility="gone"
+              tools:text="March 1, 2015" />
 
-    <!--suppress AndroidLintUnusedAttribute-->
     <View android:id="@+id/compose_divider"
           android:layout_width="match_parent"
           android:layout_height="2dp"
           android:layout_gravity="bottom"
           android:background="@drawable/compose_divider_background"
-          android:alpha="0"
+          android:alpha="1"
           android:visibility="invisible" />
 
+    <ImageButton
+            android:id="@+id/scroll_to_bottom_button"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="20dp"
+            android:padding="5dp"
+            android:layout_gravity="bottom|end"
+            android:background="@drawable/circle_tintable"
+            android:tint="@color/grey_600"
+            android:elevation="1dp"
+            android:alpha="0.9"
+            android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
+            android:src="@drawable/ic_scroll_down"/>
+
 </FrameLayout>

res/layout/conversation_input_panel.xml

@@ -110,6 +110,7 @@
                       android:layout_height="wrap_content"
                       android:ellipsize="none"
                       android:layout_marginLeft="20dp"
+                      android:layout_marginStart="20dp"
                       android:text="00:00"
                       android:textColor="#61737b"
                       android:textSize="20dp"
@@ -126,6 +127,7 @@
                           android:layout_height="match_parent"
                           android:gravity="center"
                           android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                          android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
                           android:text="@string/conversation_input_panel__slide_to_cancel"
                           android:textAllCaps="true"
                           android:textColor="#61737b"
@@ -133,6 +135,7 @@
                           android:ellipsize="none"
                           android:singleLine="true"
                           android:paddingLeft="20dp"
+                          android:paddingStart="20dp"
                           android:visibility="gone"
                           tools:visibility="visible"/>
 

res/layout/conversation_item_header.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:paddingTop="3dp"
+             android:paddingBottom="3dp">
+
+    <TextView android:id="@+id/text"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center"
+              android:paddingLeft="6dp"
+              android:paddingRight="6dp"
+              android:paddingTop="3dp"
+              android:paddingBottom="3dp"
+              android:textColor="@color/white"
+              android:background="?conversation_item_header_background"
+              android:textSize="14sp"
+              tools:text="March 1, 2015" />
+</FrameLayout>

res/layout/conversation_item_last_seen.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:paddingTop="5dp"
+             android:paddingBottom="5dp"
+             android:layout_marginBottom="5dp"
+             android:background="?conversation_item_last_seen_background">
+
+        <TextView android:id="@+id/text"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center"
+                  android:textSize="12sp"
+                  android:textAllCaps="true"
+                  android:textStyle="bold"
+                  android:background="?conversation_item_last_seen_text_background"
+                  tools:text="3 unread messages" />
+</FrameLayout>

res/layout/conversation_item_received.xml

@@ -49,25 +49,17 @@
                       android:orientation="vertical"
                       tools:backgroundTint="@color/blue_900">
 
-            <org.thoughtcrime.securesms.components.ThumbnailView
-                    android:id="@+id/image_view"
+            <ViewStub
+                    android:id="@+id/image_view_stub"
+                    android:layout="@layout/conversation_item_received_thumbnail"
                     android:layout_width="@dimen/media_bubble_height"
-                    android:layout_height="@dimen/media_bubble_height"
-                    android:scaleType="centerCrop"
-                    android:adjustViewBounds="true"
-                    android:contentDescription="@string/conversation_item__mms_image_description"
-                    android:visibility="gone"
-                    tools:src="@drawable/ic_video_light"
-                    tools:visibility="gone" />
+                    android:layout_height="@dimen/media_bubble_height"/>
 
-            <org.thoughtcrime.securesms.components.AudioView
-                    android:id="@+id/audio_view"
+            <ViewStub
+                    android:id="@+id/audio_view_stub"
+                    android:layout="@layout/conversation_item_received_audio"
                     android:layout_width="210dp"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    app:foregroundTintColor="@color/white"
-                    app:backgroundTintColor="@color/blue_500"
-                    tools:visibility="visible"/>
+                    android:layout_height="wrap_content"/>
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
@@ -82,29 +74,6 @@
                     android:autoLink="all"
                     android:linksClickable="true" />
 
-            <LinearLayout android:id="@+id/mms_download_controls"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:orientation="horizontal">
-
-                <Button android:id="@+id/mms_download_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/conversation_item_received__download"
-                        android:visibility="gone" />
-
-                <TextView android:id="@+id/mms_label_downloading"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="5dp"
-                          android:layout_marginRight="5dp"
-                          android:gravity="center"
-                          android:text="@string/conversation_item_received__downloading"
-                          android:visibility="gone" />
-
-            </LinearLayout>
-
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:paddingTop="2dip"

res/layout/conversation_item_received_audio.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.AudioView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/audio_view"
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:foregroundTintColor="@color/white"
+        app:backgroundTintColor="@color/blue_500"
+        tools:visibility="visible"/>

res/layout/conversation_item_received_thumbnail.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.ThumbnailView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/image_view"
+        android:layout_width="@dimen/media_bubble_height"
+        android:layout_height="@dimen/media_bubble_height"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/conversation_item__mms_image_description"
+        android:visibility="gone"
+        tools:src="@drawable/ic_video_light"
+        tools:visibility="gone" />

res/layout/conversation_item_sent.xml

@@ -38,26 +38,17 @@
                       android:background="@drawable/sent_bubble"
                       android:orientation="vertical">
 
-            <org.thoughtcrime.securesms.components.ThumbnailView
-                    android:id="@+id/image_view"
+            <ViewStub
+                    android:id="@+id/image_view_stub"
                     android:layout_width="@dimen/media_bubble_height"
                     android:layout_height="@dimen/media_bubble_height"
-                    android:layout_marginBottom="5dp"
-                    android:layout_gravity="center"
-                    android:scaleType="centerCrop"
-                    android:adjustViewBounds="true"
-                    android:contentDescription="@string/conversation_item__mms_image_description"
-                    android:visibility="gone"
-                    tools:src="@drawable/ic_video_light"
-                    tools:visibility="visible" />
+                    android:layout="@layout/conversation_item_sent_thumbnail"/>
 
-            <org.thoughtcrime.securesms.components.AudioView
-                    android:id="@+id/audio_view"
+            <ViewStub
+                    android:id="@+id/audio_view_stub"
+                    android:layout="@layout/conversation_item_sent_audio"
                     android:layout_width="210dp"
-                    android:layout_height="wrap_content"
-                    app:foregroundTintColor="@color/grey_500"
-                    app:backgroundTintColor="@color/white"
-                    android:visibility="gone"/>
+                    android:layout_height="wrap_content"/>
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
@@ -73,29 +64,6 @@
                     android:textSize="@dimen/conversation_item_body_text_size"
                     tools:text="Mango pickle lorem ipsum" />
 
-            <LinearLayout android:id="@+id/mms_download_controls"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:orientation="horizontal">
-
-                <Button android:id="@+id/mms_download_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/conversation_item_sent__download"
-                        android:visibility="gone" />
-
-                <TextView android:id="@+id/mms_label_downloading"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="5dp"
-                          android:layout_marginRight="5dp"
-                          android:gravity="center"
-                          android:text="@string/conversation_item_sent__downloading"
-                          android:visibility="gone" />
-
-            </LinearLayout>
-
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:orientation="horizontal"

res/layout/conversation_item_sent_audio.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.AudioView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/audio_view"
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        app:foregroundTintColor="@color/grey_500"
+        app:backgroundTintColor="@color/white"
+        android:visibility="gone"/>

res/layout/conversation_item_sent_thumbnail.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.ThumbnailView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/image_view"
+        android:layout_width="@dimen/media_bubble_height"
+        android:layout_height="@dimen/media_bubble_height"
+        android:layout_marginBottom="5dp"
+        android:layout_gravity="center"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/conversation_item__mms_image_description"
+        android:visibility="gone"
+        tools:src="@drawable/ic_video_light"
+        tools:visibility="visible" />

res/layout/media_overview_activity.xml

@@ -21,6 +21,6 @@
               android:gravity="center_horizontal"
               android:paddingTop="30dp"
               android:visibility="gone"
-              android:text="@string/media_overview_activity__no_images" />
+              android:text="@string/media_overview_activity__no_media" />
 
 </RelativeLayout>

res/layout/media_overview_item.xml

@@ -8,6 +8,6 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:contentDescription="@string/media_preview_activity__image_content_description" />
+            android:contentDescription="@string/media_preview_activity__media_content_description" />
 
 </org.thoughtcrime.securesms.components.SquareFrameLayout>

res/layout/media_preview_activity.xml

@@ -9,7 +9,7 @@
                android:id="@+id/image"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-               android:contentDescription="@string/media_preview_activity__image_content_description" />
+               android:contentDescription="@string/media_preview_activity__media_content_description" />
 
     <org.thoughtcrime.securesms.video.VideoPlayer
             android:id="@+id/video_player"

res/layout/webrtc_call_activity.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen android:id="@+id/callScreen"
+                                                                   android:layout_width="fill_parent"
+                                                                   android:layout_height="fill_parent" />
+
+
+</FrameLayout>

res/layout/webrtc_call_controls.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/inCallControls"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              tools:background="@color/textsecure_primary">
+
+        <ToggleButton android:id="@+id/speakerButton"
+                      style="@style/WebRtcCallCompoundButton"
+                      android:background="@drawable/webrtc_speaker_button"
+                      tools:checked="true"
+                      android:layout_marginRight="15dp"/>
+
+        <ToggleButton android:id="@+id/bluetoothButton"
+                      style="@style/WebRtcCallCompoundButton"
+                      android:background="@drawable/webrtc_bluetooth_button"
+                      tools:checked="true"
+                      android:layout_marginRight="15dp"
+                      android:visibility="gone"/>
+
+        <ToggleButton android:id="@+id/muteButton"
+                      style="@style/WebRtcCallCompoundButton"
+                      android:background="@drawable/webrtc_mute_button"
+                      android:contentDescription="@string/redphone_call_controls__mute"
+                      android:layout_marginRight="15dp"
+                      tools:checked="false"
+                />
+
+        <ToggleButton android:id="@+id/video_mute_button"
+                      style="@style/WebRtcCallCompoundButton"
+                      android:background="@drawable/webrtc_video_mute_button"/>
+
+</merge>

res/layout/webrtc_call_screen.xml

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:id="@+id/incall_screen"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <org.thoughtcrime.securesms.components.webrtc.PercentFrameLayout
+            android:id="@+id/remote_render_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:visibility="invisible"/>
+
+    <!-- "Call info" block #1, for the foreground call. -->
+    <RelativeLayout android:id="@+id/call_info_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:animateLayoutChanges="true">
+
+        <!-- Contact photo for call_info_1 -->
+        <FrameLayout android:id="@+id/image_container"
+                     android:layout_below="@+id/call_banner_1"
+                     android:gravity="top|center_horizontal"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent">
+
+            <ImageView android:id="@+id/photo"
+                       android:layout_width="match_parent"
+                       android:layout_height="match_parent"
+                       android:background="@android:color/black"
+                       android:scaleType="centerCrop"
+                       android:visibility="visible"
+                       android:clickable="true"
+                       tools:src="@drawable/ic_contact_picture_large"
+                    />
+
+            <LinearLayout android:id="@+id/untrusted_layout"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:background="@color/grey_400"
+                          android:orientation="vertical"
+                          android:visibility="gone"
+                          android:gravity="center"
+                          android:clickable="true">
+
+                <TextView android:id="@+id/untrusted_explanation"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_gravity="center"
+                          android:textSize="16sp"
+                          android:maxWidth="270dp"
+                          android:lineSpacingExtra="2sp"
+                          tools:text="The safety numbers for your conversation with Masha have changed. This could either mean that someone is trying to intercept your communication, or that Masha simply re-installed Signal. You may wish to verify safety numbers for this contact."/>
+
+                <LinearLayout
+                        android:layout_marginTop="20dp"
+                        android:maxWidth="250dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                    <Button android:id="@+id/accept_safety_numbers"
+                            android:text="Accept"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="10dp"/>
+
+                    <Button android:id="@+id/cancel_safety_numbers"
+                            android:text="Cancel"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+        </FrameLayout>
+
+        <!-- "Call Banner" for call #1, the foregound or ringing call.
+             The "call banner" is a block of info about a single call,
+             including the contact name, phone number, call time counter,
+             and other status info.  This info is shown as a "banner"
+             overlaid across the top of contact photo. -->
+        <LinearLayout android:id="@+id/call_banner_1"
+                        android:layout_alignParentTop="true"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="80dp"
+                        android:orientation="vertical">
+
+            <RelativeLayout android:id="@+id/expanded_info"
+                            android:background="@color/textsecure_primary"
+                            android:paddingLeft="24dp"
+                            android:paddingRight="24dp"
+                            android:paddingTop="16dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clickable="true">
+
+
+                <!-- Name (or the phone number, if we don't have a name to display). -->
+                <TextView android:id="@+id/name"
+                          android:layout_alignParentTop="true"
+                          android:layout_alignParentLeft="true"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:paddingRight="50sp"
+                          android:textSize="40sp"
+                          android:textColor="#FFFFFF"
+                          android:singleLine="true"
+                          android:maxLines="1"
+                          android:ellipsize="end"
+                          tools:text="Ali Connors"
+                        />
+
+                <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
+                <LinearLayout android:id="@+id/labelAndNumber"
+                              android:layout_below="@id/name"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:paddingRight="50sp"
+                              android:orientation="horizontal"
+                        >
+                    <TextView android:id="@+id/label"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textColor="#FFFFFF"
+                              android:singleLine="true"
+                              android:textAppearance="?android:attr/textAppearanceSmall"
+                              android:text="@string/redphone_call_card__signal_call"
+                              android:layout_marginRight="10dp"
+                            />
+                    <TextView android:id="@+id/phoneNumber"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textAppearance="?android:attr/textAppearanceSmall"
+                              android:textColor="#FFFFFF"
+                              android:singleLine="true"
+                              tools:text="+14152222222"
+                            />
+
+                </LinearLayout>
+
+                <!-- Elapsed time indication for a call in progress. -->
+                <TextView android:id="@+id/elapsedTime"
+                          android:layout_alignParentRight="true"
+                          android:layout_centerVertical="true"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:textAppearance="?android:attr/textAppearanceMedium"
+                          android:textColor="#FFFFFF"
+                          android:singleLine="true"
+                        />
+
+            </RelativeLayout>
+
+            <org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls
+                    android:id="@+id/inCallControls"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/textsecure_primary"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="24dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="20dp"
+                    android:clickable="true"/>
+
+            <TextView android:id="@+id/callStateLabel"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:gravity="right"
+                      android:paddingTop="8dp"
+                      android:paddingBottom="8dp"
+                      android:paddingRight="24dp"
+                      android:textAppearance="?android:attr/textAppearanceSmall"
+                      android:textColor="#FFFFFF"
+                      android:textAllCaps="true"
+                      android:background="#8033b5e5"
+                      tools:text="connected"
+                    />
+
+        </LinearLayout>  <!-- End of call_banner for call_info #1. -->
+
+        <!-- The "call state label": In some states, this shows a special
+             indication like "Dialing" or "Incoming call" or "Call ended".
+             It's unused for the normal case of an active ongoing call. -->
+        <!-- This is visually part of the call banner, but it's not actually
+             part of the "call_banner_1" RelativeLayout since it needs a
+             different background color. -->
+
+    </RelativeLayout>
+
+    <org.thoughtcrime.securesms.components.webrtc.PercentFrameLayout
+            android:id="@+id/local_render_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:visibility="invisible"/>
+
+    <android.support.design.widget.FloatingActionButton
+            android:id="@+id/hangup_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="40dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/ic_call_end_white_48dp"
+            android:focusable="true"
+            app:backgroundTint="@color/red_500"
+            android:visibility="visible"
+            android:contentDescription="End call"
+            tools:visibility="visible"/>
+
+    <org.thoughtcrime.securesms.components.webrtc.WebRtcIncomingCallOverlay
+            android:id="@+id/callControls"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+
+</android.support.design.widget.CoordinatorLayout>

res/layout/webrtc_incoming_call_overlay.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <org.thoughtcrime.redphone.util.multiwaveview.MultiWaveView
+            android:id="@+id/incomingCallWidget"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="-46dp"
+            android:background="@android:color/black"
+            android:visibility="gone"
+            />
+
+    <TextView android:id="@+id/redphone_banner"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignTop="@id/incomingCallWidget"
+              android:gravity="center"
+              android:paddingTop="8dp"
+              android:paddingBottom="8dp"
+              android:textAppearance="?android:attr/textAppearanceLarge"
+              android:textColor="#FFFFFF"
+              android:textAllCaps="true"
+              android:background="@color/textsecure_primary"
+              android:text="@string/redphone_call_controls__signal_call"/>
+
+</RelativeLayout>