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

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

View File

@ -33,7 +33,7 @@ Why a WebApp is better than using the mobile site on a browser?
Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
### Device Requirements
The minimum version supported is Ice Cream Sandwich, Android v4.0.3 / API 15
The minimum version supported is Jelly Bean, Android v4.2.0 / API 17
### App Permissions
It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.

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"

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