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

Fix #72

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-22 11:51:09 +01:00
parent b973ae99b4
commit 8168bff27b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
View File

@ -23,6 +23,7 @@ package com.nextcloud.talk.controllers;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.net.http.SslCertificate; import android.net.http.SslCertificate;
import android.net.http.SslError; import android.net.http.SslError;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChainException; import android.security.KeyChainException;
@ -43,7 +44,6 @@ import android.widget.ProgressBar;
import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.RouterTransaction;
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
import com.nextcloud.talk.R; import com.nextcloud.talk.R;
import com.nextcloud.talk.api.helpers.api.ApiHelper;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.controllers.base.BaseController; import com.nextcloud.talk.controllers.base.BaseController;
import com.nextcloud.talk.events.CertificateEvent; import com.nextcloud.talk.events.CertificateEvent;
@ -65,6 +65,7 @@ import java.security.PrivateKey;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
@ -116,6 +117,11 @@ public class WebViewLoginController extends BaseController {
super(args); super(args);
} }
private static String getWebLoginUserAgent() {
return Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) +
Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + " " + Build.MODEL;
}
@Override @Override
protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) { protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
return inflater.inflate(R.layout.controller_web_view_login, container, false); return inflater.inflate(R.layout.controller_web_view_login, container, false);
@ -141,7 +147,7 @@ public class WebViewLoginController extends BaseController {
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(false); webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(false);
webView.getSettings().setDomStorageEnabled(true); webView.getSettings().setDomStorageEnabled(true);
webView.getSettings().setUserAgentString(ApiHelper.getUserAgent()); webView.getSettings().setUserAgentString(getWebLoginUserAgent());
webView.getSettings().setSaveFormData(false); webView.getSettings().setSaveFormData(false);
webView.getSettings().setSavePassword(false); webView.getSettings().setSavePassword(false);
webView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); webView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
@ -245,7 +251,6 @@ public class WebViewLoginController extends BaseController {
webView.loadUrl(baseUrl + "/index.php/login/flow", headers); webView.loadUrl(baseUrl + "/index.php/login/flow", headers);
} }
private void dispose() { private void dispose() {
if (userQueryDisposable != null && !userQueryDisposable.isDisposed()) { if (userQueryDisposable != null && !userQueryDisposable.isDisposed()) {
userQueryDisposable.dispose(); userQueryDisposable.dispose();
@ -380,5 +385,4 @@ public class WebViewLoginController extends BaseController {
getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR); getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
} }
} }
} }