refactor: Refactor Snackbar usage to shared showSnackbarWithAction extension

Author: mykh-hailo

owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt

@@ -92,8 +92,8 @@ fun Activity.showMessageInSnackbar(
 
 fun Activity.showSnackbarWithAction(
     message: CharSequence,
-    action: () -> Unit,
     actionText: CharSequence,
+    action: () -> Unit,
     duration: Int = Snackbar.LENGTH_LONG,
     layoutId: Int = android.R.id.content
 ) {

owncloudApp/src/main/java/com/owncloud/android/extensions/FragmentExt.kt

@@ -51,6 +51,18 @@ fun Fragment.showMessageInSnackbar(
     Snackbar.make(requiredView, message, duration).show()
 }
 
+fun Fragment.showSnackbarWithAction(
+    message: CharSequence,
+    actionText: CharSequence,
+    action: () -> Unit,
+    duration: Int = Snackbar.LENGTH_LONG
+) {
+    val requiredView = view ?: return
+    Snackbar.make(requiredView, message, duration)
+        .setAction(actionText) { action() }
+        .show()
+}
+
 fun Fragment.showAlertDialog(
     title: String,
     message: String,

owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt

@@ -57,6 +57,7 @@ import com.owncloud.android.extensions.openOCFile
 import com.owncloud.android.extensions.sendDownloadedFilesByShareSheet
 import com.owncloud.android.extensions.showErrorInSnackbar
 import com.owncloud.android.extensions.showMessageInSnackbar
+import com.owncloud.android.extensions.showSnackbarWithAction
 import com.owncloud.android.presentation.authentication.ACTION_UPDATE_EXPIRED_TOKEN
 import com.owncloud.android.presentation.authentication.EXTRA_ACCOUNT
 import com.owncloud.android.presentation.authentication.EXTRA_ACTION
@@ -163,16 +164,18 @@ class FileDetailsFragment : FileFragment() {
             when (uiResult) {
                 is UIResult.Error -> {
                     if (uiResult.error is AccountNotFoundException) {
-                        Snackbar.make(view, getString(R.string.sync_fail_ticker_unauthorized), Snackbar.LENGTH_INDEFINITE)
-                            .setAction(R.string.auth_oauth_failure_snackbar_action) {
+                        showSnackbarWithAction(
+                            message = getString(R.string.sync_fail_ticker_unauthorized),
+                            actionText = getString(R.string.auth_oauth_failure_snackbar_action),
+                            action = {
                                 val updateAccountCredentials = Intent(requireActivity(), LoginActivity::class.java)
                                 updateAccountCredentials.apply {
                                     putExtra(EXTRA_ACCOUNT, fileDetailsViewModel.getAccount())
                                     putExtra(EXTRA_ACTION, ACTION_UPDATE_EXPIRED_TOKEN)
                                     addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
                                 }
                                 startActivity(updateAccountCredentials)
-                            }.show()
+                            })
                     } else {
                         showErrorInSnackbar(R.string.sync_fail_ticker, uiResult.error)
                         fileDetailsViewModel.updateActionInDetailsView(NONE)

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -58,8 +58,11 @@
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.errorhandling.ErrorMessageAdapter;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
+import kotlin.Unit;
 import timber.log.Timber;
 
+import static com.owncloud.android.extensions.ActivityExtKt.showSnackbarWithAction;
+
 /**
  * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s .
  */
@@ -278,18 +281,32 @@ protected void showRequestAccountChangeNotice(String errorMessage, boolean mustC
                     .setCancelable(false)
                     .show();
         } else {
-            Snackbar.make(findViewById(android.R.id.content), errorMessage, Snackbar.LENGTH_INDEFINITE)
-                    .setAction(R.string.auth_oauth_failure_snackbar_action, v ->
-                            requestCredentialsUpdate())
-                    .show();
+            showSnackbarWithAction(
+                this,
+                errorMessage,
+                getString(R.string.auth_oauth_failure_snackbar_action),
+                () -> {
+                    requestCredentialsUpdate();
+                    return Unit.INSTANCE;
+                },
+                Snackbar.LENGTH_INDEFINITE,
+                android.R.id.content
+            );
         }
     }
 
     protected void showRequestRegainAccess() {
-        Snackbar.make(findViewById(android.R.id.content), R.string.auth_oauth_failure, Snackbar.LENGTH_INDEFINITE)
-                .setAction(R.string.auth_oauth_failure_snackbar_action, v ->
-                        requestCredentialsUpdate())
-                .show();
+        showSnackbarWithAction(
+            this,
+            getString(R.string.auth_oauth_failure),
+            getString(R.string.auth_oauth_failure_snackbar_action),
+            () -> {
+                requestCredentialsUpdate();
+                return Unit.INSTANCE;
+            },
+            Snackbar.LENGTH_INDEFINITE,
+                android.R.id.content
+        );
     }
 
     /**