diff --git a/app/build.gradle b/app/build.gradle index 932044c..f3e81d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "nl.privacydragon.bookwyrm" minSdk 23 targetSdk 31 - versionCode 8 - versionName "1.3.1" + versionCode 9 + versionName "1.3.2" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/app/release/Bookwyrm-v1.3.1.apk b/app/release/Bookwyrm-v1.3.1.apk deleted file mode 100644 index 7b4afba..0000000 Binary files a/app/release/Bookwyrm-v1.3.1.apk and /dev/null differ diff --git a/app/release/Bookwyrm-v1.3.2.apk b/app/release/Bookwyrm-v1.3.2.apk new file mode 100644 index 0000000..ba1a76b Binary files /dev/null and b/app/release/Bookwyrm-v1.3.2.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 07dded1..d256f0d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 8, - "versionName": "1.3.1", + "versionCode": 9, + "versionName": "1.3.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd3154c..9dd3920 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,13 +5,11 @@ + + - - + diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java index db777eb..aa6e556 100644 --- a/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java +++ b/app/src/main/java/nl/privacydragon/bookwyrm/HandlerActivity.java @@ -70,6 +70,7 @@ public class HandlerActivity extends AppCompatActivity { // End of auto-generated stuff LoadIndicator = (ProgressBar) findViewById(R.id.progressBar3); myWebView = (WebView) findViewById(R.id.webview); + myWebView.setVisibility(View.GONE); myWebView.getSettings().setJavaScriptEnabled(true); myWebView.getSettings().setDomStorageEnabled(true); myWebView.addJavascriptInterface(new Object() @@ -176,6 +177,7 @@ public class HandlerActivity extends AppCompatActivity { myWebView.setWebViewClient(new HandlerActivity.MyWebViewClient() { public void onPageFinished(WebView view, String url) { LoadIndicator.setVisibility(View.GONE); + myWebView.setVisibility(View.VISIBLE); view.loadUrl("javascript:(function() { document.getElementById('id_password').value = '" + passw + "'; ;})()"); view.loadUrl("javascript:(function() { document.getElementById('id_localname').value = '" + name + "'; ;})()"); @@ -216,7 +218,7 @@ public class HandlerActivity extends AppCompatActivity { // Need to accept permissions to use the camera @Override public void onPermissionRequest(PermissionRequest request) { - String permission = Manifest.permission.CAMERA; + String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE; int grant = ContextCompat.checkSelfPermission(HandlerActivity.this, permission); if (grant != PackageManager.PERMISSION_GRANTED) { String[] permission_list = new String[1]; @@ -226,7 +228,7 @@ public class HandlerActivity extends AppCompatActivity { request.grant(request.getResources()); final String[] requestedResources = request.getResources(); for (String r : requestedResources) { - if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) { + if (r.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) { request.grant(new String[]{PermissionRequest.RESOURCE_VIDEO_CAPTURE}); break; } diff --git a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java index 9efc252..7146231 100644 --- a/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java +++ b/app/src/main/java/nl/privacydragon/bookwyrm/StartActivity.java @@ -54,6 +54,7 @@ public class StartActivity extends AppCompatActivity { setContentView(R.layout.activity_start); LoadIndicator = (ProgressBar) findViewById(R.id.progressBar3); myWebView = (WebView) findViewById(R.id.webview); + myWebView.setVisibility(View.GONE); myWebView.getSettings().setJavaScriptEnabled(true); myWebView.addJavascriptInterface(new Object() { @@ -138,6 +139,7 @@ public class StartActivity extends AppCompatActivity { myWebView.setWebViewClient(new MyWebViewClient(){ public void onPageFinished(WebView view, String url) { LoadIndicator.setVisibility(View.GONE); + myWebView.setVisibility(View.VISIBLE); view.loadUrl("javascript:(function() { document.getElementById('id_password_confirm').value = '" + passw + "'; ;})()"); view.loadUrl("javascript:(function() { document.getElementById('id_localname_confirm').value = '" + name + "'; ;})()"); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4978aa1..95985be 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,7 +26,7 @@ android:id="@+id/Instance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="5dp" + android:layout_marginStart="10dp" android:layout_marginEnd="1dp" android:layout_marginBottom="262dp" android:hint="bookwyrm.social" @@ -41,7 +41,7 @@ android:id="@+id/Username" android:layout_width="409dp" android:layout_height="wrap_content" - android:layout_marginStart="1dp" + android:layout_marginStart="10dp" android:layout_marginEnd="1dp" android:layout_marginBottom="284dp" android:hint="Username" @@ -55,7 +55,7 @@ + +