MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 13:26:50 +01:00
Code Releases Wiki Activity

Pebble: webview. Use the main thread explicitly again and log XHR requests at least on Lollipop and up

Browse Source
This commit is contained in:
Daniele Gobbetti 2017-01-02 12:07:57 +01:00
parent 4ef0415da2
commit 7ab74fb11b
1 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
View File

@ -12,6 +12,8 @@ import android.webkit.ConsoleMessage;
import android.webkit.JavascriptInterface; import android.webkit.JavascriptInterface;
import android.webkit.ValueCallback; import android.webkit.ValueCallback;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
@ -55,11 +57,12 @@ public class WebViewSingleton extends Activity {
} else { } else {
contextWrapper = new MutableContextWrapper(context); contextWrapper = new MutableContextWrapper(context);
} }
}
//here we are sure that contextWrapper is either null or an activity, hence we run on the main thread
if (contextWrapper != null) {
if (instance == null) { if (instance == null) {
instance = new WebView(contextWrapper); instance = new WebView(contextWrapper);
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
instance.setWillNotDraw(true); instance.setWillNotDraw(true);
instance.clearCache(true); instance.clearCache(true);
instance.setWebViewClient(new GBWebClient()); instance.setWebViewClient(new GBWebClient());
@ -72,18 +75,29 @@ public class WebViewSingleton extends Activity {
//needed for localstorage //needed for localstorage
webSettings.setDatabaseEnabled(true); webSettings.setDatabaseEnabled(true);
} }
});
if (jsInterface == null || (jsInterface != null && (!device.equals(jsInterface.device) || !uuid.equals(jsInterface.mUuid)))) {
instance.removeJavascriptInterface("GBjs");
jsInterface = new JSInterface(device, uuid);
instance.addJavascriptInterface(jsInterface, "GBjs");
instance.loadUrl("file:///android_asset/app_config/configure.html");
} else {
LOG.debug("Not reloading the webview " + jsInterface.mUuid.toString());
} }
} else { } else {
LOG.debug("WEBV: not using the passed context, as it is not an activity"); LOG.debug("WEBV: not using the passed context, as it is not an activity");
} }
if (jsInterface == null || (jsInterface != null && (!device.equals(jsInterface.device) || !uuid.equals(jsInterface.mUuid)))) {
jsInterface = new JSInterface(device, uuid);
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
if (instance != null) {
instance.removeJavascriptInterface("GBjs");
instance.addJavascriptInterface(jsInterface, "GBjs");
instance.loadUrl("file:///android_asset/app_config/configure.html");
}
}
});
} else {
LOG.debug("Not reloading the webview " + jsInterface.mUuid.toString());
}
return instance; return instance;
} }
@ -132,6 +146,15 @@ public class WebViewSingleton extends Activity {
} }
private static class GBWebClient extends WebViewClient { private static class GBWebClient extends WebViewClient {
@Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
LOG.debug("WEBVIEW shouldInterceptRequest URL" + request.getUrl());
}
LOG.debug("WEBVIEW request:" + request.toString());
return super.shouldInterceptRequest(view, request);
}
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
if (url.startsWith("http://") || url.startsWith("https://")) { if (url.startsWith("http://") || url.startsWith("https://")) {