From 72f74fa084b58f04c9e9ee2f180ab77cd1531baf Mon Sep 17 00:00:00 2001
From: prevter <prevter@gmail.com>
Date: Wed, 1 Jul 2026 11:46:54 +0300
Subject: [PATCH] more google play changes

---
 app/build.gradle.kts                                |  1 +
 app/src/main/AndroidManifest.xml                    |  4 ++--
 .../java/com/geode/launcher/utils/GeodeUtils.kt     |  8 ++++++--
 .../java/com/geode/launcher/utils/LaunchUtils.kt    | 13 +++++++++----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1f846526..c5b171f3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,6 +60,7 @@ android {
 
         create("googlePlay") {
             dimension = "distribution"
+            applicationId = "com.geode.launcher.play"
             buildConfigField("boolean", "GOOGLE_PLAY_BUILD", "true")
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 22e8d9e6..144374e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -238,7 +238,7 @@
 
         <provider
             android:name=".UserDirectoryProvider"
-            android:authorities="com.geode.launcher.user"
+            android:authorities="${applicationId}.user"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
@@ -248,7 +248,7 @@
         </provider>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.geode.launcher.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/com/geode/launcher/utils/GeodeUtils.kt b/app/src/main/java/com/geode/launcher/utils/GeodeUtils.kt
index d6a3d017..0ac2458e 100644
--- a/app/src/main/java/com/geode/launcher/utils/GeodeUtils.kt
+++ b/app/src/main/java/com/geode/launcher/utils/GeodeUtils.kt
@@ -215,7 +215,11 @@ object GeodeUtils {
             val relativePath = pathFile.relativeTo(baseDirectory)
             val uri = DocumentsContract.buildDocumentUri(
                 "com.android.externalstorage.documents",
-                "primary:Android/media/${context.packageName}/$relativePath"
+                if (BuildConfig.GOOGLE_PLAY_BUILD) {
+                    "primary:Android/data/${context.packageName}/$relativePath"
+                } else {
+                    "primary:Android/media/${context.packageName}/$relativePath"
+                }
             )
 
             Intent(Intent.ACTION_VIEW).apply {
@@ -409,7 +413,7 @@ object GeodeUtils {
     }
 
     fun isGeodeUri(uri: Uri): Boolean {
-        return "com.geode.launcher.user" == uri.authority
+        return "${BuildConfig.APPLICATION_ID}.user" == uri.authority
     }
 
     private const val INTERNAL_PERMISSION_PREFIX = "geode.permission_internal"
diff --git a/app/src/main/java/com/geode/launcher/utils/LaunchUtils.kt b/app/src/main/java/com/geode/launcher/utils/LaunchUtils.kt
index 3c02bfc0..3671fff3 100644
--- a/app/src/main/java/com/geode/launcher/utils/LaunchUtils.kt
+++ b/app/src/main/java/com/geode/launcher/utils/LaunchUtils.kt
@@ -2,6 +2,7 @@ package com.geode.launcher.utils
 
 import android.content.Context
 import android.os.Build
+import com.geode.launcher.BuildConfig
 import java.io.File
 import java.io.Serializable
 
@@ -48,10 +49,14 @@ object LaunchUtils {
      * Returns the directory that Geode/the game should base itself off of.
      */
     fun getBaseDirectory(context: Context, ignoreProfile: Boolean = false): File {
-        // deprecated, but seems to be the best choice of directory (i forced mat to test it)
-        // also, is getting the first item the correct choice here?? what do they mean
-        @Suppress("DEPRECATION")
-        val dir = context.externalMediaDirs.first()
+        val dir = if (BuildConfig.GOOGLE_PLAY_BUILD) {
+            context.getExternalFilesDir(null)!!.parentFile!!
+        } else {
+            // deprecated, but seems to be the best choice of directory (i forced mat to test it)
+            // also, is getting the first item the correct choice here?? what do they mean
+            @Suppress("DEPRECATION")
+            context.externalMediaDirs.first()
+        }
 
         // prevent having resources added to system gallery
         // accessing this file every time the directory is read may be a little wasteful...