vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-09 18:29:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:diaspora-for-android/diaspora-android

Browse source
This commit is contained in:
Gregor Santner 2016-08-07 00:32:40 +02:00
commit 21006f60e1
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -8,7 +8,7 @@ android {
defaultConfig {
applicationId "com.github.dfa.diaspora_android"
minSdkVersion 15
minSdkVersion 17
targetSdkVersion 24
versionCode 5
versionName "0.1.4"

2
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -261,7 +261,6 @@ public class MainActivity extends AppCompatActivity
private void setupWebView(Bundle savedInstanceState) {
webSettings = webView.getSettings();
//TODO: Dangerous on API < 17. Can we do anything about this?
webSettings.setJavaScriptEnabled(true);
webSettings.setUseWideViewPort(true);
webSettings.setLoadWithOverviewMode(true);
@ -284,7 +283,6 @@ public class MainActivity extends AppCompatActivity
webView.setOverScrollMode(WebView.OVER_SCROLL_ALWAYS);
// Setup WebView
//TODO: Dangerous on API < 17. Can we do anything about this?
webView.addJavascriptInterface(new JavaScriptInterface(), "AndroidBridge");
//Set proxy