Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

on iOS, store only relative portion of directory path #277

Closed
wants to merge 10 commits into from
Closed

on iOS, store only relative portion of directory path #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d0d147
savedDir entry in database and dict now is always the shortened
781flyingdutchman Apr 5, 2020
d5a05e2
Merge branch 'master' into docdir
781flyingdutchman Apr 9, 2020
73b5bb6
Merge branch 'fluttercommunity:master' into docdir
781flyingdutchman May 29, 2021
0a169c8
Merge branch 'master' of https://github.com/781flyingdutchman/flutter…
781flyingdutchman May 29, 2021
a83f2ff
Merge branch 'master' into docdir
781flyingdutchman May 29, 2021
a9855d5
savedDir entry in database and dict now is always the shortened
781flyingdutchman May 29, 2021
6a35da6
Fixed small error
781flyingdutchman May 30, 2021
a808361
Corrected savedDir in fileUrlFromDict
781flyingdutchman Jun 5, 2021
a63ee52
Fixed API call to older Android version
781flyingdutchman Jun 5, 2021
e60e620
Remove assertion to check that target directory exists, as it may not…
781flyingdutchman Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions android/src/main/java/vn/hunghd/flutterdownloader/DownloadWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.BitmapFactory;
import android.os.Build;

import androidx.annotation.NonNull;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;

import android.os.Environment;
import android.os.Handler;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.work.Worker;
import androidx.work.WorkerParameters;

import org.json.JSONException;
import org.json.JSONObject;

Expand All @@ -45,9 +45,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import androidx.work.Worker;
import androidx.work.WorkerParameters;

import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry;
Expand Down Expand Up @@ -196,7 +193,7 @@ public Result doWork() {
File partialFile = new File(saveFilePath);
if (partialFile.exists()) {
isResume = true;
log("exists file for "+ filename + "automatic resuming...");
log("exists file for " + filename + "automatic resuming...");
}

try {
Expand Down Expand Up @@ -308,7 +305,7 @@ private void downloadFile(Context context, String fileURL, String savedDir, Stri

if ((responseCode == HttpURLConnection.HTTP_OK || (isResume && responseCode == HttpURLConnection.HTTP_PARTIAL)) && !isStopped()) {
String contentType = httpConn.getContentType();
long contentLength = httpConn.getContentLengthLong();
long contentLength = Build.VERSION.SDK_INT >= 24 ? httpConn.getContentLengthLong() : (long) httpConn.getContentLength();
log("Content-Type = " + contentType);
log("Content-Length = " + contentLength);

Expand Down
2 changes: 1 addition & 1 deletion ios/Classes/FlutterDownloaderPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ - (BOOL)openDocumentWithURL:(NSURL*)url {

- (NSURL*)fileUrlFromDict:(NSDictionary*)dict
{
NSString *savedDir = dict[KEY_SAVED_DIR];
NSString *savedDir = [self absoluteSavedDirPath:dict[KEY_SAVED_DIR]];
NSString *filename = dict[KEY_FILE_NAME];
if (debug) {
NSLog(@"savedDir: %@", savedDir);
Expand Down
1 change: 0 additions & 1 deletion lib/src/downloader.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ class FlutterDownloader {
bool openFileFromNotification = true,
bool requiresStorageNotLow = true}) async {
assert(_initialized, 'FlutterDownloader.initialize() must be called first');
assert(Directory(savedDir).existsSync());

StringBuffer headerBuilder = StringBuffer();
if (headers != null) {
Expand Down