Skip to content

Commit 29f0906

Browse files
committed
Fix image preview in wrapped apps
1 parent 7d3ba83 commit 29f0906

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import android.content.OperationApplicationException;
3737
import android.database.Cursor;
3838
import android.net.Uri;
39+
import android.os.Build;
40+
import android.os.FileUriExposedException;
3941
import android.os.RemoteException;
4042
import android.provider.MediaStore;
4143

@@ -1714,22 +1716,23 @@ public void triggerMediaScan(String path) {
17141716
if (path != null) {
17151717
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
17161718
intent.setData(Uri.fromFile(new File(path)));
1717-
MainApp.getAppContext().sendBroadcast(intent);
17181719

1719-
// For making uploads and downloads work in wrapped apps
1720-
Intent wrappedAppintent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
1721-
try {
1722-
Uri uri = FileProvider.getUriForFile(
1723-
mContext.getApplicationContext(),
1724-
mContext.getResources().getString(R.string.file_provider_authority),
1725-
new File(path)
1726-
);
1727-
wrappedAppintent.setData(uri);
1728-
} catch (IllegalArgumentException illegalArgumentException) {
1729-
wrappedAppintent.setData(Uri.fromFile(new File(path)));
1720+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
1721+
try {
1722+
MainApp.getAppContext().sendBroadcast(intent);
1723+
} catch (FileUriExposedException fileUriExposedException) {
1724+
Intent newIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
1725+
newIntent.setData(FileProvider.getUriForFile(
1726+
mContext.getApplicationContext(),
1727+
mContext.getResources().getString(R.string.file_provider_authority),
1728+
new File(path)
1729+
)
1730+
);
1731+
MainApp.getAppContext().sendBroadcast(newIntent);
1732+
}
1733+
} else {
1734+
MainApp.getAppContext().sendBroadcast(intent);
17301735
}
1731-
1732-
MainApp.getAppContext().sendBroadcast(wrappedAppintent);
17331736
}
17341737
}
17351738

0 commit comments

Comments
 (0)