android/app/src/main/AndroidManifest.xml
|6 +--
android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
|4 +-
android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
| 17 --
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
| 10 ++---
android/app/src/main/res/layout/activity_show_html.xml
|2 -
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
| 10 ++---
6 files changed, 17 insertions(+), 32 deletions(-)
New commits:
commit 1d549fa9dd423d91cba23ea10acc2d8a36ef5122
Author: Jan Holesovsky
AuthorDate: Tue Jul 23 12:38:41 2019 +0200
Commit: Jan Holesovsky
CommitDate: Tue Jul 23 12:40:09 2019 +0200
android: Obviously we need to request for writing, not only reading.
Change-Id: I68927593bd17a6ee6de0c1d879d6b05372c1350e
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 3d6838a12..ce1243348 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -64,7 +64,7 @@ public class LOActivity extends AppCompatActivity {
final static String TAG = "LOActivity";
private static final String ASSETS_EXTRACTED_PREFS_KEY =
"ASSETS_EXTRACTED";
-private static final int PERMISSION_READ_EXTERNAL_STORAGE = 777;
+private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 777;
private static final String KEY_ENABLE_SHOW_DEBUG_INFO =
"ENABLE_SHOW_DEBUG_INFO";
private static final String KEY_PROVIDER_ID = "providerID";
@@ -327,11 +327,11 @@ public class LOActivity extends AppCompatActivity {
}
});
-if (ContextCompat.checkSelfPermission(this,
Manifest.permission.READ_EXTERNAL_STORAGE) !=
PackageManager.PERMISSION_GRANTED) {
+if (ContextCompat.checkSelfPermission(this,
Manifest.permission.WRITE_EXTERNAL_STORAGE) !=
PackageManager.PERMISSION_GRANTED) {
Log.i(TAG, "asking for read storage permission");
ActivityCompat.requestPermissions(this,
-new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
-PERMISSION_READ_EXTERNAL_STORAGE);
+new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+PERMISSION_WRITE_EXTERNAL_STORAGE);
} else {
loadDocument();
}
@@ -352,7 +352,7 @@ public class LOActivity extends AppCompatActivity {
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[]
permissions, @NonNull int[] grantResults) {
switch (requestCode) {
-case PERMISSION_READ_EXTERNAL_STORAGE:
+case PERMISSION_WRITE_EXTERNAL_STORAGE:
if (permissions.length > 0 && grantResults[0] ==
PackageManager.PERMISSION_GRANTED) {
loadDocument();
} else {
commit a04ed68104b3091ebac767fdd5f4157596135a87
Author: Jan Holesovsky
AuthorDate: Tue Jul 23 09:46:04 2019 +0200
Commit: Jan Holesovsky
CommitDate: Tue Jul 23 12:40:09 2019 +0200
android: No need for the extra wrapper, use the LOActivity directly.
Change-Id: Ie4afaedcc3b255c83c570acea02101d284e85653
diff --git a/android/app/src/main/AndroidManifest.xml
b/android/app/src/main/AndroidManifest.xml
index 8a776f3be..ae17c0878 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
android:supportsRtl="true"
android:theme="@style/LibreOfficeTheme">
-
@@ -43,7 +43,7 @@
-
+
@@ -128,4 +128,4 @@
android:theme="@style/Theme.AppCompat.Light" />
-
\ No newline at end of file
+
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
index 397cde677..d101c2914 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
@@ -25,6 +25,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
+import org.libreoffice.androidlib.LOActivity;
+
public class AboutDialogFragment extends DialogFragment {
private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
@@ -103,7 +105,7 @@ public class AboutDialogFragment extends DialogFragment {
.setNeutralButton(R.string.about_moreinfo, new
DialogInterface.OnClickListener() {
@Override
