Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import android.text.style.StyleSpan
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.annotation.IdRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.os.bundleOf
Expand Down Expand Up @@ -123,8 +122,8 @@ class FileActionsBottomSheet :

FileActionsViewModel.UiState.Loading -> {}
FileActionsViewModel.UiState.Error -> {
context?.let {
Toast.makeText(it, R.string.error_file_actions, Toast.LENGTH_SHORT).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.error_file_actions)
}
dismissAllowingStateLoss()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.annotation.IdRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.os.bundleOf
Expand Down Expand Up @@ -108,8 +107,8 @@ class TrashbinFileActionsBottomSheet :

TrashbinFileActionsViewModel.UiState.Loading -> {}
TrashbinFileActionsViewModel.UiState.Error -> {
context?.let {
Toast.makeText(it, R.string.error_file_actions, Toast.LENGTH_SHORT).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.error_file_actions)
}
dismissAllowingStateLoss()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;

import com.blikoon.qrcodescanner.QrCodeActivity;
import com.google.android.material.button.MaterialButton;
Expand Down Expand Up @@ -859,7 +858,7 @@ protected void onNewIntent(Intent intent) {
if (data != null && data.toString().startsWith(getString(R.string.login_data_own_scheme))) {
if (!MDMConfig.INSTANCE.multiAccountSupport(this) &&
accountManager.getAccounts().length == 1) {
Toast.makeText(this, R.string.no_mutliple_accounts_allowed, Toast.LENGTH_LONG).show();
DisplayUtils.showSnackMessage(this, R.string.no_mutliple_accounts_allowed);
finish();
return;
} else {
Expand Down Expand Up @@ -1307,18 +1306,23 @@ private void updateAuthStatusIconAndText(RemoteOperationResult result) {
case ACCOUNT_NOT_NEW:
mAuthStatusText = getString(R.string.auth_account_not_new);
if (!showWebViewLoginUrl) {
DisplayUtils.showErrorAndFinishActivity(this, mAuthStatusText);
showErrorAndFinishActivity();
}
break;
case UNHANDLED_HTTP_CODE:
default:
mAuthStatusText = ErrorMessageAdapter.getErrorCauseMessage(result, null, getResources());
if (!showWebViewLoginUrl) {
DisplayUtils.showErrorAndFinishActivity(this, mAuthStatusText);
showErrorAndFinishActivity();
}
}
}

private void showErrorAndFinishActivity() {
DisplayUtils.showSnackMessage(this, mAuthStatusText);
finish();
}

private void updateStatusIconFailUserName(int failedStatusText) {
mAuthStatusIcon = R.drawable.ic_alert;
mAuthStatusText = getResources().getString(failedStatusText);
Expand Down Expand Up @@ -1588,7 +1592,7 @@ private void startQRScanner() {

if (!MDMConfig.INSTANCE.multiAccountSupport(this) &&
accountManager.getAccounts().length == 1) {
Toast.makeText(this, R.string.no_mutliple_accounts_allowed, Toast.LENGTH_LONG).show();
DisplayUtils.showSnackMessage(this, R.string.no_mutliple_accounts_allowed);
} else {
parseAndLoginFromWebView(resultData);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package com.owncloud.android.authentication

import android.os.Bundle
import android.widget.TextView
import android.widget.Toast
import com.nextcloud.client.di.Injectable
import com.nextcloud.utils.mdm.MDMConfig
import com.owncloud.android.R
import com.owncloud.android.utils.DisplayUtils

class DeepLinkLoginActivity :
AuthenticatorActivity(),
Expand All @@ -21,7 +21,7 @@ class DeepLinkLoginActivity :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (!MDMConfig.multiAccountSupport(this) && accountManager.accounts.size == 1) {
Toast.makeText(this, R.string.no_mutliple_accounts_allowed, Toast.LENGTH_LONG).show()
DisplayUtils.showSnackMessage(this, R.string.no_mutliple_accounts_allowed)
return
}

Expand All @@ -37,8 +37,8 @@ class DeepLinkLoginActivity :
loginUrlInfo.loginName,
loginUrlInfo.server
)
} catch (e: IllegalArgumentException) {
Toast.makeText(this, R.string.direct_login_failed, Toast.LENGTH_LONG).show()
} catch (_: IllegalArgumentException) {
DisplayUtils.showSnackMessage(this, R.string.direct_login_failed)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import android.app.NotificationManager
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.fragment.app.FragmentTransaction
import androidx.lifecycle.lifecycleScope
import com.nextcloud.client.account.User
Expand All @@ -41,6 +40,7 @@ import com.owncloud.android.lib.resources.files.model.RemoteFile
import com.owncloud.android.ui.dialog.ConflictsResolveDialog
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.FileStorageUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -356,7 +356,7 @@ class ConflictsResolveActivity :
private fun showErrorAndFinish(code: Int? = null) {
val message = parseErrorMessage(code)
lifecycleScope.launch(Dispatchers.Main) {
Toast.makeText(this@ConflictsResolveActivity, message, Toast.LENGTH_LONG).show()
DisplayUtils.showSnackMessage(this@ConflictsResolveActivity, message)
finish()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.widget.Toast;

import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.account.User;
Expand Down Expand Up @@ -95,8 +94,7 @@ public void onUrlLoaded(String loadedUrl) {
}
}, 10 * 1000);
} else {
Toast.makeText(getApplicationContext(),
R.string.richdocuments_failed_to_load_document, Toast.LENGTH_LONG).show();
DisplayUtils.showSnackMessage(this,R.string.richdocuments_failed_to_load_document);
finish();
}
}
Expand Down Expand Up @@ -152,7 +150,7 @@ public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathC
activity.startActivityForResult(intent, REQUEST_LOCAL_FILE);
} catch (ActivityNotFoundException e) {
uploadMessage = null;
Toast.makeText(getBaseContext(), "Cannot open file chooser", Toast.LENGTH_LONG).show();
DisplayUtils.showSnackMessage(EditorWebView.this, R.string.editor_web_view_cannot_open_file);
return false;
}

Expand All @@ -163,8 +161,7 @@ public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathC
setFile(IntentExtensionsKt.getParcelableArgument(getIntent(), ExternalSiteWebView.EXTRA_FILE, OCFile.class));

if (getFile() == null) {
Toast.makeText(getApplicationContext(),
R.string.richdocuments_failed_to_load_document, Toast.LENGTH_LONG).show();
DisplayUtils.showSnackMessage(this, R.string.richdocuments_failed_to_load_document);
finish();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;

import com.google.android.material.button.MaterialButton;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
Expand Down Expand Up @@ -247,10 +246,9 @@ protected void onStart() {
super.onStart();

if (mAccountManager.getAccountsByType(MainApp.getAccountType(this)).length == 0) {
Toast.makeText(this,
String.format(getString(R.string.uploader_wrn_no_account_text),
getString(R.string.app_name)),
Toast.LENGTH_LONG).show();
final var message = String.format(getString(R.string.uploader_wrn_no_account_text),
getString(R.string.app_name));
DisplayUtils.showSnackMessage(this, message);
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import android.widget.Toast;

import com.nextcloud.client.preferences.AppPreferencesImpl;
import com.owncloud.android.R;
Expand Down Expand Up @@ -55,7 +54,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
} else if (resultCode == Activity.RESULT_CANCELED) {
finishWithResult(KEY_CHECK_RESULT_CANCEL);
} else {
Toast.makeText(this, R.string.default_credentials_wrong, Toast.LENGTH_SHORT).show();
DisplayUtils.showSnackMessage(this, R.string.default_credentials_wrong);
requestCredentials();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ package com.owncloud.android.ui.activity

import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.nextcloud.client.account.User
import com.nextcloud.utils.extensions.getParcelableArgument
import com.owncloud.android.R
import com.owncloud.android.ui.dialog.setupEncryption.SetupEncryptionDialogFragment
import com.owncloud.android.utils.DisplayUtils

class SetupEncryptionActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -23,7 +23,7 @@ class SetupEncryptionActivity : AppCompatActivity() {
val user = intent?.getParcelableArgument("EXTRA_USER", User::class.java)

if (user == null) {
Toast.makeText(this, getString(R.string.error_showing_encryption_dialog), Toast.LENGTH_LONG).show()
DisplayUtils.showSnackMessage(this, R.string.error_showing_encryption_dialog)
finish()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package com.owncloud.android.ui.activity

import android.annotation.SuppressLint
import android.widget.Toast
import androidx.core.net.toUri
import androidx.webkit.WebSettingsCompat
import androidx.webkit.WebViewFeature
Expand All @@ -18,6 +17,7 @@ import com.nextcloud.client.device.DeviceInfo
import com.nextcloud.utils.EditorUtils
import com.owncloud.android.R
import com.owncloud.android.ui.asynctasks.TextEditorLoadUrlTask
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.theme.ThemeUtils
import javax.inject.Inject

Expand All @@ -39,7 +39,7 @@ class TextEditorWebView : EditorWebView() {
super.postOnCreate()

if (!user.isPresent) {
Toast.makeText(this, getString(R.string.failed_to_start_editor), Toast.LENGTH_LONG).show()
DisplayUtils.showSnackMessage(this, R.string.failed_to_start_editor)
finish()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import android.content.Context
import android.content.DialogInterface
import android.os.Bundle
import android.view.View
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.DialogFragment
Expand Down Expand Up @@ -79,7 +78,7 @@ class ConflictsResolveDialog :

try {
listener = context as OnConflictDecisionMadeListener
} catch (e: ClassCastException) {
} catch (_: ClassCastException) {
throw ClassCastException("Activity of this dialog must implement OnConflictDecisionMadeListener")
}
}
Expand All @@ -90,7 +89,9 @@ class ConflictsResolveDialog :
val alertDialog = dialog as AlertDialog?

if (alertDialog == null) {
Toast.makeText(context, "Failed to create conflict dialog", Toast.LENGTH_LONG).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.failed_to_create_conflict_dialog)
}
return
}

Expand All @@ -116,7 +117,9 @@ class ConflictsResolveDialog :
rightDataFile = bundle.getParcelableArgument(ARG_RIGHT_FILE, OCFile::class.java)
user = bundle.getParcelableArgument(ARG_USER, User::class.java)
} else {
Toast.makeText(context, "Failed to create conflict dialog", Toast.LENGTH_LONG).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.failed_to_create_conflict_dialog)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.recyclerview.widget.GridLayoutManager
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.nextcloud.android.common.ui.theme.utils.ColorRole
Expand All @@ -27,6 +26,7 @@ import com.owncloud.android.databinding.SendFilesFragmentBinding
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.ui.adapter.SendButtonAdapter
import com.owncloud.android.ui.components.SendButtonData
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject

Expand Down Expand Up @@ -68,7 +68,9 @@ class SendFilesDialog :
val matches = requireActivity().packageManager.queryIntentActivities(sendIntent, 0)

if (matches.isEmpty()) {
Toast.makeText(context, R.string.no_send_app, Toast.LENGTH_SHORT).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.no_send_app)
}
dismiss()
return
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.Toast;

import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
Expand Down Expand Up @@ -587,10 +586,7 @@ public void scanDocUpload() {
} else {
Log.w(TAG, "scanDocUpload: Failed to start doc scanning, fileDisplayActivity=" + fileDisplayActivity +
", currentFile=" + currentFile);
Toast.makeText(getContext(),
getString(R.string.error_starting_doc_scan),
Toast.LENGTH_SHORT)
.show();
DisplayUtils.showSnackMessage(this, R.string.error_starting_doc_scan);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.CompoundButton
import android.widget.DatePicker
import android.widget.Toast
import androidx.core.app.ActivityCompat
import androidx.lifecycle.lifecycleScope
import com.nextcloud.client.account.User
Expand Down Expand Up @@ -522,7 +521,9 @@ class BackupFragment :
private fun openDate(savedDate: Calendar?) {
val contactsPreferenceActivity = activity as ContactsPreferenceActivity?
if (contactsPreferenceActivity == null) {
Toast.makeText(context, getString(R.string.error_choosing_date), Toast.LENGTH_LONG).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.error_choosing_date)
}
return
}

Expand Down Expand Up @@ -584,7 +585,9 @@ class BackupFragment :
override fun onDateSet(view: DatePicker, year: Int, month: Int, dayOfMonth: Int) {
val contactsPreferenceActivity = activity as ContactsPreferenceActivity?
if (contactsPreferenceActivity == null) {
Toast.makeText(context, getString(R.string.error_choosing_date), Toast.LENGTH_LONG).show()
activity?.let {
DisplayUtils.showSnackMessage(it, R.string.error_choosing_date)
}
return
}

Expand Down
Loading
Loading