Skip to content

Fixed: Content drawer dialog was showing in branded apps when it is disabled. #5234

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

Merged
kelson42 merged 2 commits into from
Oct 27, 2026
Merged

Fixed: Content drawer dialog was showing in branded apps when it is disabled. #5234

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
38729f4
Fixed: Content drawer dialog was showing in branded apps when it is d…
MohitMaliDeveloper Oct 27, 2026
13e69e8
Setting `setIsFirstRun` to true to avoid the future conditions.
MohitMaliDeveloper Oct 27, 2026
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
19 changes: 19 additions & 0 deletions branded/src/main/java/org/kiwix/kiwixmobile/custom/main/BrandedReaderViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ import androidx.compose.material.icons.filled.Menu
import androidx.compose.ui.graphics.Color
import androidx.core.net.toUri
import androidx.core.os.LocaleListCompat
import androidx.lifecycle.viewModelScope
import androidx.navigation.NavOptions
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.MainCoroutineDispatcher
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.kiwix.kiwixmobile.core.R.string
import org.kiwix.kiwixmobile.core.di.IoDispatcher
Expand Down Expand Up @@ -482,4 +484,21 @@ class BrandedReaderViewModel @Inject constructor(
)
}
}

/**
* Overrides this method to configure the showing the TOC sidebar hint dialog. If a branded app
* has the TOC sidebar feature disabled, this method prevents the hint dialog from being shown
* when the user navigates to a new URL in the WebView.
* This ensures that users of branded apps do not see hints for features
* that are not available to them.
*/
override fun webViewUrlLoading() {
if (!isTocSidebarEnabled()) {
viewModelScope.launch {
kiwixDataStore.setIsFirstRun(false)
}
return
}
super.webViewUrlLoading()
Comment thread
harshsomankar123-tech marked this conversation as resolved.
Resolved
}
}
9 changes: 9 additions & 0 deletions core/src/main/java/org/kiwix/kiwixmobile/core/main/reader/CoreReaderViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,15 @@ abstract class CoreReaderViewModel(
findInPageManager.stop()
}

/**
* Show the TOC sidebar hint on the first run of the app, unless it's a debug build.
* This is to guide users to the contents drawer feature.
* Subclasses like BrandedViewModel override this method to provide custom
* behavior, such as not showing this dialog when it is disabled in branded app.
*
* WARNING: If modifying this method, ensure thorough testing with branded apps
* to verify proper functionality.
*/
override fun webViewUrlLoading() {
viewModelScope.launch {
if (kiwixDataStore.isFirstRun.first() && !kiwixDataStore.isDebugBuild.first()) {
Expand Down
Loading