From 0e0cbf112b1869b808909461068b87ca9d02cc3e Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 28 Aug 2023 11:18:51 +0930 Subject: [PATCH 1/3] Use separate keys for huawei shared prefs --- app/build.gradle | 4 +++- .../org/thoughtcrime/securesms/ApplicationContext.java | 3 +++ .../libsession/utilities/TextSecurePreferences.kt | 9 ++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 61f560189..6a46e41ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -135,6 +135,7 @@ android { buildConfigField "boolean", "PLAY_STORE_DISABLED", "false" buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID" buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl" + buildConfigField 'String', 'PUSH_KEY_SUFFIX', '\"\"' } huawei { @@ -143,7 +144,7 @@ android { buildConfigField "boolean", "PLAY_STORE_DISABLED", "true" buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.HUAWEI" buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl" - + buildConfigField 'String', 'PUSH_KEY_SUFFIX', '\"_HUAWEI\"' } website { @@ -152,6 +153,7 @@ android { buildConfigField "boolean", "PLAY_STORE_DISABLED", "true" buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID" buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\"" + buildConfigField 'String', 'PUSH_KEY_SUFFIX', '\"\"' } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 75622c7bb..8715042c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -109,6 +109,7 @@ import dagger.hilt.EntryPoints; import dagger.hilt.android.HiltAndroidApp; import kotlin.Unit; import kotlinx.coroutines.Job; +import network.loki.messenger.BuildConfig; import network.loki.messenger.libsession_util.ConfigBase; import network.loki.messenger.libsession_util.UserProfile; @@ -206,6 +207,8 @@ public class ApplicationContext extends Application implements DefaultLifecycleO @Override public void onCreate() { + TextSecurePreferences.setPushSuffix(BuildConfig.PUSH_KEY_SUFFIX); + DatabaseModule.init(this); MessagingModuleConfiguration.configure(this); super.onCreate(); diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt index 9f00047ac..1b431d62b 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -189,6 +189,9 @@ interface TextSecurePreferences { internal val _events = MutableSharedFlow(0, 64, BufferOverflow.DROP_OLDEST) val events get() = _events.asSharedFlow() + @JvmStatic + var pushSuffix = "" + const val DISABLE_PASSPHRASE_PREF = "pref_disable_passphrase" const val LANGUAGE_PREF = "pref_language" const val THREAD_TRIM_NOW = "pref_trim_now" @@ -251,9 +254,9 @@ interface TextSecurePreferences { const val LINK_PREVIEWS = "pref_link_previews" const val GIF_METADATA_WARNING = "has_seen_gif_metadata_warning" const val GIF_GRID_LAYOUT = "pref_gif_grid_layout" - const val IS_PUSH_ENABLED = "pref_is_using_fcm" - const val PUSH_TOKEN = "pref_fcm_token_2" - const val PUSH_REGISTER_TIME = "pref_last_fcm_token_upload_time_2" + val IS_PUSH_ENABLED get() = "pref_is_using_fcm$pushSuffix" + val PUSH_TOKEN get() = "pref_fcm_token_2$pushSuffix" + val PUSH_REGISTER_TIME get() = "pref_last_fcm_token_upload_time_2$pushSuffix" const val LAST_CONFIGURATION_SYNC_TIME = "pref_last_configuration_sync_time" const val CONFIGURATION_SYNCED = "pref_configuration_synced" const val LAST_PROFILE_UPDATE_TIME = "pref_last_profile_update_time" From 4daa3e69236e26afd57d65294035d8ecece90046 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:43:48 +1000 Subject: [PATCH 2/3] feat: add huawei build folder to gitignore (#1308) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1fe35a0e7..023fc8101 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ ffpr *.sh pkcs11.password app/play +app/huawei \ No newline at end of file From 29275cef518a77de4e1d6d6d8dd5dad057634b78 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:42:23 +1000 Subject: [PATCH 3/3] build: update build number (#1310) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6a46e41ad..2bf496cd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ configurations.all { exclude module: "commons-logging" } -def canonicalVersionCode = 354 -def canonicalVersionName = "1.17.0" +def canonicalVersionCode = 355 +def canonicalVersionName = "1.17.1" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,