From d5638425df8b7b6a23026df2149c69f7639952dd Mon Sep 17 00:00:00 2001
From: Zahnstocher <1073398+Zahnstocher@users.noreply.github.com>
Date: Wed, 31 Jul 2024 20:34:00 +0200
Subject: [PATCH] Grant camera write permissions, remove obsolete permissions
 (Fix #441)

---
 app/src/main/AndroidManifest.xml                          | 7 +------
 .../main/java/net/osmtracker/activity/TrackLogger.java    | 8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2b63e2b..d0d5141b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,16 +18,11 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <!-- External storage permissions -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
     <application
         android:description="@string/app_description"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/HighContrast"
-        android:requestLegacyExternalStorage="true">
+        android:theme="@style/HighContrast">
 
         <uses-library
             android:name="org.apache.http.legacy"
diff --git a/app/src/main/java/net/osmtracker/activity/TrackLogger.java b/app/src/main/java/net/osmtracker/activity/TrackLogger.java
index f384d9d0..a1487815 100644
--- a/app/src/main/java/net/osmtracker/activity/TrackLogger.java
+++ b/app/src/main/java/net/osmtracker/activity/TrackLogger.java
@@ -53,6 +53,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -800,8 +801,13 @@ public long getCurrentTrackId() {
 	private void startCamera(File imageFile) {
 		StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
 		StrictMode.setVmPolicy(builder.build());
+
+		Uri imageUriContent = FileProvider.getUriForFile(this,
+				DataHelper.FILE_PROVIDER_AUTHORITY, imageFile);
+
 		Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-		cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(imageFile));
+		cameraIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageUriContent);
 		startActivityForResult(cameraIntent, REQCODE_IMAGE_CAPTURE);
 	}