Merge pull request #3242 from dimagi/pm_qa_7909_copy

- fixed view jib status click issue

Author: pm-dimagi

app/build.gradle

@@ -173,6 +173,9 @@ dependencies {
     implementation "androidx.camera:camera-lifecycle:$cameraX_version"
     implementation 'com.google.android.gms:play-services-mlkit-face-detection:17.1.0'
     implementation "com.google.firebase:firebase-auth:22.3.0"
+    //Tobe removed with nav version 2.9
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
+
 }
 
 ext {

app/proguard.cfg

@@ -235,4 +235,7 @@
 # androidx.test.ext.truth.content.IntentSubject.hasAction fails in it-tests without this
 -keep class com.google.common.base.Preconditions { *; }
 
+# Keep all kotlinx serialization-related classes and methods
+-keep class kotlinx.serialization.** { *; }
+
 # Guava Config End

app/res/layout/screen_connect.xml

@@ -14,7 +14,6 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:navGraph="@navigation/nav_graph_connect"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/res/navigation/nav_graph_connect.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph_connect"
-    app:startDestination="@id/connect_jobs_list_fragment">
+   >
 
     <fragment
         android:id="@+id/connect_unlock_fragment"

app/src/org/commcare/activities/connect/ConnectActivity.java

@@ -16,7 +16,8 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.navigation.NavOptions;
+import androidx.navigation.NavGraph;
+import androidx.navigation.NavInflater;
 import androidx.navigation.fragment.NavHostFragment;
 
 import com.google.common.base.Strings;
@@ -65,45 +66,46 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         redirectionAction = getIntent().getStringExtra("action");
         opportunityId = getIntent().getStringExtra("opportunity_id");
-        if(opportunityId == null) {
+        if (opportunityId == null) {
             opportunityId = "";
         }
 
         updateBackButton();
 
+        // Wait for fragment to attach
+        getSupportFragmentManager().executePendingTransactions();
+        NavInflater inflater = navController.getNavInflater();
+        NavGraph graph = inflater.inflate(R.navigation.nav_graph_connect);
+
+        int startDestinationId = R.id.connect_jobs_list_fragment;
+        Bundle startArgs = null;
+
         if (getIntent().getBooleanExtra("info", false)) {
             ConnectJobRecord job = ConnectJobHelper.INSTANCE.getActiveJob();
             Objects.requireNonNull(job);
 
-            int fragmentId = job.getStatus() == ConnectJobRecord.STATUS_DELIVERING ?
-                    R.id.connect_job_delivery_progress_fragment :
-                    R.id.connect_job_learning_progress_fragment;
+            startDestinationId = job.getStatus() == ConnectJobRecord.STATUS_DELIVERING
+                    ? R.id.connect_job_delivery_progress_fragment
+                    : R.id.connect_job_learning_progress_fragment;
 
             boolean buttons = getIntent().getBooleanExtra("buttons", true);
+            startArgs = new Bundle();
+            startArgs.putBoolean("showLaunch", buttons);
 
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("showLaunch", buttons);
-
-            NavOptions options = new NavOptions.Builder()
-                    .setPopUpTo(navController.getGraph().getStartDestinationId(), true)
-                    .build();
-            navController.navigate(fragmentId, bundle, options);
         } else if (!Strings.isNullOrEmpty(redirectionAction)) {
             Logger.log("ConnectActivity", "Redirecting to unlock fragment");
             //Entering from a notification, so we may need to initialize
             PersonalIdManager.getInstance().init(this);
-
-            //Navigate to the unlock fragment first, then it will navigate on as desired
-            NavOptions options = new NavOptions.Builder()
-                    .setPopUpTo(navController.getGraph().getStartDestinationId(), true)
-                    .build();
-            Bundle bundle = new Bundle();
-            bundle.putString("action", redirectionAction);
-            bundle.putString("opportunity_id", opportunityId);
-            bundle.putBoolean("buttons", getIntent().getBooleanExtra("buttons", true));
-            navController.navigate(R.id.connect_unlock_fragment, bundle, options);
+            startDestinationId = R.id.connect_unlock_fragment;
+            startArgs = new Bundle();
+            startArgs.putString("action", redirectionAction);
+            startArgs.putString("opportunity_id", opportunityId);
+            startArgs.putBoolean("buttons", getIntent().getBooleanExtra("buttons", true));
         }
 
+        graph.setStartDestination(startDestinationId);
+        navController.setGraph(graph, startArgs);
+
         prepareConnectMessagingScreen();
     }