android: added permissions checks to allow custom datadir read/write

bitcoin-core · Mar 22, 2024 · 7d4a331 · 7d4a331
1 parent 734e509
commit 7d4a331
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/qt/android/AndroidManifest.xml b/src/qt/android/AndroidManifest.xml
@@ -3,7 +3,9 @@
     <uses-sdk android:targetSdkVersion="24"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java b/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java
@@ -8,13 +8,17 @@
 import android.system.Os;
 import android.view.WindowManager;
 import android.view.View;
+import android.Manifest;
+import android.content.pm.PackageManager;
 
 import org.qtproject.qt5.android.bindings.QtActivity;
 
 import java.io.File;
 
 public class BitcoinQtActivity extends QtActivity
 {
+    private static final int PERMISSIONS_REQUEST_CODE = 123;
+
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
@@ -36,5 +40,22 @@ public void onCreate(Bundle savedInstanceState)
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
             WindowManager.LayoutParams.FLAG_FULLSCREEN);
         super.onCreate(savedInstanceState);
+
+        if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[] {
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+            }, PERMISSIONS_REQUEST_CODE);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSIONS_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                System.out.println("Permission was granted");
+            } else {
+                System.out.println("Permission was denied");
+            }
+        }
     }
 }