From 8eca41049522ff0f49c326c5c4fe8c517444686e Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:41:29 +1100 Subject: [PATCH 1/2] Bump version to 1.33.1 --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6d85c74921..845dcc056f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,8 +26,8 @@ configurations.configureEach { exclude(module = "commons-logging") } -val canonicalVersionCode = 446 -val canonicalVersionName = "1.33.0" +val canonicalVersionCode = 447 +val canonicalVersionName = "1.33.1" val postFixSize = 10 val abiPostFix = mapOf( From 2ebee378ee3a2e9a9b377154f90fa07bf52eea42 Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:42:23 +1100 Subject: [PATCH 2/2] Reverted changes to early entrypoint access --- .../securesms/BaseActionBarActivity.kt | 9 ++------- .../dependencies/EarlyActivityEntryPoint.kt | 16 ---------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/dependencies/EarlyActivityEntryPoint.kt diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.kt index df77cac397..c879527fc5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.kt @@ -12,17 +12,13 @@ import androidx.activity.enableEdgeToEdge import androidx.annotation.StyleRes import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewGroupCompat -import dagger.hilt.android.AndroidEntryPoint -import dagger.hilt.android.EntryPointAccessors import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.ThemeUtil -import org.thoughtcrime.securesms.dependencies.EarlyActivityEntryPoint import org.thoughtcrime.securesms.util.ThemeState import org.thoughtcrime.securesms.util.UiModeUtilities.isDayUiMode import org.thoughtcrime.securesms.util.applySafeInsetsPaddings import org.thoughtcrime.securesms.util.themeState -import javax.inject.Inject private val DefaultLightScrim = Color.argb(0xe6, 0xFF, 0xFF, 0xFF) private val DefaultDarkScrim = Color.argb(0x80, 0x1b, 0x1b, 0x1b) @@ -32,9 +28,8 @@ abstract class BaseActionBarActivity : AppCompatActivity() { private var modifiedTheme: Resources.Theme? = null - private val preferences: TextSecurePreferences by lazy { - EntryPointAccessors.fromActivity(this, EarlyActivityEntryPoint::class.java) - .prefs + private val preferences: TextSecurePreferences get() { + return (applicationContext as ApplicationContext).textSecurePreferences.get() } // Whether to apply default window insets to the decor view diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/EarlyActivityEntryPoint.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/EarlyActivityEntryPoint.kt deleted file mode 100644 index dae026b06c..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/EarlyActivityEntryPoint.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.thoughtcrime.securesms.dependencies - -import dagger.hilt.EntryPoint -import dagger.hilt.InstallIn -import dagger.hilt.android.components.ActivityComponent -import org.session.libsession.utilities.TextSecurePreferences - -/** - * An entrypoint for activities that need very early access to dependencies. This is only necessary - * for activities that want dependencies before `super.onCreate()` is called. - */ -@EntryPoint -@InstallIn(ActivityComponent::class) -interface EarlyActivityEntryPoint { - val prefs: TextSecurePreferences -} \ No newline at end of file