fixes for image sharing (contextual menu: save image, share image, ex…

…if data...)
KaiserZip · May 18, 2022 · 8c721ca · 8c721ca
1 parent 648e7be
commit 8c721ca
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 		targetSdkVersion 31
 		multiDexEnabled true
 		versionCode 4007
-		versionName "4.0.7"
+		versionName "4.0.14"
 		vectorDrawables.useSupportLibrary = true
 	}
 	compileOptions {
@@ -79,7 +79,8 @@ dependencies {
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
 	// WorkManager
-	implementation "android.arch.work:work-runtime:1.0.1"
+	//implementation "android.arch.work:work-runtime:1.0.1"
+	implementation 'androidx.work:work-runtime:2.7.1'
 
 	// Dependency injection
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.35.1'
@@ -139,7 +140,7 @@ dependencies {
 	implementation 'com.google.firebase:firebase-crashlytics'
 	implementation 'com.google.firebase:firebase-analytics'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+//	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.assertj:assertj-core:1.7.1'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,9 @@
 	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
 
 	<!-- Image management -->
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission
-		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-		android:maxSdkVersion="28" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
 	<!-- Notification service -->
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -128,6 +127,18 @@
 			android:enabled="false"
 			android:exported="false"
 			tools:replace="android:authorities" />
+
+		<provider
+			android:name="androidx.startup.InitializationProvider"
+			android:authorities="${applicationId}.androidx-startup"
+			android:exported="false"
+			tools:node="merge">
+			<meta-data
+				android:name="androidx.work.WorkManagerInitializer"
+				android:value="androidx.startup"
+				tools:node="remove" />
+		</provider>
+
 	</application>
 
 </manifest>
diff --git a/app/src/main/java/com/ayuget/redface/storage/StorageHelper.java b/app/src/main/java/com/ayuget/redface/storage/StorageHelper.java
@@ -44,18 +44,27 @@ public static File getMediaFile(String filename) throws IOException {
 			mediaStorageDir = new File(Environment.getExternalStorageDirectory() + APP_STORAGE_DIR);
 		}
 
-		if (mediaStorageDir.canWrite()) {
+//		if (mediaStorageDir.canWrite()) {
 			// Create the storage directory if it does not exist
 			if (!mediaStorageDir.exists()) {
 				if (!mediaStorageDir.mkdirs()) {
 					throw new IOException("Unable to create media storage directory");
 				}
 			}
 
+			// fix to remove image name sufixes (prevents from saving image)
+			if (filename.contains("?")) {
+				filename = filename.substring(0, filename.indexOf("?"));
+			}
+			// fix to add an extension in case there's none
+			if (!filename.contains(".")) {
+				filename = filename + ".jpg";
+			}
+
 			return new File(mediaStorageDir.getPath() + File.separator + filename);
-		} else {
-			throw new IOException("External storage is not writable");
-		}
+//		} else {
+//			throw new IOException("External storage is not writable");
+//		}
 	}
 
 	public static String removeExtension(String filename) {