gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 13:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

set showUnauthorizedDialog to modal

Browse Source 
avoid crash when login view is shown after coming from showUnauthorizedDialog

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-04-30 15:35:20 +02:00
parent c2032b6554
commit 4f0a813512
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -263,7 +263,9 @@ public class ConversationsListController extends BaseController implements Searc
@Override @Override
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
if (!eventBus.isRegistered(this)) {
eventBus.register(this); eventBus.register(this);
}
currentUser = userUtils.getCurrentUser(); currentUser = userUtils.getCurrentUser();
@ -480,12 +482,10 @@ public class ConversationsListController extends BaseController implements Searc
HttpException exception = (HttpException) throwable; HttpException exception = (HttpException) throwable;
switch (exception.code()) { switch (exception.code()) {
case 401: case 401:
if (getParentController() != null && if (getParentController() != null && getParentController().getRouter() != null) {
getParentController().getRouter() != null) {
Log.d(TAG, "Starting reauth webview via getParentController()"); Log.d(TAG, "Starting reauth webview via getParentController()");
getParentController().getRouter().pushController((RouterTransaction.with getParentController().getRouter().pushController((RouterTransaction.with
(new WebViewLoginController(currentUser.getBaseUrl(), (new WebViewLoginController(currentUser.getBaseUrl(), true))
true))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()))); .popChangeHandler(new VerticalChangeHandler())));
} else { } else {
@ -827,6 +827,7 @@ public class ConversationsListController extends BaseController implements Searc
.setIcon(DisplayUtils.getTintedDrawable(context.getResources(), .setIcon(DisplayUtils.getTintedDrawable(context.getResources(),
R.drawable.ic_delete_black_24dp, R.color.bg_default)) R.drawable.ic_delete_black_24dp, R.color.bg_default))
.setPositiveButtonColor(context.getResources().getColor(R.color.nc_darkRed)) .setPositiveButtonColor(context.getResources().getColor(R.color.nc_darkRed))
.setCancelable(false)
.setTitle(R.string.nc_dialog_invalid_password) .setTitle(R.string.nc_dialog_invalid_password)
.setMessage(R.string.nc_dialog_reauth_or_delete) .setMessage(R.string.nc_dialog_reauth_or_delete)
.setPositiveButton(R.string.nc_delete, new View.OnClickListener() { .setPositiveButton(R.string.nc_delete, new View.OnClickListener() {