Merge pull request #3642 from owncloud/feature/prevent_screenshots_dialogs

abelgardep · web-flow · commit 4d44cb3ddafb · 2022-05-09T13:08:25.000+02:00
[FEATURE] Prevent taking screenshots in Dialogs (Android 12)
diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/DialogExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/DialogExt.kt
@@ -0,0 +1,31 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author David Crespo Ríos
+ * Copyright (C) 2022 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.extensions
+
+import android.app.Dialog
+import android.view.WindowManager
+import com.owncloud.android.BuildConfig
+import com.owncloud.android.R
+
+fun Dialog.avoidScreenshotsIfNeeded() {
+    if (!BuildConfig.DEBUG && context.resources?.getBoolean(R.bool.allow_screenshots) == false) {
+        window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }
+}
diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/FragmentExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/FragmentExt.kt
@@ -54,6 +54,7 @@ fun Fragment.showAlertDialog(
         .setPositiveButton(positiveButtonText, positiveButtonListener)
         .setNegativeButton(negativeButtonText, negativeButtonListener)
         .show()
+        .avoidScreenshotsIfNeeded()
 }
 
 fun Fragment.hideSoftKeyboard() {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/settings/fragments/SettingsSecurityFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/settings/fragments/SettingsSecurityFragment.kt
@@ -33,13 +33,14 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import com.owncloud.android.R
+import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
 import com.owncloud.android.extensions.showMessageInSnackbar
 import com.owncloud.android.presentation.ui.security.BiometricActivity
 import com.owncloud.android.presentation.ui.security.BiometricManager
 import com.owncloud.android.presentation.ui.security.LockTimeout
 import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT
-import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
 import com.owncloud.android.presentation.ui.security.PatternActivity
+import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsFragment.Companion.removePreferenceFromScreen
 import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel
 import com.owncloud.android.utils.DocumentProviderUtils.Companion.notifyDocumentProviderRoots
@@ -219,6 +220,7 @@ class SettingsSecurityFragment : PreferenceFragmentCompat() {
                             prefTouchesWithOtherVisibleWindows?.isChecked = true
                         }
                         .show()
+                        .avoidScreenshotsIfNeeded()
                 }
                 return@setOnPreferenceChangeListener false
             }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt
@@ -44,6 +44,7 @@ import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType
 import com.owncloud.android.domain.capabilities.model.OCCapability
 import com.owncloud.android.domain.sharing.shares.model.OCShare
 import com.owncloud.android.domain.utils.Event.EventObserver
+import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
 import com.owncloud.android.extensions.parseError
 import com.owncloud.android.lib.resources.shares.RemoteShare
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
@@ -203,6 +204,8 @@ class PublicShareDialogFragment : DialogFragment() {
 
         binding.saveButton.setOnClickListener { onSaveShareSetting() }
         binding.cancelButton.setOnClickListener { dismiss() }
+
+        dialog?.avoidScreenshotsIfNeeded()
     }
 
     private fun initTitleAndLabels() {
@@ -448,8 +451,10 @@ class PublicShareDialogFragment : DialogFragment() {
                     updateCapabilities(uiResult.data)
                     listener?.dismissLoading()
                 }
-                is UIResult.Error -> {}
-                is UIResult.Loading -> {}
+                is UIResult.Error -> {
+                }
+                is UIResult.Loading -> {
+                }
             }
         }
     }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
@@ -27,6 +27,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import com.owncloud.android.R;
+import com.owncloud.android.extensions.DialogExtKt;
 
 public class ConfirmationDialogFragment extends DialogFragment {
 
@@ -45,13 +46,13 @@ public class ConfirmationDialogFragment extends DialogFragment {
     /**
      * Public factory method to create new ConfirmationDialogFragment instances.
      *
-     * @param messageResId      DataResult id for a message to show in the dialog.
-     * @param messageArguments  Arguments to complete the message, if it's a format string. May be null.
-     * @param titleResId        DataResult id for a text to show in the title.
-     *                          0 for default alert title, -1 for no title.
-     * @param posBtn            DataResult id for the text of the positive button. -1 for no positive button.
-     * @param neuBtn            DataResult id for the text of the neutral button. -1 for no neutral button.
-     * @param negBtn            DataResult id for the text of the negative button. -1 for no negative button.
+     * @param messageResId     DataResult id for a message to show in the dialog.
+     * @param messageArguments Arguments to complete the message, if it's a format string. May be null.
+     * @param titleResId       DataResult id for a text to show in the title.
+     *                         0 for default alert title, -1 for no title.
+     * @param posBtn           DataResult id for the text of the positive button. -1 for no positive button.
+     * @param neuBtn           DataResult id for the text of the neutral button. -1 for no neutral button.
+     * @param negBtn           DataResult id for the text of the negative button. -1 for no negative button.
      * @return Dialog ready to show.
      */
     public static ConfirmationDialogFragment newInstance(
@@ -134,7 +135,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                         dialog.dismiss();
                     });
         }
