Bump version to 4.20.5

Also just fixed some minor formatting issues.

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,21 @@
-<!-- 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.
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
 You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
 
-Before we begin, please note that this tracker is only for issues, not questions or comments.
+Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
 
-If you are looking for support, please see our support center instead:
-https://support.whispersystems.org/
-or email support@whispersystems.org
+If you would like to discuss a new feature or submit suggestions, please visit the community forum:
+https://community.signalusers.org
 
-Let's begin with a checklist: replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
+If you are looking for support, please visit our support center:
+https://support.signal.org/
+or email support@signal.org
 
-I have:
-- [ ] searched open and closed issues for duplicates
-- [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
+Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
+
+- [ ] I have searched open and closed issues for duplicates
+- [ ] I am submitting a bug report for existing functionality that does not work as intended
+- [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
+- [ ] This isn't a feature request or a discussion topic
 
 ----------------------------------------
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,12 @@
 <!-- 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 read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project
 - [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
-- [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines)
+- [ ] I am following the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines)
 - [ ] I have tested my contribution on these devices:
  * Device A, Android X.Y.Z
  * Device B, Android Z.Y

.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,lt_LT:lt,km_KH:km-rKH
+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,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th
 
 
 [signal-android.master]

AndroidManifest.xml

@@ -19,6 +19,7 @@
     <uses-feature android:name="android.hardware.portrait" android:required="false"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
@@ -155,6 +156,7 @@
               android:theme="@style/TextSecure.LightNoActionBar"
               android:excludeFromRecents="true"
               android:launchMode="singleTask"
+              android:taskAffinity=""
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
@@ -262,10 +264,8 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
-              android:label="@string/AndroidManifest__enter_passphrase"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightIntroTheme"
-              android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
@@ -403,9 +403,21 @@
         </intent-filter>
     </activity>
 
+    <activity android:name=".contactshare.ContactShareEditActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.ContactNameEditActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.SharedContactDetailsActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
-    <service android:enabled="true" android:name=".service.KeyCachingService"/>
+    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
 
     <service android:name=".service.QuickResponseService"
@@ -443,6 +455,8 @@
         </intent-filter>
     </service>
 
+    <service android:name=".service.GenericForegroundService"/>
+
     <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
         <intent-filter>
             <action android:name="com.google.android.c2dm.intent.RECEIVE" />
@@ -552,6 +566,12 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".service.LocalBackupListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
     <receiver android:name=".service.PersistentConnectionBootListener">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>

BUILDING.md

@@ -15,19 +15,21 @@ The following steps should help you (re)build Signal from the command line.
 
 1. Checkout the Signal-Android project source with the command:
 
-        git clone https://github.com/WhisperSystems/Signal-Android.git
+        git clone https://github.com/signalapp/Signal-Android.git
 
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
 3. Ensure that the following packages are installed from the Android SDK manager:
     * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (API level 22)
+    * SDK Platform (All API levels)
     * Android Support Repository
     * Google Repository
 4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
 
         sdk.dir=/Application/android-sdk-macosx
 
-5. Execute Gradle:
+5. Using Java 8 
+
+6. Execute Gradle:
 
         ./gradlew build
 
@@ -53,7 +55,7 @@ Setting up a development environment
 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).
+6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
 7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 9. Default config options should be good enough.
 9. Project initialisation and build should proceed.

CONTRIBUTING.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 are used to. Reading this document will save you, other contributors and the developers time.
+Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors.
 
 
 ## Development Ideology
@@ -9,76 +9,81 @@ 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. **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.
+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.
+Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/projects/p/signal-android/).
 
 
 ## 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.
+1. Please search both open and closed issues to make sure your bug report is not a duplicate.
+1. Read the [guide to submitting useful bug reports](https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
 
-### 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.
+### The issue tracker is for bugs, not feature requests
+The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the Android client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly.
 
-##### Send support questions to support
-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](https://support.signal.org/). You can also search for existing troubleshooting articles at the [Support Center](https://support.signal.org/).
+### Send support questions to support
+You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker.
 
-##### 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.
+### GitHub is not a generic discussion forum
+Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category.
 
 ### Don't bump issues
-Every time someone comments on an issue, GitHub sends 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.
+Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-Android/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add.
 
 ### Open issues
 
-#### If it's open it's tracked
-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.
+#### If it's open, it's tracked
+The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues.
 
 ### Closed issues
 
 #### "My issue was closed without giving a reason!"
-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.
+Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues.
 
 
 ## Pull requests
 
-### 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://signal.org/cla/
+### Smaller is better
+Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop).
+
+Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code.
+
+### Sign the Contributor License Agreement (CLA)
+You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged.
 
 ### Follow the Code Style Guidelines
-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).
+Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.
 
-### Submit 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.
+### Submit finished and well-tested pull requests
+Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.
 
 ### Merging can sometimes take a while
-If your pull request follows all 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!
+If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/).
+
 
 ## How can I contribute?
-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.signal.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 through the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/)
+There are several other ways to get involved:
+* Help new users learn about Signal.
+  * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/).
+  * Redirect non-bug discussions to the [community forum](https://community.signalusers.org).
+* Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki).
+* Join the community of volunteer translators on Transifex:
+  * [Android](https://www.transifex.com/projects/p/signal-android/)
+  * [iOS](https://www.transifex.com/open-whisper-systems/signal-ios/)
+  * [Desktop](https://www.transifex.com/projects/p/signal-desktop/)
+* Find and mark duplicate issues.
+* Try to reproduce issues and help with troubleshooting.
+* Discover solutions to open issues and post any relevant findings.
+* Test other people's pull requests.
+* Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/).
+* Share Signal with your friends and family.
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+Signal is made for you. Thank you for your feedback and support.

README.md

@@ -11,7 +11,7 @@ Currently available on the Play store.
 ## 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/Signal-Android/issues
+https://github.com/signalapp/Signal-Android/issues
 
 ## Joining the Beta
 Want to live life on the bleeding edge and help out with testing?
@@ -27,9 +27,9 @@ Interested in helping to translate Signal? Contribute here:
 https://www.transifex.com/projects/p/signal-android/
 
 ## Contributing Code
-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).
+Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/signalapp/Signal-Android/blob/master/BUILDING.md).
 
