Merge pull request #2613 from owncloud/fix/trigger_media_scan

Fix trigger media scan
owncloud · Aug 2, 2019 · e1c49f7 · e1c49f7
2 parents b6bc623 + 29f0906
commit e1c49f7
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -36,6 +36,8 @@
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
+import android.os.FileUriExposedException;
 import android.os.RemoteException;
 import android.provider.MediaStore;
 
@@ -1713,18 +1715,24 @@ public ArrayList<OCShare> getPublicSharesForAFile(String filePath, String accoun
     public void triggerMediaScan(String path) {
         if (path != null) {
             Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-            try {
-                intent.setData(
-                        FileProvider.getUriForFile(
-                                mContext.getApplicationContext(),
-                                mContext.getResources().getString(R.string.file_provider_authority),
-                                new File(path)
-                        )
-                );
-            } catch (IllegalArgumentException illegalArgumentException) {
-                intent.setData(Uri.fromFile(new File(path)));
+            intent.setData(Uri.fromFile(new File(path)));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                try {
+                    MainApp.getAppContext().sendBroadcast(intent);
+                } catch (FileUriExposedException fileUriExposedException) {
+                    Intent newIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                    newIntent.setData(FileProvider.getUriForFile(
+                            mContext.getApplicationContext(),
+                            mContext.getResources().getString(R.string.file_provider_authority),
+                            new File(path)
+                            )
+                    );
+                    MainApp.getAppContext().sendBroadcast(newIntent);
+                }
+            } else {
+                MainApp.getAppContext().sendBroadcast(intent);
             }
-            MainApp.getAppContext().sendBroadcast(intent);
         }
     }