Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 28 Wiki Activity

Use the standard directory for file downloads. Fixes #291 (#292)

Browse Source 
* Use the standard directory for file downloads. Fixes #291

* Use OS independent file separator
This commit is contained in:
Juan Miguel Boyero Corral 2020-09-29 18:19:34 +02:00 committed by GitHub
parent 086a70421f
commit 58240541f7
2 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java
View File

@ -324,7 +324,7 @@ public class Constants {
*/
public static final String DIRECTORY_SWADROID = "SWADroid";
public static final String DOWNLOADS_PATH =
Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + DIRECTORY_SWADROID;
Environment.DIRECTORY_DOWNLOADS + File.separator + DIRECTORY_SWADROID;
/**
* Username template for messages

61
SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadFactory.java
View File

@ -21,20 +21,15 @@ package es.ugr.swad.swadroid.modules.downloads;
import android.annotation.TargetApi;
import android.app.DownloadManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.util.Log;
import android.widget.Toast;
import java.io.File;
import java.util.List;
import java.util.Locale;
import es.ugr.swad.swadroid.Constants;
import es.ugr.swad.swadroid.utils.Utils;
/**
* Class for manage file downloads
@ -60,58 +55,26 @@ public class DownloadFactory {
String description) {
Uri uri = Uri.parse(url);
DownloadManager managerHoneycomb;
DownloadManager.Request requestHoneycomb;
es.ugr.swad.swadroid.modules.downloads.DownloadManager managerGingerbread;
es.ugr.swad.swadroid.modules.downloads.DownloadManager.Request requestGingerbread;
//Create destination directory if not exists
File downloadDirectory = new File(Constants.DOWNLOADS_PATH);
if (!downloadDirectory.exists()){
if(downloadDirectory.mkdir()) {
Log.i(TAG, "Created directory " + Constants.DOWNLOADS_PATH);
} else {
Log.e(TAG, "Error creating directory " + Constants.DOWNLOADS_PATH);
Toast.makeText(context, "Error creating directory " + Constants.DOWNLOADS_PATH, Toast.LENGTH_LONG).show();
return false;
}
}
DownloadManager manager;
DownloadManager.Request request;
managerHoneycomb = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
requestHoneycomb = new DownloadManager.Request(uri);
manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
request = new DownloadManager.Request(uri);
requestHoneycomb.setDescription(title);
requestHoneycomb.setTitle(description);
requestHoneycomb.setDestinationInExternalPublicDir(Constants.DIRECTORY_SWADROID, fileName);
request.setDescription(title);
request.setTitle(description);
request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, Constants.DIRECTORY_SWADROID + File.separator + fileName);
//DownloadManager HONEYCOMB
Log.i(TAG, "Downloading file " + fileName + " with DownloadManager >= HONEYCOMB");
Log.i(TAG, "Downloading file " + fileName);
requestHoneycomb.allowScanningByMediaScanner();
requestHoneycomb.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
request.allowScanningByMediaScanner();
request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
managerHoneycomb.enqueue(requestHoneycomb);
manager.enqueue(request);
return true;
}
/**
* @param context used to check the device version and DownloadManager information
* @return true if the download manager is available
*/
public static boolean isDownloadManagerAvailable(Context context) {
try {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
intent.setClassName("com.android.providers.downloads.ui", "com.android.providers.downloads.ui.DownloadList");
List<ResolveInfo> list = context.getPackageManager().queryIntentActivities(intent,
PackageManager.MATCH_DEFAULT_ONLY);
return list.size() > 0;
} catch (Exception e) {
return false;
}
}
/**
* Method to show file size in bytes in a human readable way
* http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java