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 @@ -87,7 +87,9 @@ fun Activity.showMessageInSnackbar(
message: CharSequence,
duration: Int = Snackbar.LENGTH_LONG
) {
Snackbar.make(findViewById(layoutId), message, duration).show()
// edge-to-edge
val view = if (layoutId == android.R.id.content) window.decorView else findViewById(layoutId)
Snackbar.make(view, message, duration).show()
}

fun Activity.showErrorInToast(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,7 @@ public void dismissLoadingDialog() {
* @param message Message to show.
*/
public void showSnackMessage(String message) {
final View rootView = findViewById(android.R.id.content);

if (rootView == null) {
// If root view is not available don't let the app brake. show the notification anyway.
Toast.makeText(this, message, Toast.LENGTH_LONG).show();
return;
}
final View rootView = getWindow().getDecorView();
Snackbar.make(rootView, message, Snackbar.LENGTH_LONG).show();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,15 @@ protected void showRequestAccountChangeNotice(String errorMessage, boolean mustC
.setCancelable(false)
.show();
} else {
Snackbar.make(findViewById(android.R.id.content), errorMessage, Snackbar.LENGTH_INDEFINITE)
Snackbar.make(getWindow().getDecorView(), errorMessage, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.auth_oauth_failure_snackbar_action, v ->
requestCredentialsUpdate())
.show();
}
}

protected void showRequestRegainAccess() {
Snackbar.make(findViewById(android.R.id.content), R.string.auth_oauth_failure, Snackbar.LENGTH_INDEFINITE)
Snackbar.make(getWindow().getDecorView(), R.string.auth_oauth_failure, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.auth_oauth_failure_snackbar_action, v ->
requestCredentialsUpdate())
.show();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,15 @@ class PreviewVideoActivity : FileActivity(), Player.Listener, OnPrepareVideoPlay
val fileToSetAsAvailableOffline = ArrayList<OCFile>()
fileToSetAsAvailableOffline.add(file)
fileOperationsViewModel.performOperation(SetFilesAsAvailableOffline(fileToSetAsAvailableOffline))
Snackbar.make(binding.root, R.string.confirmation_set_available_offline, Snackbar.LENGTH_LONG).show()
Snackbar.make(window.decorView, R.string.confirmation_set_available_offline, Snackbar.LENGTH_LONG).show()
true
}

R.id.action_unset_available_offline -> {
val fileToUnsetAsAvailableOffline = ArrayList<OCFile>()
fileToUnsetAsAvailableOffline.add(file)
fileOperationsViewModel.performOperation(UnsetFilesAsAvailableOffline(fileToUnsetAsAvailableOffline))
Snackbar.make(binding.root, R.string.confirmation_unset_available_offline, Snackbar.LENGTH_LONG).show()
Snackbar.make(window.decorView, R.string.confirmation_unset_available_offline, Snackbar.LENGTH_LONG).show()
true
}

Expand Down
Loading