make dialog modal (#6015)

parneet-guraya · web-flow · commit 9a876fa5e290 · 2024-12-11T15:08:39.000+09:00
Signed-off-by: parneet-guraya &lt;gurayaparneet@gmail.com&gt;
diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -180,8 +180,8 @@ public void launchTranslate(View view) {
             getString(R.string.about_translate_cancel),
             positiveButtonRunnable,
             () -> {},
-            spinner,
-            true);
+            spinner
+        );
     }
 
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@@ -50,6 +50,7 @@ public void onCreate(final Bundle savedInstanceState) {
             copyrightBinding = PopupForCopyrightBinding.inflate(getLayoutInflater());
             final View contactPopupView = copyrightBinding.getRoot();
             dialogBuilder.setView(contactPopupView);
+            dialogBuilder.setCancelable(false);
             dialog = dialogBuilder.create();
             dialog.show();
 
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
@@ -319,7 +319,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
             isIndeterminate = true
             setTitle(getString(R.string.logging_in_title))
             setMessage(getString(R.string.logging_in_message))
-            setCanceledOnTouchOutside(false)
+            setCancelable(false)
         }
         progressDialog!!.show()
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@@ -170,8 +170,8 @@ public void handleShowRationaleFlowCameraLocation(Activity activity,
             },
             () -> locationPermissionCallback.onLocationPermissionDenied(
                 activity.getString(R.string.in_app_camera_location_permission_denied)),
