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

Add support for protocol determination in import

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-01 11:59:47 +01:00
parent d72ac921f8
commit e55f5ca325
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
View File

@ -76,6 +76,7 @@ public class AccountVerificationController extends BaseController {
private Disposable roomsQueryDisposable; private Disposable roomsQueryDisposable;
private Disposable profileQueryDisposable; private Disposable profileQueryDisposable;
private Disposable dbQueryDisposable; private Disposable dbQueryDisposable;
private Disposable statusQueryDisposable;
private String baseUrl; private String baseUrl;
private String username; private String username;
@ -114,6 +115,47 @@ public class AccountVerificationController extends BaseController {
dispose(null); dispose(null);
if (isAccountImport && !baseUrl.startsWith("http://") && !baseUrl.startsWith("https://")) {
determineBaseUrlProtocol(true);
} else {
checkEverything();
}
}
private void determineBaseUrlProtocol(boolean checkForcedHttps) {
cookieManager.getCookieStore().removeAll();
String queryUrl;
if (checkForcedHttps) {
queryUrl = "https://" + baseUrl + ApiHelper.getUrlPostfixForStatus();
} else {
queryUrl = "http://" + baseUrl + ApiHelper.getUrlPostfixForStatus();
}
statusQueryDisposable = ncApi.getServerStatus(queryUrl)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(status -> {
if (checkForcedHttps) {
baseUrl = "https://" + baseUrl;
} else {
baseUrl = "http://" + baseUrl;
}
checkEverything();
}, throwable -> {
if (checkForcedHttps) {
determineBaseUrlProtocol(false);
} else {
abortVerification();
}
}, () -> {
statusQueryDisposable.dispose();
});
}
private void checkEverything() {
String credentials = ApiHelper.getCredentials(username, token); String credentials = ApiHelper.getCredentials(username, token);
cookieManager.getCookieStore().removeAll(); cookieManager.getCookieStore().removeAll();
@ -199,8 +241,6 @@ public class AccountVerificationController extends BaseController {
abortVerification(); abortVerification();
}, () -> dispose(roomsQueryDisposable)); }, () -> dispose(roomsQueryDisposable));
} }
private void dispose(@Nullable Disposable disposable) { private void dispose(@Nullable Disposable disposable) {
@ -222,6 +262,10 @@ public class AccountVerificationController extends BaseController {
dbQueryDisposable = null; dbQueryDisposable = null;
} }
if (statusQueryDisposable != null && !statusQueryDisposable.isDisposed()) {
statusQueryDisposable.dispose();
statusQueryDisposable = null;
}
} }
disposable = null; disposable = null;