Skip to content

Change launch mode to singleTop #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Change launch mode to singleTop #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa8ea09
Change launch mode to singleTop to work better with custom tabs
classicsc Feb 18, 2025
b1c6af8
Update intent handling to work with singleTop launch mode
classicsc Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<activity
android:name=".infrastructure.android.MainActivity"
android:exported="true"
android:launchMode="singleInstance"
android:launchMode="singleTop"
android:theme="@style/Theme.Reader">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
33 changes: 21 additions & 12 deletions app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class MainActivity : AppCompatActivity() {
@Inject
lateinit var accountDao: AccountDao

private var subscribeViewModel: SubscribeViewModel? = null

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Log.i("RLog", "onCreate: ${ProfileInstallerInitializer().create(this)}")
Expand Down Expand Up @@ -87,24 +89,31 @@ class MainActivity : AppCompatActivity() {
) {
AccountSettingsProvider(accountDao) {
SettingsProvider {
val subscribeViewModel: SubscribeViewModel = hiltViewModel()
DisposableEffect(this) {
val listener = Consumer<Intent> { intent ->
intent.getTextOrNull()?.let {
subscribeViewModel.handleSharedUrlFromIntent(it)
}
}
addOnNewIntentListener(listener)
onDispose {
removeOnNewIntentListener(listener)
}
val viewModel: SubscribeViewModel = hiltViewModel()
subscribeViewModel = viewModel

// Handle the initial intent
intent?.getTextOrNull()?.let {
viewModel.handleSharedUrlFromIntent(it)
}
HomeEntry(subscribeViewModel = subscribeViewModel)

HomeEntry(subscribeViewModel = viewModel)
}
}
}
}
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent) // Store the new intent
// Only process if viewModel is ready
if (subscribeViewModel != null) {
intent.getTextOrNull()?.let {
subscribeViewModel?.handleSharedUrlFromIntent(it)
}
}
}
}

private fun Intent.getTextOrNull(): String? {
Expand Down
Loading