-            null,
-            false);
+            null
+        );
     }
 
     /**
@@ -203,8 +203,8 @@ private void askUserToAllowLocationAccess(Activity activity,
                 defaultKvStore.putBoolean("inAppCameraLocationPref", false);
                 initiateCameraUpload(activity, resultLauncher);
             },
-            null,
-            true);
+            null
+        );
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -566,8 +566,8 @@ private void showNearbyCardPermissionRationale() {
             getString(R.string.nearby_card_permission_explanation),
             this::requestLocationPermission,
             this::displayYouWontSeeNearbyMessage,
-            checkBoxView,
-            false);
+            checkBoxView
+        );
     }
 
     private void displayYouWontSeeNearbyMessage() {
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt
@@ -205,6 +205,7 @@ class DeleteHelper @Inject constructor(
         reviewCallback: ReviewController.ReviewCallback
     ) {
         val alert = AlertDialog.Builder(context)
+        alert.setCancelable(false)
         alert.setTitle(question)
 
         val checkedItems = booleanArrayOf(false, false, false, false)
diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
@@ -149,8 +149,7 @@ class DescriptionEditActivity :
             getString(titleStringID),
             getString(messageStringId),
             getString(android.R.string.ok),
-            null,
-            true,
+            null
         )
     }
 
@@ -304,7 +303,7 @@ class DescriptionEditActivity :
         progressDialog!!.isIndeterminate = true
         progressDialog!!.setTitle(getString(R.string.updating_caption_title))
         progressDialog!!.setMessage(getString(R.string.updating_caption_message))
-        progressDialog!!.setCanceledOnTouchOutside(false)
+        progressDialog!!.setCancelable(false)
         progressDialog!!.show()
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
@@ -133,8 +133,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
                             askForLocationPermission();
                         },
                         null,
-                        null,
-                        false);
+                        null
+                    );
                 } else {
                     if (isPermissionDenied) {
                         locationPermissionsHelper.showAppSettingsDialog(getActivity(),
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt
@@ -78,8 +78,7 @@ class LocationPermissionsHelper(
                             activity.getString(R.string.upload_map_location_access)
                         )
                     },
-                    null,
-                    false
+                    null
                 )
             } else {
                 ActivityCompat.requestPermissions(
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
@@ -1596,8 +1596,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
                 getString(R.string.about_translate_cancel),
                 { onDeleteClicked(spinner) },
                 {},
-                spinner,
-                true
+                spinner
             )
             if (isDeleted) {
                 dialog!!.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
@@ -1616,8 +1615,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
                     onDeleteClickeddialogtext(reason)
                 },
                 {},
-                input,
-                true
+                input
             )
             input.addTextChangedListener(object : TextWatcher {
                 fun handleText() {
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -283,6 +283,7 @@ private void showReportDialog(final Media media) {
         builder.setItems(R.array.report_violation_options, (dialog, which) -> {
             sendReportEmail(media, values[which]);
         });
+        builder.setCancelable(false);
         builder.show();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt
@@ -196,6 +196,7 @@ class ZoomableActivity : BaseActivity() {
         val dialog = Dialog(this)
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog.setContentView(R.layout.full_screen_mode_info_dialog)
+        dialog.setCancelable(false)
         (dialog.findViewById(R.id.btn_ok) as Button).setOnClickListener { dialog.dismiss() }
         dialog.show()
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -291,8 +291,8 @@ public void onActivityResult(Map<String, Boolean> result) {
                             askForLocationPermission();
                         },
                         null,
-                        null,
-                        false);
+                        null
+                    );
                 } else {
                     if (isPermissionDenied) {
                         locationPermissionsHelper.showAppSettingsDialog(getActivity(),
diff --git a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java
@@ -206,8 +206,8 @@ public void showAlert(final Bitmap screenshot) {
             getString(R.string.cancel),
             () -> shareScreen(screenshot),
             () -> {},
-            view,
-            true);
+            view
+        );
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.kt b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.kt
@@ -323,8 +323,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
             null,
             message,
             getString(R.string.ok),
-            {},
-            true
+            {}
         )
 
 //        binding.imagesUploadedProgressbar.setVisibility(View.INVISIBLE);
@@ -510,8 +509,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
             title,
             message,
             getString(R.string.ok),
-            {},
-            true
+            {}
         )
     }
 
@@ -527,8 +525,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
             getString(R.string.read_help_link),
             {},
             { Utils.handleWebUrl(requireContext(), Uri.parse(helpLinkUrl)) },
-            null,
-            true
+            null
         )
     }
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.kt
@@ -66,6 +66,7 @@ class QuizActivity : AppCompatActivity() {
         AlertDialog.Builder(this)
             .setTitle(getString(R.string.warning))
             .setMessage(getString(R.string.quiz_back_button))
+            .setCancelable(false)
             .setPositiveButton(R.string.continue_message) { dialog, _ ->
                 val intent = Intent(this, QuizResultActivity::class.java)
                 dialog.dismiss()
@@ -137,6 +138,7 @@ class QuizActivity : AppCompatActivity() {
         AlertDialog.Builder(this)
             .setTitle(title)
             .setMessage(message)
+            .setCancelable(false)
             .setPositiveButton(R.string.continue_message) { dialog, _ ->
                 questionIndex++
                 if (questionIndex == quiz.size) {
diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt
@@ -181,6 +181,7 @@ class QuizResultActivity : AppCompatActivity() {
         val shareMessage = view.findViewById<TextView>(R.id.alert_text)
         shareMessage.setText(R.string.quiz_result_share_message)
         alertadd.setView(view)
+        alertadd.setCancelable(false)
         alertadd.setPositiveButton(R.string.about_translate_proceed) { dialog, _ ->
             shareScreen(screenshot)
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt
@@ -273,8 +273,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             getString(R.string.read_help_link),
             { },
             { Utils.handleWebUrl(requireContext(), Uri.parse(GET_CONTENT_PICKER_HELP_URL)) },
-            null,
-            true
+            null
         )
     }
 
@@ -333,7 +332,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
         val dialog = Dialog(requireActivity())
         dialog.setContentView(R.layout.dialog_select_language)
-        dialog.setCanceledOnTouchOutside(true)
+        dialog.setCancelable(false)
         dialog.window?.setLayout(
             (resources.displayMetrics.widthPixels * 0.90).toInt(),
             (resources.displayMetrics.heightPixels * 0.90).toInt()
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -270,8 +270,7 @@ protected void checkBlockStatus() {
                 getString(R.string.block_notification_title),
                 getString(R.string.block_notification),
                 getString(R.string.ok),
-                this::finish,
-                true)));
+                this::finish)));
     }
 
     public void checkStoragePermissions() {
@@ -418,16 +417,14 @@ public void onRequestPermissionsResult(final int requestCode,
                                 getString(R.string.storage_permissions_denied),
                                 getString(R.string.unable_to_share_upload_item),
                                 getString(android.R.string.ok),
-                                this::finish,
-                                false);
+                                this::finish);
                         } else {
                             DialogUtil.showAlertDialog(this,
                                 getString(R.string.storage_permission_title),
                                 getString(
                                     R.string.write_storage_permission_rationale_for_image_share),
                                 getString(android.R.string.ok),
-                                this::checkStoragePermissions,
-                                false);
+                                this::checkStoragePermissions);
                         }
                     }
                 }
@@ -754,8 +751,7 @@ public void showAlertDialog(int messageResourceId, Runnable onPositiveClick) {
             "",
             getString(messageResourceId),
             getString(R.string.ok),
-            onPositiveClick,
-            false);
+            onPositiveClick);
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
@@ -346,7 +346,7 @@ private void initLanguage(int position, UploadMediaDetail description) {
                 public void onClick(View view) {
                     Dialog dialog = new Dialog(view.getContext());
                     dialog.setContentView(R.layout.dialog_select_language);
-                    dialog.setCanceledOnTouchOutside(true);
+                    dialog.setCancelable(false);
                     dialog.getWindow().setLayout(
                         (int) (view.getContext().getResources().getDisplayMetrics().widthPixels
                             * 0.90),
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
@@ -105,7 +105,7 @@ private void init() {
         binding.tooltip.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                DialogUtil.showAlertDialog(getActivity(), getString(R.string.categories_activity_title), getString(R.string.categories_tooltip), getString(android.R.string.ok), null, true);
+                DialogUtil.showAlertDialog(getActivity(), getString(R.string.categories_activity_title), getString(R.string.categories_tooltip), getString(android.R.string.ok), null);
             }
         });
         if (media == null) {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
@@ -114,7 +114,7 @@ private void init() {
         setDepictsSubTitle();
         binding.tooltip.setOnClickListener(v -> DialogUtil
             .showAlertDialog(getActivity(), getString(R.string.depicts_step_title),
-                getString(R.string.depicts_tooltip), getString(android.R.string.ok), null, true));
+                getString(R.string.depicts_tooltip), getString(android.R.string.ok), null));
         if (media == null) {
             presenter.onAttachView(this);
         } else {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java
@@ -69,7 +69,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 getString(R.string.license_step_title),
                 getString(R.string.license_tooltip),
                 getString(android.R.string.ok),
-                null, true)
+                null)
         );
 
         initPresenter();
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
@@ -309,7 +309,7 @@ private void initRecyclerView() {
      */
     private void showInfoAlert(int titleStringID, int messageStringId) {
         DialogUtil.showAlertDialog(getActivity(), getString(titleStringID),
-            getString(messageStringId), getString(android.R.string.ok), null, true);
+            getString(messageStringId), getString(android.R.string.ok), null);
     }
 
 
