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

Start the reauth webview also when there is no getParentController()

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-04-29 13:54:41 +02:00 committed by Marcel Hibbe
parent 9348f0fcac
commit 3f5c03f1ef
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
package com.nextcloud.talk.controllers; package com.nextcloud.talk.controllers;
import android.animation.AnimatorInflater; import android.animation.AnimatorInflater;
import android.annotation.SuppressLint;
import android.app.SearchManager; import android.app.SearchManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -32,6 +33,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.text.InputType; import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -400,6 +402,7 @@ public class ConversationsListController extends BaseController implements Searc
searchItem.expandActionView(); searchItem.expandActionView();
} }
@SuppressLint("LongLogTag")
private void fetchData(boolean fromBottomSheet) { private void fetchData(boolean fromBottomSheet) {
dispose(null); dispose(null);
@ -478,11 +481,18 @@ public class ConversationsListController extends BaseController implements Searc
case 401: case 401:
if (getParentController() != null && if (getParentController() != null &&
getParentController().getRouter() != null) { getParentController().getRouter() != null) {
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 {
Log.d(TAG, "Starting reauth webview via ConversationsListController");
getRouter().pushController(RouterTransaction.with(
new WebViewLoginController(currentUser.getBaseUrl(), true))
.pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()));
} }
break; break;
default: default: