Bump version to 2.18.2

// FREEBIE

.gitignore

@@ -20,3 +20,4 @@ signing.properties
 library/lib/
 library/obj/
 ffpr
+test/androidTestEspresso/res/values/arrays.xml

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="122"
-      android:versionName="2.16.2">
+      android:versionCode="128"
+      android:versionName="2.18.2">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip"/>
 
@@ -226,6 +226,14 @@
         </intent-filter>
     </activity>
 
+    <activity android:name=".RecipientPreferenceActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".BlockedContactsActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
 
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>

build.gradle

@@ -35,7 +35,7 @@ repositories {
 
 dependencies {
     compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
-    compile 'se.emilsjolander:stickylistheaders:2.2.0'
+    compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.google.android.gms:play-services-base:6.5.87'
     compile 'com.jpardogo.materialtabstrip:library:1.0.9'
     compile 'org.w3c:smil:1.0.0'
@@ -76,15 +76,21 @@ dependencies {
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
     androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestCompile ('com.android.support.test:runner:0.2') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') {
+        exclude group: 'javax.inject'
     }
-    androidTestCompile 'com.android.support.test:runner:0.2'
 }
 
 dependencyVerification {
     verify = [
             'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
-            'se.emilsjolander:stickylistheaders:89146b46c96fea0e40200474a2625cda10fe94891e4128f53cdb42375091b9b6',
+            'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
             'com.google.android.gms:play-services-base:832cb6b3130e871db6a412c4ab585656dbcc5e7948101f190186757785703f75',
             'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
@@ -129,7 +135,7 @@ dependencyVerification {
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
-    testBuildType "testing"
+    testBuildType "debugTest"
 
     dexOptions {
         javaMaxHeapSize "4g"
@@ -141,6 +147,7 @@ android {
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
+        buildConfigField "String", "PUSH_URL", "\"https://textsecure-service.whispersystems.org\""
     }
 
     compileOptions {
@@ -183,9 +190,10 @@ android {
             proguardFiles = buildTypes.debug.proguardFiles
             signingConfig signingConfigs.release
         }
-        testing.initWith(buildTypes.debug)
-        testing {
+        debugTest.initWith(buildTypes.debug)
+        debugTest {
             proguardFile 'proguard-testing.pro'
+            buildConfigField "String", "PUSH_URL", "\"https://textsecure-service-staging.whispersystems.org\""
         }
     }
 
@@ -200,10 +208,7 @@ android {
             assets.srcDirs = ['assets']
         }
         androidTest {
-            java.srcDirs = ['androidTest/java']
-            resources.srcDirs = ['androidTest/java']
-            aidl.srcDirs = ['androidTest/java']
-            renderscript.srcDirs = ['androidTest/java']
+            java.srcDirs = ['test/androidTest/java']
         }
     }
 
@@ -242,3 +247,28 @@ if (propFile.canRead()){
     println 'signing.properties not found'
     android.buildTypes.release.signingConfig = null
 }
+
+if (project.hasProperty('espresso') && System.console() != null) {
+    println "______________________WARNING_______________________"
+    println "ALL YOUR CONTACTS WILL BE DELETED IN THE PROCESS"
+    println "OF RUNNING THESE TESTS, TYPE 'delete all my contacts'"
+    println "TO CONTINUE"
+    println "----------------------------------------------------"
+
+    def input = System.console().readLine(':')
+    if (input == 'delete all my contacts') {
+        android.productFlavors {
+            base {}
+            espresso {
+                testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner"
+            }
+        }
+        android.sourceSets.espresso {
+            manifest.srcFile 'test/espresso/AndroidManifest.xml'
+        }
+        android.sourceSets.androidTestEspresso {
+            java.srcDirs = ['test/androidTestEspresso/java']
+            res.srcDirs  = ['test/androidTestEspresso/res']
+        }
+    }
+}

proguard-testing.pro

@@ -4,6 +4,7 @@
 -dontwarn android.test.**
 -dontwarn com.android.support.test.**
 -dontwarn sun.reflect.**
+-dontwarn sun.misc.**
 -dontwarn org.assertj.**
 -dontwarn org.hamcrest.**
 -dontwarn org.mockito.**

res/drawable-v21/conversation_list_item_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+        </selector>
+    </item>
+</ripple>

res/drawable/conversation_list_item_background.xml

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

res/drawable/conversation_list_item_background_read_dark.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-          android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-          android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-          android:drawable="@color/conversation_list_item_background_read_dark" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/conversation_list_item_background_read_light.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-        android:drawable="@color/conversation_list_item_background_read_light" />
-    <item android:state_activated="true"
-        android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/conversation_list_item_background_unread_dark.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-          android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-          android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-          android:drawable="@color/conversation_list_item_background_unread_dark" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/conversation_list_item_background_unread_light.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false" android:state_activated="false"
-        android:drawable="@color/conversation_list_item_background_unread_light" />
-    <item android:state_activated="true"
-        android:drawable="@drawable/list_selector_background_selected" />
-</selector>

res/drawable/emoji_category_emoticons_dark.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:enterFadeDuration="200"
+          android:exitFadeDuration="300">
+	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_emoticons_activated_dark" />
+	<item android:drawable="@drawable/ic_emoji_emoticons_normal_dark" />
+</selector>
+

res/drawable/emoji_category_emoticons_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:enterFadeDuration="200"
+          android:exitFadeDuration="300">
+	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_emoticons_activated_light" />
+	<item android:drawable="@drawable/ic_emoji_emoticons_normal_light" />
+</selector>
+

res/drawable/emoji_category_nature_dark.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:enterFadeDuration="200"
+          android:exitFadeDuration="300">
+	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_nature_activated_dark" />
+	<item android:drawable="@drawable/ic_emoji_nature_normal_dark" />
+</selector>