Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

download to a specific directory 

resolves #230
This commit is contained in:
Kiru 2024-09-04 16:28:49 +02:00
parent 2c9e92a254
commit 7d67446b67
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
View File

@ -533,7 +533,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
ContentValues values=new ContentValues(); ContentValues values=new ContentValues();
// values.put(MediaStore.Downloads.DOWNLOAD_URI, att.url); // values.put(MediaStore.Downloads.DOWNLOAD_URI, att.url);
values.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName); values.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName);
values.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS); values.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + "/" + activity.getApplicationInfo().loadLabel(activity.getPackageManager()));
String mime=mimeTypeForFileName(fileName); String mime=mimeTypeForFileName(fileName);
if(mime!=null) if(mime!=null)
values.put(MediaStore.MediaColumns.MIME_TYPE, mime); values.put(MediaStore.MediaColumns.MIME_TYPE, mime);
@ -541,7 +541,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
Uri itemUri=cr.insert(MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), values); Uri itemUri=cr.insert(MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), values);
return cr.openOutputStream(itemUri); return cr.openOutputStream(itemUri);
}else{ }else{
return new FileOutputStream(new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), fileName)); return new FileOutputStream(new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), activity.getApplicationInfo().loadLabel(activity.getPackageManager()) + "/" + fileName));
} }
} }
@ -568,7 +568,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
}); });
if(Build.VERSION.SDK_INT<29){ if(Build.VERSION.SDK_INT<29){
String fileName=Uri.parse(att.url).getLastPathSegment(); String fileName=Uri.parse(att.url).getLastPathSegment();
File dstFile=new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), fileName); File dstFile=new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), activity.getApplicationInfo().loadLabel(activity.getPackageManager()) + "/" + fileName);
MediaScannerConnection.scanFile(activity, new String[]{dstFile.getAbsolutePath()}, new String[]{mimeTypeForFileName(fileName)}, null); MediaScannerConnection.scanFile(activity, new String[]{dstFile.getAbsolutePath()}, new String[]{mimeTypeForFileName(fileName)}, null);
} }
}catch(IOException x){ }catch(IOException x){
@ -596,7 +596,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
DownloadManager.Request req=new DownloadManager.Request(uri); DownloadManager.Request req=new DownloadManager.Request(uri);
req.allowScanningByMediaScanner(); req.allowScanningByMediaScanner();
req.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); req.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, uri.getLastPathSegment()); req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, activity.getApplicationInfo().loadLabel(activity.getPackageManager()) + "/" + uri.getLastPathSegment());
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU) if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU)
activity.registerReceiver(downloadCompletedReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), Context.RECEIVER_EXPORTED); activity.registerReceiver(downloadCompletedReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), Context.RECEIVER_EXPORTED);
else else