Merge branch 'u-master' into u-dev

This commit is contained in:
charles 2022-10-19 11:06:59 +11:00
commit db61d693c4
2 changed files with 2 additions and 1 deletions

View File

@ -157,7 +157,7 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.4' testImplementation 'org.robolectric:shadows-multidex:4.4'
} }
def canonicalVersionCode = 307 def canonicalVersionCode = 309
def canonicalVersionName = "1.16.0" def canonicalVersionName = "1.16.0"
def postFixSize = 10 def postFixSize = 10

View File

@ -67,6 +67,7 @@ import org.thoughtcrime.securesms.util.IP2Country
import org.thoughtcrime.securesms.util.disableClipping import org.thoughtcrime.securesms.util.disableClipping
import org.thoughtcrime.securesms.util.push import org.thoughtcrime.securesms.util.push
import org.thoughtcrime.securesms.util.show import org.thoughtcrime.securesms.util.show
import org.thoughtcrime.securesms.util.themeState
import java.io.IOException import java.io.IOException
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject