fix share error

FCL-Team · Jun 26, 2024 · e167716 · e167716
1 parent 8bf3927
commit e167716
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/FCL/src/main/AndroidManifest.xml b/FCL/src/main/AndroidManifest.xml
@@ -118,17 +118,23 @@
             android:enabled="true"/>
         <provider
             android:name=".scoped.FolderProvider"
-            android:authorities="@string/file_browser_provider"
+            android:authorities="@string/file_browser_document_provider"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="@string/file_browser_provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
     </application>
     <queries>
         <package android:name="net.kdt.pojavlaunch.ffmpeg"/>

diff --git a/FCL/src/main/java/com/tungsten/fcl/activity/JVMCrashActivity.java b/FCL/src/main/java/com/tungsten/fcl/activity/JVMCrashActivity.java
@@ -278,11 +278,10 @@ public void onClick(View v) {
                 File file = File.createTempFile("fcl-latest", ".log");
                 FileUtils.writeText(file, error.getText().toString());
                 Uri uri = FileProvider.getUriForFile(this, getString(com.tungsten.fcllibrary.R.string.file_browser_provider), file);
-                intent.setType("*/*");
+                intent.setType("text/plain");
                 intent.putExtra(Intent.EXTRA_STREAM, uri);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                intent.addCategory(Intent.CATEGORY_DEFAULT);
                 startActivity(Intent.createChooser(intent, getString(com.tungsten.fcllibrary.R.string.crash_reporter_share)));
             } catch (Exception e) {
                 LOG.log(Level.INFO, "Share error: " + e);

diff --git a/FCLLibrary/src/main/java/com/tungsten/fcllibrary/crash/CrashReportActivity.java b/FCLLibrary/src/main/java/com/tungsten/fcllibrary/crash/CrashReportActivity.java
@@ -75,11 +75,10 @@ public void onClick(View view) {
                 File file = File.createTempFile("crash_report", ".txt");
                 Files.write(file.toPath(), CrashReporter.getAllErrorDetailsFromIntent(this, getIntent()).getBytes(StandardCharsets.UTF_8));
                 Uri uri = FileProvider.getUriForFile(this, getString(R.string.file_browser_provider), file);
-                intent.setType("*/*");
+                intent.setType("text/plain");
                 intent.putExtra(Intent.EXTRA_STREAM, uri);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                intent.addCategory(Intent.CATEGORY_DEFAULT);
                 startActivity(Intent.createChooser(intent, getString(R.string.crash_reporter_share)));
             } catch (IOException e) {
                 e.printStackTrace();

diff --git a/FCLLibrary/src/main/res/values/strings.xml b/FCLLibrary/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="file_browser_provider" translatable="false">com.tungsten.fcl.provider</string>
+    <string name="file_browser_document_provider" translatable="false">com.tungsten.fcl.document.provider</string>
     <string name="file_browser_title">File Browser</string>
     <string name="file_browser_back">Back</string>
     <string name="file_browser_close">Exit</string>