-If you're new to the 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.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
 
 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation.
 
@@ -46,7 +46,7 @@ https://support.signal.org/
 ## Documentation
 Looking for documentation? Check out the wiki!
 
-https://github.com/WhisperSystems/Signal-Android/wiki
+https://github.com/signalapp/Signal-Android/wiki
 
 # Legal things
 ## Cryptography Notice

build.gradle

@@ -25,19 +25,25 @@ repositories {
         url "https://repo1.maven.org/maven2/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/preferencefragment/releases/"
+        url "https://raw.github.com/signalapp/maven/master/preferencefragment/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/smil/releases/"
+        url "https://raw.github.com/signalapp/maven/master/smil/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/photoview/releases/"
+        url "https://raw.github.com/signalapp/maven/master/photoview/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/"
+        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/circular-progress-button/releases/"
+        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
     }
     maven {
         url "https://maven.google.com"
@@ -54,15 +60,17 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:27.0.1'
-    compile 'com.android.support:recyclerview-v7:27.0.1'
-    compile 'com.android.support:design:27.0.1'
-    compile 'com.android.support:support-v13:27.0.1'
-    compile 'com.android.support:cardview-v7:27.0.1'
-    compile 'com.android.support:preference-v7:27.0.1'
-    compile 'com.android.support:preference-v14:27.0.1'
-    compile 'com.android.support:gridlayout-v7:27.0.1'
+    compile 'com.android.support:appcompat-v7:27.0.2'
+    compile 'com.android.support:recyclerview-v7:27.0.2'
+    compile 'com.android.support:design:27.0.2'
+    compile 'com.android.support:support-v13:27.0.2'
+    compile 'com.android.support:cardview-v7:27.0.2'
+    compile 'com.android.support:preference-v7:27.0.2'
+    compile 'com.android.support:preference-v14:27.0.2'
+    compile 'com.android.support:gridlayout-v7:27.0.2'
     compile 'com.android.support:multidex:1.0.2'
+    compile "com.android.support:exifinterface:27.0.2"
+    compile "android.arch.lifecycle:extensions:1.1.1"
 
     compile 'com.google.android.gms:play-services-gcm:9.6.1'
     compile 'com.google.android.gms:play-services-maps:9.6.1'
@@ -71,17 +79,19 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 
     compile 'org.whispersystems:jobmanager:1.0.2'
-    compile 'org.whispersystems:libpastelog:1.0.7'
-    compile 'org.whispersystems:signal-service-android:2.6.12'
-    compile 'org.whispersystems:webrtc-android:M63'
+    compile('org.whispersystems:libpastelog:1.1.2') {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    compile 'org.whispersystems:signal-service-android:2.7.6'
+    compile 'org.whispersystems:webrtc-android:M64'
 
     compile "me.leolin:ShortcutBadger:1.1.16"
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.jpardogo.materialtabstrip:library:1.0.9'
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
     compile 'com.github.chrisbanes:PhotoView:2.1.3'
-    compile 'com.github.bumptech.glide:glide:4.3.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.0'
+    compile 'com.github.bumptech.glide:glide:4.5.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
     compile 'com.makeramen:roundedimageview:2.1.0'
     compile 'com.pnikosis:materialish-progress:1.5'
     compile 'org.greenrobot:eventbus:3.0.0'
@@ -91,9 +101,7 @@ dependencies {
     compile 'com.google.zxing:android-integration:3.1.0'
     compile 'com.squareup.dagger:dagger:1.2.2'
     annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
-    compile ("com.doomonafireball.betterpickers:library:1.5.3") {
-        exclude group: 'com.android.support', module: 'support-v4'
-    }
+    compile 'mobi.upod:time-duration-picker:1.1.3'
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     compile 'com.google.zxing:core:3.2.1'
@@ -117,6 +125,11 @@ dependencies {
     }
     compile 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
     compile 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
+    compile 'org.signal:android-database-sqlcipher:3.5.9-S1'
+    compile ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
+        exclude group: 'com.fasterxml.jackson.core'
+        exclude group: 'org.freemarker'
+    }
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1'
@@ -141,39 +154,41 @@ dependencies {
 
 dependencyVerification {
     verify = [
-        'com.android.support:design:0e7c694bd5385e82d193e33b7289f769ce6ff05e277443daf5bffc3d852ef448',
-        'com.android.support:preference-v14:beed3ee97ae0d2541bd0adac6c84bb7d7b7580399f24e8efb9bc624161b164df',
-        'com.android.support:preference-v7:d87ba6ae7c834fd68ef09cbc0f064975627ba14189dbef639c34080691366da9',
+        'com.android.support:design:fa5c27a705310e95a8f4099c98777132ed901a0d69178942306bb34cd76f0d57',
+        'com.android.support:preference-v14:1fcf40bd560dc21ce55b6a292d1326d28f52dc5e4f2a64eef2f38dd95777b645',
+        'com.android.support:preference-v7:d9f32ddc92f8d6a0bd86a18f4fcaff805fa021245e395b6e7dd382907443ee53',
         'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
         'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
+        'mobi.upod:time-duration-picker:db469ce0f48dd96b892eac424ed76870e54bf00fe0a28cdcddfbe5f2a226a0e1',
         'com.codewaves.stickyheadergrid:stickyheadergrid:5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794',
-        'com.android.support:appcompat-v7:1402c29a49db30346c21a7d40634461765b3ab826f5dd95bc4dcc76787b21851',
+        'com.android.support:appcompat-v7:b2825e8b47f665d3362d8481c8d147d1af9230d16f23a2b94f6ccbc53c68cec1',
         'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
-        'com.android.support:recyclerview-v7:99ae2863287df800f239617d09cafc58b95f7a5365db32e3761394fa01ab12c9',
-        'com.android.support:support-v13:29f7e04a276f8a6fda273d342239ec8719371aa3713b4c49da0425416ab651b9',
-        'com.android.support:cardview-v7:43fccd44086c51eaa9d78be2fcf0dfea1556c8876a6fd325ea8d24e860054202',
-        'com.android.support:gridlayout-v7:ae0ff7084ef33097c022668a09c4e7380d3ac1f6963b552fc98c7d9700a3f013',
+        'com.android.support:recyclerview-v7:3eb953930f10941f2b0447ec123a9b03d2746a42a99c523e82c3ece3308ca70b',
+        'com.android.support:support-v13:6f2848811ceef2e32cc98da02a045d65f7e7447a6bd7198b9ec10aa14d7ad55c',
+        'com.android.support:cardview-v7:57f867a3c8f33e2d4dc0a03e2dfa03cad6267a908179f04a725a68ea9f0b8ccf',
+        'com.android.support:gridlayout-v7:227b5fdffa20f53bd562503aab6d2293d52cf64b5a6ab1116d2150f87bff9e88',
         'com.android.support:multidex:7cd48755c7cfdb6dd2d21cbb02236ec390f6ac91cde87eb62f475b259ab5301d',
+        'com.android.support:exifinterface:0e7cd526c4468895cd8549def46b3d33c8bcfb1ae4830569898d8c7326b15bb2',
+        'android.arch.lifecycle:extensions:429426b2feec2245ffc5e75b3b5309bedb36159cf06dc71843ae43526ac289b6',
         'com.google.android.gms:play-services-gcm:312e61253a236f2d9b750b9c04fc92fd190d23b0b2755c99de6ce4a28b259dae',
         'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b',
         'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e',
         'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718',
         'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
-        'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
-        'org.whispersystems:signal-service-android:6d29df68961b7fabb119b50afec3c599b66d2cb85cc6e92b40eb27861bb7e4b9',
-        'org.whispersystems:webrtc-android:3f5c39b710797fbda9fe6015cb6a8667ab2fc14ef2c1eb9be832a53b368aa110',
+        'org.whispersystems:libpastelog:fe56b4db9ec743c8b565e3e4caa9228fafe132dc0bf82000d6e359b97a81177c',
+        'org.whispersystems:signal-service-android:823eed29e64fb0aa30d2078cb5ec0245e2a0713a4028121329c5c28788ef27f8',
+        'org.whispersystems:webrtc-android:ed297e8b795dad9658cf306c2aa0f7d296c65f0997a2ac4353fd0157910acc12',
         'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774',
         'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
         'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
         'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
         'com.github.chrisbanes:PhotoView:ed06775308da260e1fd86d1d3288988fcd3d80db24ce0d7c9fcfedc39e622292',
-        'com.github.bumptech.glide:glide:cf770a66bdb42d90663672a3e44b8e4f4fb060073294af5ebd323c5db415b22f',
+        'com.github.bumptech.glide:glide:997de7ac95be6c944d3b8cbe13de11307736ea45451c1b09a6cec7c328ead59f',
         'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
         'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c',
         'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
         'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
         'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
-        'com.doomonafireball.betterpickers:library:132ecd685c95a99e7377c4e27bfadbb2d7ed0bea995944060cd62d4369fdaf3d',
         'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
         'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
         'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe',
@@ -183,39 +198,46 @@ dependencyVerification {
         'com.annimon:stream:5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9',
         'com.takisoft.fix:colorpicker:f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1',
         'com.github.dmytrodanylyk.circular-progress-button:library:8dc6a29a5a8db7b2ad5a9a7fda1dc9ae0893f4c8f0545732b2c63854ea693e8e',
+        'org.signal:android-database-sqlcipher:4302551df258883cc5dc5d62ddb141a6b5b8f113d77d70322dc2648c0856ccef',
+        'com.googlecode.ez-vcard:ez-vcard:7e24ad50b222d2f70ac91bdccfa3c0f6200b078d797cb784837f75e77bb4210f',
         'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
         'com.google.android.gms:play-services-base:0ca636a8fc9a5af45e607cdcd61783bf5d561cbbb0f862021ce69606eee5ad49',
         'com.google.android.gms:play-services-tasks:69ec265168e601d0203d04cd42e34bb019b2f029aa1e16fabd38a5153eea2086',
         'com.google.android.gms:play-services-basement:95dd882c5ffba15b9a99de3fefb05d3a01946623af67454ca00055d222f85a8d',
-        'com.android.support:support-v4:afd802f1926475f40c5b6b42855c9a626a854298908dafdb455deb6dab2640f2',
-        'com.android.support:support-fragment:05a859783ae4a285c6d5c9865e1242b86f5bfb69a30455ca6c8495f24c09d9ed',
-        'com.android.support:animated-vector-drawable:365050110411c86c7eec86101b49ab53557ffe6667f60b19055f1d35c38a577b',
-        'com.android.support:support-core-ui:91614f829f8a6f1fc2d28efc58ea2735212225ab02cdf768b3dd9af72371d5f0',
-        'com.android.support:transition:8a46d152391bd1598d1778ae889b3aeaff77a17d0caaa29446df6e26a28c4e4b',
-        'com.android.support:support-media-compat:bc1c0252c1d071a1676fd280a792cf0717833fb3afd0ef73070ddc51ef921ad7',
-        'com.android.support:support-core-utils:b33c5a5d67b8bfa6c8829875661779279157bf23e6042179820eaf1745034a72',
-        'com.android.support:support-vector-drawable:67154ea191f735496502214bc6da6195738829a8e9d59e8042a1e030a2c7f19c',
-        'com.android.support:support-compat:70dfd92561421e5ae113dfc4045fc94c90caca9912839b3d08c793aa391aedcc',
-        'com.github.bumptech.glide:gifdecoder:fe793861d4d4619b5041d3bd68186000b6151581292053e88c96a5d0b60e5337',
-        'com.android.support:support-annotations:240912b779fe7413bdd97c94ac2a92d1fb29bd53c4d50c6982e5942b01278ac0',
+        'com.android.support:support-v4:1b2b37169fcccfef5e563d273749e3792decdce9818bc17932403a2363f537b4',
+        'com.android.support:support-fragment:e4358388022a2205777575a7251fe357334658e4123d5d6e3b082f5899d9b011',
+        'com.android.support:animated-vector-drawable:5b117a2c13a898c2a3c84c480d64edcfac2ef720aa9b742c29249fac774ffc48',
+        'com.android.support:support-core-ui:2284072511a95d504c074de80c82cd33724c6d2754117833b98ba3a09994163e',
+        'com.android.support:transition:1a7db0453c1467fc8fd815e6d50ca6bb475a7a9ba6b5f3b307329688a7c62a68',
+        'com.android.support:support-core-utils:b69c6e1e7731b876b910fc7100bcadf40a57f27b32ca26b91400995542112c96',
+        'com.android.support:support-media-compat:6dd9327ee9aa467cab479aad97df375072b2b6ba61eadffdaa5a88de3843c457',
+        'com.android.support:support-vector-drawable:bf4f4fcbf58b1380616581224e6487c230bfdb3434ec353d4adaa4b1f4865cfa',
+        'com.android.support:support-compat:ed4d25d91a0b13d8b9def1c0de69ed03d7fb89d50fb37eb0e9b63b0cf7a42357',
+        'android.arch.lifecycle:livedata:50ab0490c1ff1a7cfb4e554032998b080888946d0dd424f39900efc4a1bcd750',
+        'android.arch.lifecycle:livedata-core:d6fdd8b985d6178d7ea2f16986a24e83f1bee936b74d43167c69e08d3cc12c50',
+        'android.arch.core:runtime:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39',
+        'android.arch.lifecycle:runtime:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550',
+        'android.arch.core:common:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a',
+        'android.arch.lifecycle:common:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56',
+        'android.arch.lifecycle:viewmodel:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a',
+        'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15',
+        'com.android.support:support-annotations:af05330d997eb92a066534dbe0a3ea24347d26d7001221092113ae02a8f233da',
         'org.whispersystems:signal-protocol-android:5b8acded7f2a40178eb90ab8e8cbfec89d170d91b3ff5e78487d1098df6185a1',
-        'org.whispersystems:signal-service-java:80d4b0410c1effd40847e12d9e9de074c6a6395b8d43396ae2e5a4a22077de18',
-        'com.github.bumptech.glide:disklrucache:b5cf8f76b423a6c86edbe82380958adbe6a2f1d5afbd6add23a9c8ad141eb406',
-        'com.github.bumptech.glide:annotations:10a910f62ee27de5f0e44a72acb7fe31ed1e45b3ffac82fb3a8ebada150765f1',
+        'org.whispersystems:signal-service-java:6169643c65dcba8c784744006fc3afd9b6f309041b310a33a624121e3577433a',
+        'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b',
+        'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512',
         'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
         'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'com.klinkerapps:logger:177e325259a8b111ad6745ec10db5861723c99f402222b80629f576f49408541',
         'com.google.android:flexbox:a9989fd13ae2ee42765dfc515fe362edf4f326e74925d02a10369df8092a4935',
-        'android.arch.lifecycle:runtime:e4e34e5d02bd102e8d39ddbc29f9ead8a15a61e367993d02238196ac48509ad8',
+        'org.jsoup:jsoup:abeaf34795a4de70f72aed6de5966d2955ec7eb348eeb813324f23c999575473',
         'org.whispersystems:curve25519-android:82595394422b957d4a5b5f1b27b75ba25cf6dc4db4d312418ca38cd6fff279ca',
         'org.whispersystems:signal-protocol-java:5152c2b01a25147967d6bf82e540f947901bdfa79260be3eb3e96b03f787d6b5',
         'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
-        'com.googlecode.libphonenumber:libphonenumber:c0a4c5df3a5388debd6b63e768c5b3ae1f4f635eb2ec49e20b06d662e5979598',
+        'com.googlecode.libphonenumber:libphonenumber:183392c0565be16d3f6f86680b4106bbde6fe31a402ad21bf9823d938c0c8706',
         'com.fasterxml.jackson.core:jackson-databind:835097bcdd11f5bc8a08378c70d4c8054dfa4b911691cc2752063c75534d198d',
         'com.squareup.okhttp3:okhttp:7265adbd6f028aade307f58569d814835cd02bc9beffb70c25f72c9de50d61c4',
         'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
-        'android.arch.lifecycle:common:86bf301a20ad0cd0a391e22a52e6fbf90575c096ff83233fa9fd0d52b3219121',
-        'android.arch.core:common:5192934cd73df32e2c15722ed7fc488dde90baaec9ae030010dd1a80fb4e74e1',
         'org.whispersystems:curve25519-java:7dd659d8822c06c3aea1a47f18fac9e5761e29cab8100030b877db445005f03e',
         'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
         'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
@@ -224,7 +246,6 @@ dependencyVerification {
     ]
 }
 
-
 android {
     flavorDimensions "none"
     compileSdkVersion 27
@@ -236,8 +257,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 326
-        versionName "4.14.9"
+        versionCode 363
+        versionName "4.20.5"
 
         minSdkVersion 14
         targetSdkVersion 25
@@ -253,6 +274,10 @@ android {
         buildConfigField "int", "GIPHY_PROXY_PORT", "80"
         buildConfigField "String", "USER_AGENT", "\"OWA\""
         buildConfigField "boolean", "DEV_BUILD", "false"
+
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86"
+        }
     }
 
     compileOptions {
@@ -293,6 +318,7 @@ android {
                           'proguard-klinker.pro',
                           'proguard-retrolambda.pro',
                           'proguard-okhttp.pro',
+                          'proguard-ez-vcard.pro',
                           'proguard.cfg'
             testProguardFiles 'proguard-automation.pro',
                           'proguard.cfg'

proguard-ez-vcard.pro

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

proguard-sqlite.pro

@@ -1,2 +1,5 @@
 -keep class org.sqlite.** { *; }
--keep class org.sqlite.database.** { *; }
+-keep class org.sqlite.database.** { *; }
+
+-keep class net.sqlcipher.** { *; }
+-dontwarn net.sqlcipher.**

protobuf/Backups.proto

@@ -0,0 +1,59 @@
+/**
+ * Copyright (C) 2018 Open Whisper Systems
+ *
+ * Licensed according to the LICENSE file in this repository.
+ */
+
+package signal;
+
+option java_package         = "org.thoughtcrime.securesms.backup";
+option java_outer_classname = "BackupProtos";
+
+message SqlStatement {
+    message SqlParameter {
+        optional string stringParamter   = 1;
+        optional uint64 integerParameter = 2;
+        optional double doubleParameter  = 3;
+        optional bytes  blobParameter    = 4;
+        optional bool   nullparameter    = 5;
+    }
+
+    optional string       statement  = 1;
+    repeated SqlParameter parameters = 2;
+}
+
+message SharedPreference {
+    optional string file  = 1;
+    optional string key   = 2;
+    optional string value = 3;
+}
+
+message Attachment {
+    optional uint64 rowId        = 1;
+    optional uint64 attachmentId = 2;
+    optional uint32 length       = 3;
+}
+
+message Avatar {
+    optional string name   = 1;
+    optional uint32 length = 2;
+}
+
+message DatabaseVersion {
+    optional uint32 version = 1;
+}
+
+message Header {
+    optional bytes iv   = 1;
+    optional bytes salt = 2;
+}
+
+message BackupFrame {
+    optional Header           header     = 1;
+    optional SqlStatement     statement  = 2;
+    optional SharedPreference preference = 3;
+    optional Attachment       attachment = 4;
+    optional DatabaseVersion  version    = 5;
+    optional bool             end        = 6;
+    optional Avatar           avatar     = 7;
+}

protobuf/Makefile

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

res/drawable/baseline_email_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>

res/drawable/conversation_item_background_animated.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="1000">
+    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+    <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
+</selector>

res/drawable/dismiss_background.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="#99ffffff" />
+</shape>

res/drawable/permission_rationale_dialog_corners.xml

@@ -1,5 +1,5 @@
 <?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"/>
+    <solid android:color="?attr/dialog_background_color"/>
     <corners android:radius="20dp"/>
 </shape>

res/drawable/quote_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray5"/>
+    <stroke android:color="@color/grey_400_transparent" android:width="@dimen/quote_outline_width"/>
+    <corners android:radius="@dimen/quote_corner_radius" />
+</shape>

res/drawable/quote_bar.xml

@@ -0,0 +1,9 @@
+<?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"/>
+    <stroke android:color="@color/transparent"/>
+    <corners android:topLeftRadius="5dp" android:bottomLeftRadius="5dp"/>
+
+</shape>

res/drawable/rounded_rectangle_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="@color/gray70"/>
+    <stroke android:width="1dp" android:color="@color/gray70"/>
+    <corners android:radius="10dp"/>
+    <padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp"/>
+</shape>

res/drawable/rounded_rectangle_white.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"/>
+    <stroke android:width="1dp" android:color="@color/white"/>
+    <corners android:radius="10dp"/>
+    <padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp"/>
+</shape>

res/drawable/shared_contact_view_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/transparent_white_dd"/>
+    <stroke android:color="@color/grey_400_transparent" android:width="@dimen/quote_outline_width"/>
+    <corners android:radius="@dimen/quote_corner_radius" />
+</shape>

res/drawable/webrtc_camera_front_button.xml

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

res/drawable/webrtc_camera_rear_button.xml

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

res/layout/activity_contact_name_edit.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:theme="@style/TextSecure.LightActionBar"
+        android:background="@color/signal_primary"
+        android:elevation="4dp"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="12dp">
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/name_edit_display_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp"
+                android:textSize="20sp"
+                tools:text="Peter Parker"/>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/name_edit_prefix"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/ContactNameEditActivity_prefix"/>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/name_edit_given_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/ContactNameEditActivity_given_name"/>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/name_edit_middle_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/ContactNameEditActivity_middle_name"/>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/name_edit_family_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/ContactNameEditActivity_family_name"/>
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/name_edit_suffix"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/ContactNameEditActivity_suffix"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>

res/layout/activity_contact_share_edit.xml

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

res/layout/activity_contact_share_select.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</FrameLayout>

res/layout/activity_shared_contact_details.xml

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

res/layout/backup_enable_dialog.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingTop="16dp"
+              android:paddingLeft="23dp"
+              android:paddingRight="23dp">
+
+    <TextView android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="12sp"
+              android:text="@string/backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup"/>
+
+    <TableLayout android:id="@+id/number_table"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="16dp"
+                 android:layout_gravity="center_horizontal"
+                 android:clickable="true"
+                 android:focusable="true">
+
+        <TableRow android:gravity="center_horizontal"
+                  android:clickable="false"
+                  android:focusable="false">
+
+            <TextView android:id="@+id/code_first"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      style="@style/BackupPassphrase"
+                      tools:text="22934"/>
+
+            <TextView android:id="@+id/code_second"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="20dp"
+                      style="@style/BackupPassphrase"
+                      tools:text="56944"
+                      android:layout_marginStart="20dp"/>
+
+            <TextView android:id="@+id/code_third"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="20dp"
+                      style="@style/BackupPassphrase"
+                      tools:text="42738"
+                      android:layout_marginStart="20dp"/>
+        </TableRow>
+
+        <TableRow android:gravity="center_horizontal">
+            <TextView android:id="@+id/code_fourth"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      style="@style/BackupPassphrase"
+                      tools:text="34431"/>
+
+            <TextView android:id="@+id/code_fifth"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="20dp"
+                      style="@style/BackupPassphrase"
+                      tools:text="24922"
+                      android:layout_marginStart="20dp"/>
+
+            <TextView android:id="@+id/code_sixth"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="20dp"
+                      style="@style/BackupPassphrase"
+                      tools:text="58594"
+                      android:layout_marginStart="20dp"/>
+        </TableRow>
+    </TableLayout>
+
+    <LinearLayout android:layout_marginTop="20dp"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+            android:gravity="center">
+
+        <CheckBox android:id="@+id/confirmation_check"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginRight="10dp"
+                  android:layout_marginEnd="10dp"/>
+
+        <TextView android:id="@+id/confirmation_text"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:textSize="12sp"
+                  android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"/>
+    </LinearLayout>
+
+</LinearLayout>

res/layout/contact_selection_activity.xml

@@ -12,6 +12,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="?attr/actionBarStyle"
             app:contentInsetStartWithNavigation="0dp"/>
 

res/layout/conversation_activity.xml

@@ -56,6 +56,13 @@
 
         <include layout="@layout/conversation_input_panel"/>
 
+        <Button android:id="@+id/register_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/conversation_activity__enable_signal_messages"
+                android:visibility="gone"/>
+
         <Button android:id="@+id/unblock_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"

res/layout/conversation_activity_attachment_editor_stub.xml

@@ -27,7 +27,11 @@
                 android:layout_gravity="center_horizontal"
                 android:visibility="gone"
                 android:contentDescription="@string/conversation_activity__attachment_thumbnail"
-                app:backgroundColorHint="?conversation_background" />
+                app:backgroundColorHint="?conversation_background"
+                app:minWidth="100dp"
+                app:maxWidth="300dp"
+                app:minHeight="100dp"
+                app:maxHeight="300dp" />
 
         <org.thoughtcrime.securesms.components.AudioView
                 android:id="@+id/attachment_audio"

res/layout/conversation_input_panel.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
-       xmlns:tools="http://schemas.android.com/tools">
-
 <org.thoughtcrime.securesms.components.InputPanel
+        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/bottom_panel"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -27,125 +26,151 @@
                       android:paddingBottom="8dp"
                       android:background="@drawable/sent_bubble"
                       android:clipChildren="false"
-                      android:clipToPadding="false">
+                      android:clipToPadding="false"
+                      android:orientation="vertical">
 
-            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                    android:id="@+id/emoji_toggle"
-                    android:layout_width="37dp"
-                    android:layout_height="37dp"
-                    android:layout_gravity="bottom"
-                    android:background="@drawable/touch_highlight_background"
-                    android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
-
-            <org.thoughtcrime.securesms.components.ComposeText
-                    style="@style/ComposeEditText"
-                    android:id="@+id/embedded_text_editor"
-                    android:layout_width="0dp"
+            <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:minHeight="37dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:nextFocusForward="@+id/send_button"
-                    android:nextFocusRight="@+id/send_button"
-                    tools:visibility="invisible"
-                    tools:hint="Send TextSecure message" >
-                <requestFocus />
-            </org.thoughtcrime.securesms.components.ComposeText>
+                    android:visibility="gone"
+                    app:message_type="preview"
+                    tools:visibility="visible"/>
 
-            <org.thoughtcrime.securesms.components.HidingLinearLayout
-                    android:id="@+id/quick_attachment_toggle"
-                    android:layout_width="wrap_content"
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false">
+
+                <LinearLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:clipChildren="false"
                     android:clipToPadding="false">
 
-                <ImageButton
-                        android:id="@+id/quick_camera_toggle"
+                    <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                        android:id="@+id/emoji_toggle"
                         android:layout_width="37dp"
                         android:layout_height="37dp"
                         android:layout_gravity="bottom"
-                        android:src="?quick_camera_icon"
                         android:background="@drawable/touch_highlight_background"
-                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
-                        android:padding="10dp"/>
+                        android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
 
-                <org.thoughtcrime.securesms.components.MicrophoneRecorderView
-                        android:id="@+id/recorder_view"
-                        android:layout_width="37dp"
-                        android:layout_height="37dp"
+                    <org.thoughtcrime.securesms.components.ComposeText
+                        style="@style/ComposeEditText"
+                        android:id="@+id/embedded_text_editor"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:minHeight="37dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:nextFocusForward="@+id/send_button"
+                        android:nextFocusRight="@+id/send_button"
+                        tools:visibility="invisible"
+                        tools:hint="Send TextSecure message" >
+                        <requestFocus />
+                    </org.thoughtcrime.securesms.components.ComposeText>
+
+                    <org.thoughtcrime.securesms.components.HidingLinearLayout
+                        android:id="@+id/quick_attachment_toggle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:clipChildren="false"
                         android:clipToPadding="false">
 
-                    <ImageButton
-                            android:id="@+id/quick_audio_toggle"
+                        <ImageButton
+                            android:id="@+id/quick_camera_toggle"
                             android:layout_width="37dp"
                             android:layout_height="37dp"
                             android:layout_gravity="bottom"
-                            android:src="?quick_mic_icon"
-                            android:background="@null"
-                            android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
+                            android:src="?quick_camera_icon"
+                            android:background="@drawable/touch_highlight_background"
+                            android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
                             android:padding="10dp"/>
 
-                    <ImageView android:id="@+id/quick_audio_fab"
-                               android:layout_width="74dp"
-                               android:layout_height="74dp"
-                               android:src="@drawable/ic_mic_white_48dp"
-                               android:background="@drawable/circle_tintable"
-                               android:backgroundTint="@color/red_400"
-                               android:visibility="gone"
-                               android:scaleType="center"/>
+                        <org.thoughtcrime.securesms.components.MicrophoneRecorderView
+                            android:id="@+id/recorder_view"
+                            android:layout_width="37dp"
+                            android:layout_height="37dp"
+                            android:clipChildren="false"
+                            android:clipToPadding="false">
 
-                </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
+                            <ImageButton
+                                android:id="@+id/quick_audio_toggle"
+                                android:layout_width="37dp"
+                                android:layout_height="37dp"
+                                android:layout_gravity="bottom"
+                                android:src="?quick_mic_icon"
+                                android:background="@null"
+                                android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
+                                android:padding="10dp"/>
 
-            </org.thoughtcrime.securesms.components.HidingLinearLayout>
-        </LinearLayout>
+                            <ImageView android:id="@+id/quick_audio_fab"
+                                android:layout_width="74dp"
+                                android:layout_height="74dp"
+                                android:src="@drawable/ic_mic_white_48dp"
+                                android:background="@drawable/circle_tintable"
+                                android:backgroundTint="@color/red_400"
+                                android:visibility="gone"
+                                android:scaleType="center"/>
 
-        <LinearLayout android:id="@+id/recording_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:orientation="horizontal"
-                      tools:visibility="gone">
+                        </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
 
-            <TextView android:id="@+id/record_time"
-                      android:layout_width="wrap_content"
-                      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"
-                      android:singleLine="true"
-                      android:visibility="gone"
-                      tools:visibility="visible"/>
+                    </org.thoughtcrime.securesms.components.HidingLinearLayout>
 
-            <FrameLayout android:layout_width="match_parent"
-                         android:layout_height="match_parent"
-                         android:clipChildren="true">
+                </LinearLayout>
 
-                <TextView android:id="@+id/slide_to_cancel"
-                          android:layout_width="wrap_content"
-                          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"
-                          android:textSize="10sp"
-                          android:ellipsize="none"
-                          android:singleLine="true"
-                          android:paddingLeft="20dp"
-                          android:paddingStart="20dp"
-                          android:visibility="gone"
-                          tools:visibility="visible"/>
+                <LinearLayout android:id="@+id/recording_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal"
+                    tools:visibility="gone">
+
+                    <TextView android:id="@+id/record_time"
+                        android:layout_width="wrap_content"
+                        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"
+                        android:singleLine="true"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
+
+                    <FrameLayout android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:clipChildren="true">
+
+                        <TextView android:id="@+id/slide_to_cancel"
+                            android:layout_width="wrap_content"
+                            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"
+                            android:textSize="10sp"
+                            android:ellipsize="none"
+                            android:singleLine="true"
+                            android:paddingLeft="20dp"
+                            android:paddingStart="20dp"
+                            android:visibility="gone"
+                            tools:visibility="visible"/>
+
+                    </FrameLayout>
+
+                </LinearLayout>
 
             </FrameLayout>
 
         </LinearLayout>
 
     </FrameLayout>
+
     <org.thoughtcrime.securesms.components.AnimatingToggle
             android:id="@+id/button_toggle"
             android:layout_width="50dp"
@@ -174,4 +199,3 @@
 
     </org.thoughtcrime.securesms.components.AnimatingToggle>
 </org.thoughtcrime.securesms.components.InputPanel>
-</merge>

res/layout/conversation_item_received.xml

@@ -75,11 +75,27 @@
 
             </LinearLayout>
 
+            <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:visibility="gone"
+                    app:message_type="incoming"
+                    tools:visibility="visible"/>
+
+            <ViewStub
+                    android:id="@+id/shared_contact_view_stub"
+                    android:layout="@layout/conversation_item_shared_contact"
+                    android:layout_width="@dimen/media_bubble_max_width"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
+
             <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:layout_width="@dimen/media_bubble_default_dimens"
+                    android:layout_height="@dimen/media_bubble_default_dimens"/>
 
             <ViewStub
                     android:id="@+id/audio_view_stub"

res/layout/conversation_item_received_thumbnail.xml

@@ -2,12 +2,17 @@
 <org.thoughtcrime.securesms.components.ThumbnailView
         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/image_view"
-        android:layout_width="@dimen/media_bubble_height"
-        android:layout_height="@dimen/media_bubble_height"
+        android:layout_width="@dimen/media_bubble_default_dimens"
+        android:layout_height="@dimen/media_bubble_default_dimens"
         android:scaleType="centerCrop"
         android:adjustViewBounds="true"
         android:contentDescription="@string/conversation_item__mms_image_description"
         android:visibility="gone"
+        app:minWidth="@dimen/media_bubble_min_width"
+        app:maxWidth="@dimen/media_bubble_max_width"
+        app:minHeight="@dimen/media_bubble_min_height"
+        app:maxHeight="@dimen/media_bubble_max_height"
         tools:src="@drawable/ic_video_light"
         tools:visibility="gone" />

res/layout/conversation_item_sent.xml

@@ -38,11 +38,27 @@
                       android:background="@drawable/sent_bubble"
                       android:orientation="vertical">
 
+            <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:visibility="gone"
+                    app:message_type="outgoing"
+                    tools:visibility="visible"/>
+
+            <ViewStub
+                    android:id="@+id/shared_contact_view_stub"
+                    android:layout="@layout/conversation_item_shared_contact"
+                    android:layout_width="@dimen/media_bubble_max_width"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
+
             <ViewStub
                     android:id="@+id/image_view_stub"
-                    android:layout_width="@dimen/media_bubble_height"
-                    android:layout_height="@dimen/media_bubble_height"
-                    android:layout="@layout/conversation_item_sent_thumbnail"/>
+                    android:layout_width="@dimen/media_bubble_default_dimens"
+                    android:layout_height="@dimen/media_bubble_default_dimens"
+                    android:layout="@layout/conversation_item_sent_thumbnail" />
 
             <ViewStub
                     android:id="@+id/audio_view_stub"

res/layout/conversation_item_sent_thumbnail.xml

@@ -2,14 +2,19 @@
 <org.thoughtcrime.securesms.components.ThumbnailView
         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/image_view"
-        android:layout_width="@dimen/media_bubble_height"
-        android:layout_height="@dimen/media_bubble_height"
+        android:layout_width="@dimen/media_bubble_default_dimens"
+        android:layout_height="@dimen/media_bubble_default_dimens"
         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"
+        app:minWidth="@dimen/media_bubble_min_width"
+        app:maxWidth="@dimen/media_bubble_max_width"
+        app:minHeight="@dimen/media_bubble_min_height"
+        app:maxHeight="@dimen/media_bubble_max_height"
         tools:src="@drawable/ic_video_light"
         tools:visibility="visible" />

res/layout/conversation_item_shared_contact.xml

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

res/layout/conversation_list_activity.xml

@@ -13,6 +13,7 @@
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:elevation="4dp"
             android:theme="?attr/actionBarStyle">
 
         <RelativeLayout
@@ -65,6 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
+            android:elevation="4dp"
             android:visibility="invisible"
             tools:visibility="visible"/>
 

res/layout/conversation_list_item_view.xml

@@ -51,7 +51,7 @@
                   android:layout_toStartOf="@+id/thumbnail"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:textColor="?attr/conversation_list_item_contact_color"
-                  android:singleLine="true"
+                  android:maxLines="1"
                   tools:text="Jules Bonnot"
                   android:ellipsize="end"
                   android:layout_marginBottom="2dp"
@@ -84,7 +84,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
                 android:fontFamily="sans-serif-light"
-                android:singleLine="true"
+                android:maxLines="1"
                 tools:text="Wheels arrive at 3pm flat. This is a somewhat longer message."
                 android:ellipsize="end" />
 

res/layout/conversation_title_view.xml

@@ -13,10 +13,10 @@
                android:layout_height="wrap_content"
                android:src="@drawable/ic_arrow_back_white_24dp"
                android:clickable="true"
-               android:paddingRight="15dp"
-               android:paddingEnd="15dp"
-               android:layout_marginRight="15dp"
-               android:layout_marginEnd="15dp"
+               android:paddingRight="12dp"
+               android:paddingEnd="12dp"
+               android:layout_marginRight="12dp"
+               android:layout_marginEnd="12dp"
                android:layout_alignParentLeft="true"
                android:layout_alignParentStart="true"
                android:layout_centerVertical="true"
@@ -25,8 +25,8 @@
     <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:foreground="@drawable/contact_photo_background"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_toRightOf="@id/up_button"
             android:layout_toEndOf="@id/up_button"
             android:layout_centerVertical="true"
@@ -50,7 +50,7 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:ellipsize="end"
                 android:textSize="18dp"
                 android:transitionName="recipient_name"
@@ -80,7 +80,7 @@
                 android:id="@+id/subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:ellipsize="end"
                 android:layout_gravity="center_vertical|start"
                 android:gravity="center_vertical"

res/layout/database_upgrade_activity.xml

@@ -34,7 +34,7 @@
                              android:layout_gravity="center"/>
 
             <ProgressBar android:id="@+id/determinate_progress"
-                         style="@android:style/Widget.ProgressBar.Horizontal"
+                         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                          android:layout_width="fill_parent"
                          android:layout_height="wrap_content"
                          android:indeterminate="false"

res/layout/enter_backup_passphrase_dialog.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:padding="16dp">
+
+    <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <android.support.design.widget.TextInputEditText
+                android:id="@+id/restore_passphrase_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/enter_backup_passphrase_dialog__backup_passphrase"
+                android:imeOptions="actionDone"
+                android:inputType="number" />
+
+    </android.support.design.widget.TextInputLayout>
+</FrameLayout>

res/layout/fragment_search.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/search_no_results"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:background="?attr/search_background"
+        android:visibility="gone" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/search_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</FrameLayout>

res/layout/giphy_activity.xml

@@ -14,7 +14,6 @@
         <android.support.design.widget.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:theme="?attr/actionBarStyle"
                 android:background="?attr/colorPrimary">
 
             <org.thoughtcrime.securesms.giph.ui.GiphyActivityToolbar
@@ -29,6 +28,7 @@
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:theme="?attr/actionBarTabBarStyle"
                     android:scrollbars="horizontal"/>
 
         </android.support.design.widget.AppBarLayout>

res/layout/import_export_fragment.xml

@@ -109,68 +109,5 @@
         </LinearLayout>
 
     </LinearLayout>
-
-    <include layout="@layout/preference_divider"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:gravity="center_vertical"
-        android:text="@string/ImportExportActivity_export"
-        android:textSize="14sp"
-        android:fontFamily="sans-serif-medium"
-        android:textColor="@color/signal_primary_dark"/>
-
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <LinearLayout android:id="@+id/export_plaintext_backup"
-                      android:clickable="true"
-                      android:orientation="horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:paddingTop="12dp"
-                      android:paddingBottom="12dp"
-                      android:gravity="center_vertical"
-                      android:background="?selectableItemBackground">
-
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginLeft="16dp"
-                       android:layout_marginStart="16dp"
-                       android:layout_marginRight="32dp"
-                       android:layout_marginEnd="32dp"
-                       android:src="@drawable/ic_content_copy_white_24dp"
-                       android:tint="?attr/pref_icon_tint"/>
-
-            <LinearLayout android:orientation="vertical"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginRight="16dp"
-                          android:layout_marginEnd="16dp">
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          style="@style/Registration.Description"
-                          android:text="@string/export_fragment__export_plaintext_backup"/>
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:text="@string/export_fragment__export_a_plaintext_backup_compatible_with"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"/>
-
-    </LinearLayout>
 </LinearLayout>
 </ScrollView>