From 2268fe46a2f4fa5c0581576243bac65812f0924f Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 1 Jul 2020 12:13:58 +0200
Subject: [PATCH] Fixes file provider crashes

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../replayer/ReplayExportService.kt           |  2 +-
 .../pokeranalytics/android/util/ImageUtils.kt | 41 +------------------
 app/standard/release/output.json              |  2 +-
 4 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 92b83835..8ffe53ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -177,7 +177,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayExportService.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayExportService.kt
index 71403f4a..8b357e4d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayExportService.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayExportService.kt
@@ -100,7 +100,7 @@ class ReplayExportService : Service() {
 
 		val uri = FileProvider.getUriForFile(
 			this,
-			this.applicationContext.packageName.toString() + ".provider",
+			this.applicationContext.packageName.toString() + ".fileprovider",
 			File(path)
 		)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt b/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt
index cf02ee19..a4ca4dce 100755
--- a/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt
@@ -1,7 +1,6 @@
 package net.pokeranalytics.android.util
 
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.*
@@ -335,43 +334,5 @@ object ImageUtils {
 		return scaledBitmap
 		
 	}
-	
-	/**
-	 * Export a bitmap
-	 */
-	private fun exportFile(context: Activity, bitmap: Bitmap) {
-		/*
-		val outputFile = File.createTempFile("test_export", ".jpg", context.cacheDir)
-		
-		var out: FileOutputStream? = null
-		try {
-			out = FileOutputStream(outputFile.absolutePath)
-			bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out)
-		} catch (e: Exception) {
-			e.printStackTrace()
-		} finally {
-			try {
-				if (out != null) {
-					out.close()
-				}
-			} catch (e: IOException) {
-				e.printStackTrace()
-			}
-		}
-		
-		val uri = FileProvider.getUriForFile(context,
-				context.packageName + ".provider", outputFile)
-		
-		val shareIntent = ShareCompat.IntentBuilder.from(context)
-				.setType("image/jpg")
-				.setSubject(context.getString(R.string.share_file_name))
-				.setStream(uri)
-				.setChooserTitle(context.getString(R.string.share_title))
-				.createChooserIntent()
-				.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-		
-		context.startActivity(shareIntent)
-		*/
-	}
-	
+
 }
\ No newline at end of file
diff --git a/app/standard/release/output.json b/app/standard/release/output.json
index f881e5c8..fb371440 100644
--- a/app/standard/release/output.json
+++ b/app/standard/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":90,"versionName":"5.0_alpha_1","enabled":true,"outputFile":"PokerAnalytics_5.0_alpha_1(90)_200701_0910_release.apk","fullName":"standardRelease","baseName":"standard-release","dirName":""},"path":"PokerAnalytics_5.0_alpha_1(90)_200701_0910_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":91,"versionName":"5.0_alpha_1","enabled":true,"outputFile":"PokerAnalytics_5.0_alpha_1(91)_200701_1015_release.apk","fullName":"standardRelease","baseName":"standard-release","dirName":""},"path":"PokerAnalytics_5.0_alpha_1(91)_200701_1015_release.apk","properties":{}}]
\ No newline at end of file