@@ -336,6 +336,7 @@ public void showSimilarImageFragment(String originalFilePath, String possibleFil
         BasicKvStore basicKvStore = new BasicKvStore(getActivity(), "IsAnyImageCancelled");
         if (!basicKvStore.getBoolean("IsAnyImageCancelled", false)) {
             SimilarImageDialogFragment newFragment = new SimilarImageDialogFragment();
+            newFragment.setCancelable(false);
             newFragment.setCallback(new SimilarImageDialogFragment.Callback() {
                 @Override
                 public void onPositiveResponse() {
@@ -450,7 +451,8 @@ private void showNearbyPlaceFound(Place place) {
                     // Execute when user cancels the upload of the specified place
                     UploadActivity.nearbyPopupAnswers.put(place, false);
                 },
-                customLayout, true);
+                customLayout
+            );
         }
     }
 
@@ -526,8 +528,7 @@ public void showDuplicatePicturePopup(UploadItem uploadItem) {
                     uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                     onImageValidationSuccess();
                 }, null,
-                checkBoxView,
-                false);
+                checkBoxView);
         } else {
             uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
             onImageValidationSuccess();
@@ -588,8 +589,7 @@ public void showConnectionErrorPopup() {
                         basicKvStore.putBoolean(keyForShowingAlertDialog, false);
                         activity.finish();
                     },
-                    null,
-                    false
+                    null
                 );
             }
         } catch (Exception e) {
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ public void launchTranslate(View view) {`
`180`	`180`	`getString(R.string.about_translate_cancel),`
`181`	`181`	`positiveButtonRunnable,`
`182`	`182`	`() -> {},`
`183`		`- spinner,`
`184`		`- true);`
	`183`	`+ spinner`
	`184`	`+ );`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ class LoginActivity : AccountAuthenticatorActivity() {`
`319`	`319`	`isIndeterminate = true`
`320`	`320`	`setTitle(getString(R.string.logging_in_title))`
`321`	`321`	`setMessage(getString(R.string.logging_in_message))`
`322`		`- setCanceledOnTouchOutside(false)`
	`322`	`+ setCancelable(false)`
`323`	`323`	`}`
`324`	`324`	`progressDialog!!.show()`
`325`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ class DescriptionEditActivity :`
`149`	`149`	`getString(titleStringID),`
`150`	`150`	`getString(messageStringId),`
`151`	`151`	`getString(android.R.string.ok),`
`152`		`- null,`
`153`		`- true,`
	`152`	`+ null`
`154`	`153`	`)`
`155`	`154`	`}`
`156`	`155`
`@@ -304,7 +303,7 @@ class DescriptionEditActivity :`
`304`	`303`	`progressDialog!!.isIndeterminate = true`
`305`	`304`	`progressDialog!!.setTitle(getString(R.string.updating_caption_title))`
`306`	`305`	`progressDialog!!.setMessage(getString(R.string.updating_caption_message))`
`307`		`- progressDialog!!.setCanceledOnTouchOutside(false)`
	`306`	`+ progressDialog!!.setCancelable(false)`
`308`	`307`	`progressDialog!!.show()`
`309`	`308`	`}`
`310`	`309`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,7 @@ class LocationPermissionsHelper(`
`78`	`78`	`activity.getString(R.string.upload_map_location_access)`
`79`	`79`	`)`
`80`	`80`	`},`
`81`		`- null,`
`82`		`- false`
	`81`	`+ null`
`83`	`82`	`)`
`84`	`83`	`} else {`
`85`	`84`	`ActivityCompat.requestPermissions(`