Merge pull request #1065 from session-foundation/release/1.22.0

Release/1.22.0

app/build.gradle

@@ -15,8 +15,8 @@ configurations.configureEach {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 401
-def canonicalVersionName = "1.21.3"
+def canonicalVersionCode = 402
+def canonicalVersionName = "1.22.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -430,6 +430,12 @@ class SettingsActivity : ScreenLockActionBarActivity() {
         override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
             mode.title = getString(R.string.displayNameEnter)
             mode.menuInflater.inflate(R.menu.menu_apply, menu)
+
+            menu.findItem(R.id.applyButton)?.let { menuItem ->
+                val themeColor = getColorFromAttr(android.R.attr.textColorPrimary)
+                menuItem.icon?.setTint(themeColor)
+            }
+
             this@SettingsActivity.displayNameEditActionMode = mode
             return true
         }

app/src/main/res/menu/menu_apply.xml

@@ -7,7 +7,7 @@
         android:title="@string/set"
         android:id="@+id/applyButton"
         android:icon="@drawable/ic_check"
-        app:iconTint="?colorControlNormal"
+        app:iconTint="?android:textColorPrimary"
         app:showAsAction="always|withText"/>
 
 </menu>