fix: fixed bug in aliumSutrveyLoaded added xfragment check

yusera-at-dwao · Dec 6, 2024 · 0a09bea · 0a09bea
1 parent 07e26b4
commit 0a09bea
Showing 1 changed file with 43 additions and 31 deletions.
diff --git a/alium/src/main/java/com/dwao/alium/survey/AliumSurveyLoader.java b/alium/src/main/java/com/dwao/alium/survey/AliumSurveyLoader.java
@@ -122,23 +122,33 @@ private void findAndLoadSurveyForCurrentScr() {
                             Log.d("activeSurvey", "survey existes");
                             return;
                         }
-                    }else
-                        if(activity instanceof FragmentActivity) {
-                            FragmentManager fm = ((FragmentActivity) activity).getSupportFragmentManager();
-                            Fragment fragment= fm.findFragmentByTag(key+"-"+surveyParameters.screenName);
+                    } else
+                        if(xfragment!=null){
+                             FragmentManager fm=xfragment.getChildFragmentManager();
+                             Fragment fragment= fm.findFragmentByTag(key+"-"+surveyParameters.screenName);
                             if(fragment!=null){
                                 Log.d("activeSurvey", "survey existes");
                                 return;
                             }
-                        }else{
 
-                            android.app.FragmentManager fm = activity.getFragmentManager();
-                            android.app.Fragment fragment= fm.findFragmentByTag(key+"-"+surveyParameters.screenName);
-                            if(fragment!=null){
-                                Log.d("activeSurvey", "survey existes");
-                                return;
+                    }else if(activity !=null){
+                            if (activity instanceof FragmentActivity) {
+                                FragmentManager fm = ((FragmentActivity) activity).getSupportFragmentManager();
+                                Fragment fragment = fm.findFragmentByTag(key + "-" + surveyParameters.screenName);
+                                if (fragment != null) {
+                                    Log.d("activeSurvey", "survey existes");
+                                    return;
+                                }
+                            } else {
+
+                                android.app.FragmentManager fm = activity.getFragmentManager();
+                                android.app.Fragment fragment = fm.findFragmentByTag(key + "-" + surveyParameters.screenName);
+                                if (fragment != null) {
+                                    Log.d("activeSurvey", "survey existes");
+                                    return;
+                                }
                             }
-                    }
+                        }
                    loadSurveyIfShouldBeLoaded(jsonObject, key);
                 }
             } catch (Exception e) {
@@ -234,31 +244,33 @@ else if(fragment!=null ){
                         .commitAllowingStateLoss();
             }
         }
-        if(activity instanceof FragmentActivity){
-            FragmentManager fm=((FragmentActivity)activity).getSupportFragmentManager();
-            if(!fm.isStateSaved()){
-                fm.beginTransaction()
-                        .add(SurveyDialogFragment.newInstance(executableSurveySpecs,
-                                surveyParameters, false), loadableSurveySpecs.key+"-"+surveyParameters.screenName)
-                        .commit();
-            }
+        if(activity!=null){
+            if (activity instanceof FragmentActivity) {
+                FragmentManager fm = ((FragmentActivity) activity).getSupportFragmentManager();
+                if (!fm.isStateSaved()) {
+                    fm.beginTransaction()
+                            .add(SurveyDialogFragment.newInstance(executableSurveySpecs,
+                                    surveyParameters, false), loadableSurveySpecs.key + "-" + surveyParameters.screenName)
+                            .commit();
+                }
 
-        }else{
-            android.app.FragmentManager fm=activity.getFragmentManager();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                if(!fm.isStateSaved()){
+            } else {
+                android.app.FragmentManager fm = activity.getFragmentManager();
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    if (!fm.isStateSaved()) {
+                        fm.beginTransaction()
+                                .add(LegacySurveyDialogFragment.newInstance(executableSurveySpecs,
+                                        surveyParameters, false), loadableSurveySpecs.key + "-" + surveyParameters.screenName)
+                                .commit();
+                    }
+                } else {
                     fm.beginTransaction()
                             .add(LegacySurveyDialogFragment.newInstance(executableSurveySpecs,
-                                    surveyParameters, false), loadableSurveySpecs.key+"-"+surveyParameters.screenName)
-                            .commit();
+                                    surveyParameters, false), loadableSurveySpecs.key + "-" + surveyParameters.screenName)
+                            .commitAllowingStateLoss();
                 }
-            }else{
-                fm.beginTransaction()
-                        .add(LegacySurveyDialogFragment.newInstance(executableSurveySpecs,
-                                surveyParameters, false), loadableSurveySpecs.key+"-"+surveyParameters.screenName)
-                        .commitAllowingStateLoss();
-            }
 
+            }
         }
     }
 private void loadSurveyFromActivity(JSONObject json, LoadableSurveySpecs loadableSurveySpecs){