-        return builder.create();
+        Dialog d = builder.create();
+        DialogExtKt.avoidScreenshotsIfNeeded(d);
+        return d;
     }
 
     public interface ConfirmationDialogFragmentListener {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -31,6 +31,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import com.owncloud.android.R;
+import com.owncloud.android.extensions.DialogExtKt;
 
 /**
  * Dialog which will be displayed to user upon keep-in-sync file conflict.
@@ -57,7 +58,7 @@ public static ConflictsResolveDialog newInstance(String path, OnConflictDecision
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        AlertDialog d = new AlertDialog.Builder(getActivity())
                 .setIcon(R.drawable.ic_warning)
                 .setTitle(R.string.conflict_title)
                 .setMessage(getString(R.string.conflict_message))
@@ -80,6 +81,10 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                             }
                         })
                 .create();
+
+        DialogExtKt.avoidScreenshotsIfNeeded(d);
+
+        return d;
     }
 
     public void showDialog(AppCompatActivity activity) {
@@ -93,15 +98,6 @@ public void showDialog(AppCompatActivity activity) {
         this.show(ft, "dialog");
     }
 
-    public void dismissDialog(AppCompatActivity activity) {
-        Fragment prev = activity.getSupportFragmentManager().findFragmentByTag(getTag());
-        if (prev != null) {
-            FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
-            ft.remove(prev);
-            ft.commit();
-        }
-    }
-
     @Override
     public void onCancel(DialogInterface dialog) {
         mListener.conflictDecisionMade(Decision.CANCEL);
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
@@ -38,6 +38,7 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.extensions.DialogExtKt;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.PreferenceUtils;
@@ -106,6 +107,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 .setTitle(R.string.uploader_info_dirname);
         Dialog d = builder.create();
         d.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        DialogExtKt.avoidScreenshotsIfNeeded(d);
         return d;
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java
@@ -31,6 +31,7 @@
 import androidx.fragment.app.DialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.extensions.DialogExtKt;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -69,11 +70,11 @@ public class ExpirationDatePickerDialogFragment
     /**
      * Factory method to create new instances
      *
-     * @param chosenDateInMillis    Date chosen when the dialog appears, in milliseconds elapsed
-     *                              since Jan 1, 1970. Needs to be after tomorrow, or tomorrow will be used
-     *                              instead.
-     * @param maxDateInMillis       Maximum date selectable, in milliseconds elapsed since Jan 1, 1970.
-     *                              Only will be set if greater or equals than chosenDateInMillis and tomorrow.
+     * @param chosenDateInMillis Date chosen when the dialog appears, in milliseconds elapsed
+     *                           since Jan 1, 1970. Needs to be after tomorrow, or tomorrow will be used
+     *                           instead.
+     * @param maxDateInMillis    Maximum date selectable, in milliseconds elapsed since Jan 1, 1970.
+     *                           Only will be set if greater or equals than chosenDateInMillis and tomorrow.
      * @return New dialog instance
      */
     public static ExpirationDatePickerDialogFragment newInstance(long chosenDateInMillis,
@@ -146,16 +147,18 @@ public void onClick(DialogInterface dialog, int which) {
         // shown by default)
         picker.setCalendarViewShown(false);
 
+        DialogExtKt.avoidScreenshotsIfNeeded(dialog);
+
         return dialog;
     }
 
     /**
      * Called when the user choses an expiration date.
      *
-     * @param view              View instance where the date was chosen
-     * @param year              Year of the date chosen.
-     * @param monthOfYear       Month of the date chosen [0, 11]
-     * @param dayOfMonth        Day of the date chosen
+     * @param view        View instance where the date was chosen
+     * @param year        Year of the date chosen.
+     * @param monthOfYear Month of the date chosen [0, 11]
+     * @param dayOfMonth  Day of the date chosen
      */
     @Override
     public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
@@ -34,6 +34,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import com.owncloud.android.R;
+import com.owncloud.android.extensions.DialogExtKt;
 import com.owncloud.android.utils.PreferenceUtils;
 
 public class LoadingDialog extends DialogFragment {
@@ -51,8 +52,8 @@ public void onCreate(Bundle savedInstanceState) {
     /**
      * Public factory method to get dialog instances.
      *
-     * @param messageId     DataResult id for a message to show in the dialog.
-     * @param cancelable    If 'true', the dialog can be cancelled by the user input (BACK button, touch outside...)
+     * @param messageId  DataResult id for a message to show in the dialog.
+     * @param cancelable If 'true', the dialog can be cancelled by the user input (BACK button, touch outside...)
      * @return New dialog instance, ready to show.
      */
     public static LoadingDialog newInstance(int messageId, boolean cancelable) {
@@ -109,6 +110,7 @@ public boolean onKey(DialogInterface dialog, int keyCode,
             };
             dialog.setOnKeyListener(keyListener);
         }
+        DialogExtKt.avoidScreenshotsIfNeeded(dialog);
         return dialog;
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RateMeDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RateMeDialog.java
@@ -36,6 +36,7 @@
 import com.owncloud.android.AppRater;
 import com.owncloud.android.R;
 import com.owncloud.android.extensions.ActivityExtKt;
+import com.owncloud.android.extensions.DialogExtKt;
 import com.owncloud.android.utils.PreferenceUtils;
 import timber.log.Timber;
 
@@ -146,6 +147,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             DialogInterface.OnKeyListener keyListener = (dialog, keyCode, event) -> keyCode == KeyEvent.KEYCODE_BACK;
             dialog.setOnKeyListener(keyListener);
         }
+        DialogExtKt.avoidScreenshotsIfNeeded(dialog);
         return dialog;
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveAccountDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveAccountDialogFragment.kt
@@ -29,6 +29,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.provider.DocumentsContract
 import com.owncloud.android.R
+import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
 import org.koin.java.KoinJavaComponent.inject
 
@@ -60,6 +61,7 @@ class RemoveAccountDialogFragment : ConfirmationDialogFragment(), ConfirmationDi
         val dialog = super.onCreateDialog(savedInstanceState)
         targetAccount = requireArguments().getParcelable(ARG_TARGET_ACCOUNT)
         setOnConfirmationListener(this)
+        dialog.avoidScreenshotsIfNeeded()
         return dialog
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
@@ -20,16 +20,17 @@
 package com.owncloud.android.ui.dialog;
 
 /**
- *  Dialog requiring confirmation before removing a collection of given OCFiles.
- *
- *  Triggers the removal according to the user response.
+ * Dialog requiring confirmation before removing a collection of given OCFiles.
+ * <p>
+ * Triggers the removal according to the user response.
  */
 
 import android.app.Dialog;
 import android.os.Bundle;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.extensions.DialogExtKt;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
@@ -120,6 +121,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         setOnConfirmationListener(this);
 
+        DialogExtKt.avoidScreenshotsIfNeeded(dialog);
+
         return dialog;
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt
@@ -35,6 +35,7 @@ import android.os.Bundle
 import com.owncloud.android.R
 import com.owncloud.android.domain.sharing.shares.model.OCShare
 import com.owncloud.android.domain.sharing.shares.model.ShareType
+import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
 import com.owncloud.android.presentation.ui.sharing.fragments.ShareFragmentListener
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
 import timber.log.Timber
@@ -57,6 +58,8 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
 
         setOnConfirmationListener(this)
 
+        dialog.avoidScreenshotsIfNeeded()
+
         return dialog
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
@@ -41,14 +41,15 @@
 import com.google.android.material.snackbar.Snackbar;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.extensions.DialogExtKt;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.PreferenceUtils;
 
 /**
- *  Dialog to input a new name for a file or folder to rename.  
- *
- *  Triggers the rename operation when name is confirmed.
+ * Dialog to input a new name for a file or folder to rename.
+ * <p>
+ * Triggers the rename operation when name is confirmed.
  */
 public class RenameFileDialogFragment
         extends DialogFragment implements DialogInterface.OnClickListener {
@@ -58,7 +59,7 @@ public class RenameFileDialogFragment
     /**
      * Public factory method to create new RenameFileDialogFragment instances.
      *
-     * @param file            File to rename.
+     * @param file File to rename.
      * @return Dialog ready to show.
      */
     public static RenameFileDialogFragment newInstance(OCFile file) {
@@ -107,6 +108,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 .setTitle(R.string.rename_dialog_title);
         Dialog d = builder.create();
         d.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        DialogExtKt.avoidScreenshotsIfNeeded(d);
         return d;
     }
 
@@ -135,7 +137,7 @@ public void onClick(DialogInterface dialog, int which) {
     /**
      * Show a temporary message in a Snackbar bound to the content view of the parent Activity
      *
-     * @param messageResource       Message to show.
+     * @param messageResource Message to show.
      */
     private void showSnackMessage(int messageResource) {
         Snackbar snackbar = Snackbar.make(
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ fun Fragment.showAlertDialog(`
`54`	`54`	`.setPositiveButton(positiveButtonText, positiveButtonListener)`
`55`	`55`	`.setNegativeButton(negativeButtonText, negativeButtonListener)`
`56`	`56`	`.show()`
	`57`	`+ .avoidScreenshotsIfNeeded()`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`fun Fragment.hideSoftKeyboard() {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType`
`44`	`44`	`import com.owncloud.android.domain.capabilities.model.OCCapability`
`45`	`45`	`import com.owncloud.android.domain.sharing.shares.model.OCShare`
`46`	`46`	`import com.owncloud.android.domain.utils.Event.EventObserver`
	`47`	`+import com.owncloud.android.extensions.avoidScreenshotsIfNeeded`
`47`	`48`	`import com.owncloud.android.extensions.parseError`
`48`	`49`	`import com.owncloud.android.lib.resources.shares.RemoteShare`
`49`	`50`	`import com.owncloud.android.lib.resources.status.OwnCloudVersion`
`@@ -203,6 +204,8 @@ class PublicShareDialogFragment : DialogFragment() {`
`203`	`204`
`204`	`205`	`binding.saveButton.setOnClickListener { onSaveShareSetting() }`
`205`	`206`	`binding.cancelButton.setOnClickListener { dismiss() }`
	`207`	`+`
	`208`	`+ dialog?.avoidScreenshotsIfNeeded()`
`206`	`209`	`}`
`207`	`210`
`208`	`211`	`private fun initTitleAndLabels() {`
`@@ -448,8 +451,10 @@ class PublicShareDialogFragment : DialogFragment() {`
`448`	`451`	`updateCapabilities(uiResult.data)`
`449`	`452`	`listener?.dismissLoading()`
`450`	`453`	`}`
`451`		`- is UIResult.Error -> {}`
`452`		`- is UIResult.Loading -> {}`
	`454`	`+ is UIResult.Error -> {`
	`455`	`+ }`
	`456`	`+ is UIResult.Loading -> {`
	`457`	`+ }`
`453`	`458`	`}`
`454`	`459`	`}`
`455`	`460`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`import com.owncloud.android.AppRater;`
`37`	`37`	`import com.owncloud.android.R;`
`38`	`38`	`import com.owncloud.android.extensions.ActivityExtKt;`
	`39`	`+import com.owncloud.android.extensions.DialogExtKt;`
`39`	`40`	`import com.owncloud.android.utils.PreferenceUtils;`
`40`	`41`	`import timber.log.Timber;`
`41`	`42`
`@@ -146,6 +147,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {`
`146`	`147`	`DialogInterface.OnKeyListener keyListener = (dialog, keyCode, event) -> keyCode == KeyEvent.KEYCODE_BACK;`
`147`	`148`	`dialog.setOnKeyListener(keyListener);`
`148`	`149`	`}`
	`150`	`+ DialogExtKt.avoidScreenshotsIfNeeded(dialog);`
`149`	`151`	`return dialog;`
`150`	`152`	`}`
`151`	`153`