Merge pull request #154 from MihaiCristianCondrea/codex/implement-consent-fallback-behavior

Add consent UMP fallback checks in onboarding and main

Author: MihaiCristianCondrea

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java

@@ -35,6 +35,7 @@
 import com.d4rk.androidtutorials.java.databinding.ActivityMainBinding;
 import com.d4rk.androidtutorials.java.ui.components.navigation.BottomSheetMenuFragment;
 import com.d4rk.androidtutorials.java.ui.screens.startup.StartupActivity;
+import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
 import com.d4rk.androidtutorials.java.ui.screens.support.SupportActivity;
 import com.d4rk.androidtutorials.java.utils.ConsentUtils;
 import com.d4rk.androidtutorials.java.utils.EdgeToEdgeDelegate;
@@ -49,6 +50,9 @@
 import com.google.android.play.core.install.model.AppUpdateType;
 import com.google.android.play.core.install.model.InstallStatus;
 import com.google.android.play.core.install.model.UpdateAvailability;
+import com.google.android.ump.ConsentInformation;
+import com.google.android.ump.ConsentRequestParameters;
+import com.google.android.ump.UserMessagingPlatform;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
@@ -108,6 +112,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mainViewModel = new ViewModelProvider(this).get(MainViewModel.class);
 
+        // Fallback: show the consent form again if required.
+        ConsentInformation consentInformation = UserMessagingPlatform.getConsentInformation(this);
+        if (consentInformation.getConsentStatus() == ConsentInformation.ConsentStatus.REQUIRED) {
+            StartupViewModel consentViewModel = new ViewModelProvider(this).get(StartupViewModel.class);
+            ConsentRequestParameters params = new ConsentRequestParameters.Builder().build();
+            consentViewModel.requestConsentInfoUpdate(this, params,
+                    () -> consentViewModel.loadConsentForm(this, null), null);
+        }
+
         setupActionBar();
         observeViewModel();
 

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/onboarding/OnboardingActivity.java

@@ -15,8 +15,12 @@
 import com.d4rk.androidtutorials.java.R;
 import com.d4rk.androidtutorials.java.databinding.ActivityOnboardingBinding;
 import com.d4rk.androidtutorials.java.ui.screens.main.MainActivity;
+import com.d4rk.androidtutorials.java.ui.screens.startup.StartupViewModel;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
+import com.google.android.ump.ConsentInformation;
+import com.google.android.ump.ConsentRequestParameters;
+import com.google.android.ump.UserMessagingPlatform;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
@@ -36,6 +40,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         viewModel = new ViewModelProvider(this).get(OnboardingViewModel.class);
 
+        // Fallback: show the consent form again if required.
+        ConsentInformation consentInformation = UserMessagingPlatform.getConsentInformation(this);
+        if (consentInformation.getConsentStatus() == ConsentInformation.ConsentStatus.REQUIRED) {
+            StartupViewModel consentViewModel = new ViewModelProvider(this).get(StartupViewModel.class);
+            ConsentRequestParameters params = new ConsentRequestParameters.Builder().build();
+            consentViewModel.requestConsentInfoUpdate(this, params,
+                    () -> consentViewModel.loadConsentForm(this, null), null);
+        }
+
         adapter = new OnboardingPagerAdapter(this);
         binding.viewPager.setAdapter(adapter);
         int startPage = viewModel.getCurrentPage();