Merge branch 'u-master' into u-dev

3 years ago · db61d693c4
parent 38cc42a162 2216c99dcd
commit db61d693c4
2 changed files with 2 additions and 1 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -157,7 +157,7 @@ dependencies {
    testImplementation 'org.robolectric:shadows-multidex:4.4'
 }

-def canonicalVersionCode = 307
+def canonicalVersionCode = 309
 def canonicalVersionName = "1.16.0"

 def postFixSize = 10
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@ -67,6 +67,7 @@ import org.thoughtcrime.securesms.util.IP2Country
 import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.push
 import org.thoughtcrime.securesms.util.show
+import org.thoughtcrime.securesms.util.themeState
 import java.io.IOException
 import java.util.Locale
 import javax.inject.Inject