Skip to content

feat:Hook firebase remote config org fetch into sync and smart startup #1279

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
jaycenusa wants to merge 17 commits into
base: master
Choose a base branch
from
Open

feat:Hook firebase remote config org fetch into sync and smart startup #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e8d148
feat:Hook firebase remote config org fetch into sync and smart startup
jaycenusa May 6, 2026
c023e5e
feat: add di in AppModule.kt for SyncDataUserCase class
jaycenusa May 6, 2026
7cfbe90
feat: modify codes due to pipeline errors
jaycenusa May 6, 2026
cb81683
feat: fix 3 klint problems
jaycenusa May 7, 2026
13113ff
feat: add unit tests
jaycenusa May 7, 2026
f864e95
feat: fix lint check
jaycenusa May 7, 2026
72bff62
Merge branch 'master' into feat/issue-1262-hook-firebase-conf
jaycenusa May 11, 2026
336c388
Merge branch 'master' of github.com:Greenstand/treetracker-android in…
jaycenusa May 11, 2026
3d4a308
Merge branch 'feat/issue-1262-hook-firebase-conf' of github.com:jayce…
jaycenusa May 11, 2026
a5e20e7
feat: address comment to remove the change
jaycenusa May 20, 2026
7b7f52b
Merge branch 'master' into feat/issue-1262-hook-firebase-conf
jaycenusa May 20, 2026
2eadcf5
feat: address comment 2 and 3 to place the logic in the proper place
jaycenusa May 20, 2026
8b013cd
fix: code analysis
jaycenusa May 20, 2026
93fcc5f
fix: remove unused codes and unit test cases
jaycenusa May 20, 2026
c381602
feat:remove dependency injection
jaycenusa May 20, 2026
ee2ea3b
Merge branch 'master' into feat/issue-1262-hook-firebase-conf
jaycenusa May 28, 2026
b29b561
Merge branch 'master' into feat/issue-1262-hook-firebase-conf
jaycenusa Jun 1, 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
13 changes: 13 additions & 0 deletions app/src/main/java/org/greenstand/android/TreeTracker/models/organization/OrgRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ class OrgRepo(
) {
private var currentOrg: Org? = null

private val ORG_CONFIG_SYNCED_KEY = PrefKeys.SYSTEM_SETTINGS + PrefKey("org-config-synced")

// In OrgRepo.kt
fun hasCompletedInitialOrgSync(): Boolean = prefs.getBoolean(ORG_CONFIG_SYNCED_KEY, false)

fun markInitialOrgSyncComplete() {
prefs.edit().putBoolean(ORG_CONFIG_SYNCED_KEY, true).commit()
}

fun resetInitialOrgSync() {
prefs.edit().putBoolean(ORG_CONFIG_SYNCED_KEY, false).commit()
}

suspend fun init() {
dao.insertOrg(defaultOrgEntity())
val currentOrgId = prefs.getString(CURRENT_ORG_ID_KEY, DEFAULT_ORG_ID)
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/org/greenstand/android/TreeTracker/splash/SplashScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,15 @@ class SplashScreenViewModel(
if (!orgId.isNullOrBlank()) {
Timber.tag(ORG_LINK_TAG).i("Deeplink received: orgId=$orgId, orgName=$orgName")
val configJson = orgConfigProvider.fetchOrgConfig(orgId)
if (configJson != null) {
// Non-deeplink launch: refresh current org config if we haven't yet

@Elforama Elforama May 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually a deeplink launch.

val currentOrg = orgRepo.currentOrg()
if (currentOrg.id != OrgRepo.DEFAULT_ORG_ID && !orgRepo.hasCompletedInitialOrgSync()) {
Timber.tag(ORG_LINK_TAG).d("Fetching Remote Config for org ${currentOrg.id}")
if (configJson != null) {
orgRepo.addOrgFromRemoteConfig(currentOrg.id, currentOrg.name, configJson)
orgRepo.markInitialOrgSyncComplete()
}
Comment thread
jaycenusa marked this conversation as resolved.
} else if (configJson != null) {
Timber.tag(ORG_LINK_TAG).i("Remote Config found for org $orgId, applying full config")
orgRepo.addOrgFromRemoteConfig(orgId, orgName ?: "", configJson)
} else {
Expand Down
7 changes: 7 additions & 0 deletions app/src/test/java/org/greenstand/android/TreeTracker/splash/SplashScreenViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ class SplashScreenViewModelTest {
@Before
fun setUp() {
MockKAnnotations.init(this)
// Default behavior to maintain existing test expectations:
// Assume sync is already complete so the "refresh" logic doesn't trigger unexpectedly.
every { orgRepo.hasCompletedInitialOrgSync() } returns true
every { orgRepo.currentOrg() } returns
io.mockk.mockk {
every { id } returns OrgRepo.DEFAULT_ORG_ID
}
splashScreenViewModel =
SplashScreenViewModel(
orgId = orgId,
Expand Down
Loading