diff --git a/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt b/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt index f9e4b12e80c4..1a7e60379c63 100644 --- a/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt +++ b/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt @@ -10,7 +10,6 @@ import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar import com.owncloud.android.R @@ -49,10 +48,9 @@ class ShowErrorActivity : AppCompatActivity() { private fun createErrorTitle() = String.format(getString(R.string.error_crash_title), getString(R.string.app_name)) private fun reportIssue() { - ClipboardUtil.copyToClipboard(this, binding.textViewError.text.toString(), false) + ClipboardUtil.copyToClipboard(this, binding.textViewError.text.toString(), true) val issueLink = getString(R.string.report_issue_link) DisplayUtils.startLinkIntent(this, issueLink) - Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_LONG).show() } override fun onCreateOptionsMenu(menu: Menu): Boolean { diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java index cc64609ac45a..699b2d927e87 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java @@ -368,10 +368,6 @@ default void onDarkThemeModeChanged(DarkMode mode) { void setGlobalUploadPaused(boolean globalPausedState); - void setPdfZoomTipShownCount(int count); - - int getPdfZoomTipShownCount(); - boolean isStoragePermissionRequested(); void setStoragePermissionRequested(boolean value); diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java index e8e09296344a..3d6330923ec6 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java @@ -98,7 +98,6 @@ public final class AppPreferencesImpl implements AppPreferences { private static final String PREF__GLOBAL_PAUSE_STATE = "global_pause_state"; - private static final String PREF__PDF_ZOOM_TIP_SHOWN = "pdf_zoom_tip_shown"; private static final String PREF__MEDIA_FOLDER_LAST_PATH = "media_folder_last_path"; private static final String PREF__STORAGE_PERMISSION_REQUESTED = "storage_permission_requested"; private static final String PREF__IN_APP_REVIEW_DATA = "in_app_review_data"; @@ -755,16 +754,6 @@ public void setGlobalUploadPaused(boolean globalPausedState) { preferences.edit().putBoolean(PREF__GLOBAL_PAUSE_STATE, globalPausedState).apply(); } - @Override - public void setPdfZoomTipShownCount(int count) { - preferences.edit().putInt(PREF__PDF_ZOOM_TIP_SHOWN, count).apply(); - } - - @Override - public int getPdfZoomTipShownCount() { - return preferences.getInt(PREF__PDF_ZOOM_TIP_SHOWN, 0); - } - @Override public boolean isStoragePermissionRequested() { return preferences.getBoolean(PREF__STORAGE_PERMISSION_REQUESTED, false); diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index ac63db306fb0..e7452f0acd4c 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -257,7 +257,6 @@ protected void onPostExecute(Boolean result) { if (result) { // nothing else to do in this activity - DisplayUtils.showSnackMessage(findViewById(android.R.id.content), R.string.foreign_files_success); finish(); } else { DisplayUtils.showSnackMessage(findViewById(android.R.id.content), R.string.foreign_files_fail); diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index 6c9954b9787c..67e0715c5426 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -259,7 +259,6 @@ class FileDisplayActivity : intent?.let { handleCommonIntents(it) - handleAccountSwitchIntent(it) } loadSavedInstanceState(savedInstanceState) @@ -598,17 +597,6 @@ class FileDisplayActivity : startActivity(intent) } - private fun handleAccountSwitchIntent(intent: Intent) { - if (intent.action != RESTART) { - return - } - - val accountName = accountManager.user.accountName - val message = getString(R.string.logged_in_as) - val snackBarMessage = String.format(message, accountName) - DisplayUtils.showSnackMessage(this, snackBarMessage) - } - private fun handleSearchIntent(intent: Intent) { val searchEvent = intent.getParcelableArgument( OCFileListFragment.SEARCH_EVENT, @@ -2100,13 +2088,6 @@ class FileDisplayActivity : private fun onRemoveFileOperationFinish(operation: RemoveFileOperation, result: RemoteOperationResult<*>) { deleteBatchTracker.onSingleDeleteFinished() - if (!operation.isInBackground) { - DisplayUtils.showSnackMessage( - this, - ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()) - ) - } - if (result.isSuccess) { val removedFile = operation.file tryStopPlaying(removedFile) @@ -2165,8 +2146,6 @@ class FileDisplayActivity : if (leftFragment is FileDetailFragment) { leftFragment.getFileDetailActivitiesFragment().reload() } - - DisplayUtils.showSnackMessage(this, R.string.file_version_restored_successfully) } else { DisplayUtils.showSnackMessage(this, R.string.file_version_restored_error) } diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java index b4d086967d55..b071a92a9eff 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java @@ -1043,15 +1043,6 @@ public void exportFiles(Collection files, Context context, View view, BackgroundJobManager backgroundJobManager) { - if (context != null && view != null) { - DisplayUtils.showSnackMessage(view, - context.getResources().getQuantityString( - R.plurals.export_start, - files.size(), - files.size() - )); - } - backgroundJobManager.startImmediateFilesExportJob(files); } diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt index 30266b027b9b..6ed9b4297b0f 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt @@ -605,8 +605,10 @@ class PreviewMediaActivity : override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>?) { super.onRemoteOperationFinish(operation, result) if (operation is RemoveFileOperation) { - val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources) - DisplayUtils.showSnackMessage(this, errorMessage) + if (result?.isSuccess == false) { + val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources) + DisplayUtils.showSnackMessage(this, errorMessage) + } val removedFile = operation.file val fileAvailable: Boolean = storageManager.fileExists(removedFile.fileId) diff --git a/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfFragment.kt index 167d79502bfd..261165207fc9 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfFragment.kt @@ -88,12 +88,6 @@ class PreviewPdfFragment : requireContext().startActivity(intent) } } - viewModel.showZoomTip.observe(viewLifecycleOwner) { shouldShow -> - if (shouldShow) { - snack = DisplayUtils.showSnackMessage(binding.root, R.string.pdf_zoom_tip) - viewModel.onZoomTipShown() - } - } } override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfViewModel.kt b/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfViewModel.kt index 2bd500ff0868..6c7cdaf71654 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfViewModel.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/pdf/PreviewPdfViewModel.kt @@ -23,10 +23,6 @@ import javax.inject.Inject class PreviewPdfViewModel @Inject constructor(val appPreferences: AppPreferences) : ViewModel() { - companion object { - private const val SHOW_ZOOM_TIP_TIMES = 3 - } - private var _pdfRenderer = MutableLiveData() val pdfRenderer: LiveData get() = _pdfRenderer @@ -35,10 +31,6 @@ class PreviewPdfViewModel @Inject constructor(val appPreferences: AppPreferences val previewImagePath: LiveData get() = _previewImagePath - private var _showZoomTip = MutableLiveData() - val showZoomTip: LiveData - get() = _showZoomTip - override fun onCleared() { super.onCleared() closeRenderer() @@ -59,9 +51,6 @@ class PreviewPdfViewModel @Inject constructor(val appPreferences: AppPreferences closeRenderer() _pdfRenderer.value = PdfRenderer(ParcelFileDescriptor.open(File(file.storagePath), ParcelFileDescriptor.MODE_READ_ONLY)) - if (appPreferences.pdfZoomTipShownCount < SHOW_ZOOM_TIP_TIMES) { - _showZoomTip.value = true - } } fun onClickPage(page: Bitmap) { @@ -72,9 +61,4 @@ class PreviewPdfViewModel @Inject constructor(val appPreferences: AppPreferences _previewImagePath.value = file.path } - - fun onZoomTipShown() { - appPreferences.pdfZoomTipShownCount++ - _showZoomTip.value = false - } } diff --git a/app/src/main/java/com/owncloud/android/utils/ClipboardUtil.kt b/app/src/main/java/com/owncloud/android/utils/ClipboardUtil.kt index b0127464abb4..9eb61912b872 100644 --- a/app/src/main/java/com/owncloud/android/utils/ClipboardUtil.kt +++ b/app/src/main/java/com/owncloud/android/utils/ClipboardUtil.kt @@ -15,7 +15,6 @@ import android.content.Context import android.os.Build import android.os.PersistableBundle import android.text.TextUtils -import android.widget.Toast import androidx.work.Data import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager @@ -38,7 +37,7 @@ object ClipboardUtil { } if (TextUtils.isEmpty(text)) { - Toast.makeText(activity, R.string.clipboard_no_text_to_copy, Toast.LENGTH_SHORT).show() + DisplayUtils.showSnackMessage(activity, R.string.clipboard_no_text_to_copy) return } @@ -49,12 +48,12 @@ object ClipboardUtil { clipboardManager.setPrimaryClip(clip) if (showToast) { - Toast.makeText(activity, R.string.clipboard_text_copied, Toast.LENGTH_SHORT).show() + DisplayUtils.showSnackMessage(activity, R.string.copied) } scheduleClipboardClearWorker(activity, text) } catch (e: Exception) { - Toast.makeText(activity, R.string.clipboard_unexpected_error, Toast.LENGTH_SHORT).show() + DisplayUtils.showSnackMessage(activity, R.string.clipboard_unexpected_error) Log_OC.e(TAG, "Exception caught while copying to clipboard", e) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 033d648b59c3..bf00018d19f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -582,6 +582,7 @@ Send Copy link + Copied Link copied Received no text to copy to clipboard Unexpected error while copying to clipboard @@ -1148,7 +1149,6 @@ Report issue to tracker? (requires a GitHub account) Report %1$s crashed - Copied to clipboard Download latest dev version Changelog dev version Could not download full image @@ -1312,7 +1312,6 @@ Found no images or videos Error creating file from template No app available for sending the selected files - Tap on a page to zoom in All files access Media read-only Don\'t ask