Changed documents dir on Android to getExternalFilesDir if supported

Elad Gil · Elad Gil · commit b9a806d51a77 · 2019-10-15T14:17:00.000+03:00
Added conditional support for AndroidX
diff --git a/android/build.gradle b/android/build.gradle
@@ -18,5 +18,9 @@ android {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-    implementation "androidx.tonyodev.fetch2:xfetch2:3.1.4"
+    if (project.properties['android.useAndroidX'] == true) {
+        implementation "androidx.tonyodev.fetch2:xfetch2:3.1.4"
+    } else {
+        implementation "com.tonyodev.fetch2:fetch2:3.0.10"
+    }
 }
diff --git a/android/src/main/java/com/eko/RNBackgroundDownloaderModule.java b/android/src/main/java/com/eko/RNBackgroundDownloaderModule.java
@@ -109,7 +109,13 @@ public boolean hasConstants() {
   @Override
   public Map<String, Object> getConstants() {
     Map<String, Object> constants = new HashMap<>();
-    constants.put("documents", this.getReactApplicationContext().getFilesDir().getAbsolutePath());
+    File externalDirectory = this.getReactApplicationContext().getExternalFilesDir(null);
+    if (externalDirectory != null) {
+      constants.put("documents", externalDirectory.getAbsolutePath());
+    } else {
+      constants.put("documents", this.getReactApplicationContext().getFilesDir().getAbsolutePath());
+    }
+
     constants.put("TaskRunning", TASK_RUNNING);
     constants.put("TaskSuspended", TASK_SUSPENDED);
     constants.put("TaskCanceling", TASK_CANCELING);
diff --git a/lib/downloadTask.js b/lib/downloadTask.js
@@ -2,93 +2,93 @@ import { NativeModules } from 'react-native';
 const { RNBackgroundDownloader } = NativeModules;
 
 function validateHandler(handler) {
-  if (!(typeof handler === 'function')) {
-    throw new TypeError(`[RNBackgroundDownloader] expected argument to be a function, got: ${typeof handler}`);
-  }
+    if (!(typeof handler === 'function')) {
+        throw new TypeError(`[RNBackgroundDownloader] expected argument to be a function, got: ${typeof handler}`);
+    }
 }
 export default class DownloadTask {
-  state = 'PENDING'
-  percent = 0
-  bytesWritten = 0
-  totalBytes = 0
+    state = 'PENDING'
+    percent = 0
+    bytesWritten = 0
+    totalBytes = 0
 
-  constructor(taskInfo) {
-    if (typeof taskInfo === 'string') {
-      this.id = taskInfo;
-    } else {
-      this.id = taskInfo.id;
-      this.percent = taskInfo.percent;
-      this.bytesWritten = taskInfo.bytesWritten;
-      this.totalBytes = taskInfo.totalBytes;
+    constructor(taskInfo) {
+        if (typeof taskInfo === 'string') {
+            this.id = taskInfo;
+        } else {
+            this.id = taskInfo.id;
+            this.percent = taskInfo.percent;
+            this.bytesWritten = taskInfo.bytesWritten;
+            this.totalBytes = taskInfo.totalBytes;
+        }
     }
-  }
 
-  begin(handler) {
-    validateHandler(handler);
-    this._beginHandler = handler;
-    return this;
-  }
+    begin(handler) {
+        validateHandler(handler);
+        this._beginHandler = handler;
+        return this;
+    }
 
-  progress(handler) {
-    validateHandler(handler);
-    this._progressHandler = handler;
-    return this;
-  }
+    progress(handler) {
+        validateHandler(handler);
+        this._progressHandler = handler;
+        return this;
+    }
 
-  done(handler) {
-    validateHandler(handler);
-    this._doneHandler = handler;
-    return this;
-  }
+    done(handler) {
+        validateHandler(handler);
+        this._doneHandler = handler;
+        return this;
+    }
 
-  error(handler) {
-    validateHandler(handler);
-    this._errorHandler = handler;
-    return this;
-  }
+    error(handler) {
+        validateHandler(handler);
+        this._errorHandler = handler;
+        return this;
+    }
 
-  _onBegin(expectedBytes) {
-    this.state = 'DOWNLOADING';
-    if (this._beginHandler) {
-      this._beginHandler(expectedBytes);
+    _onBegin(expectedBytes) {
+        this.state = 'DOWNLOADING';
+        if (this._beginHandler) {
+            this._beginHandler(expectedBytes);
+        }
     }
-  }
 
-  _onProgress(percent, bytesWritten, totalBytes) {
-    this.percent = percent;
-    this.bytesWritten = bytesWritten;
-    this.totalBytes = totalBytes;
-    if (this._progressHandler) {
-      this._progressHandler(percent, bytesWritten, totalBytes);
+    _onProgress(percent, bytesWritten, totalBytes) {
+        this.percent = percent;
+        this.bytesWritten = bytesWritten;
+        this.totalBytes = totalBytes;
+        if (this._progressHandler) {
+            this._progressHandler(percent, bytesWritten, totalBytes);
+        }
     }
-  }
 
-  _onDone() {
-    this.state = 'DONE';
-    if (this._doneHandler) {
-      this._doneHandler();
+    _onDone() {
+        this.state = 'DONE';
+        if (this._doneHandler) {
+            this._doneHandler();
+        }
     }
-  }
 
-  _onError(error, errorCode) {
-    this.state = 'FAILED';
-    if (this._errorHandler) {
-      this._errorHandler(error, errorCode);
+    _onError(error, errorCode) {
+        this.state = 'FAILED';
+        if (this._errorHandler) {
+            this._errorHandler(error, errorCode);
+        }
     }
-  }
 
-  pause() {
-    this.state = 'PAUSED';
-    RNBackgroundDownloader.pauseTask(this.id);
-  }
+    pause() {
+        this.state = 'PAUSED';
+        RNBackgroundDownloader.pauseTask(this.id);
+    }
 
-  resume() {
-    this.state = 'DOWNLOADING';
-    RNBackgroundDownloader.resumeTask(this.id);
-  }
+    resume() {
+        this.state = 'DOWNLOADING';
+        RNBackgroundDownloader.resumeTask(this.id);
+    }
 
-  stop() {
-    this.state = 'STOPPED';
-    RNBackgroundDownloader.stopTask(this.id);
-  }
+    stop() {
+        this.state = 'STOPPED';
+        RNBackgroundDownloader.stopTask(this.id);
+    }
 }
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "jest": "^24.5.0",
     "metro-react-native-babel-preset": "^0.53.1",
     "react": "16.8.3",
-    "react-native": "0.59.2",
+    "react-native": "0.59.9",
     "react-native-fs": "^2.14.1",
     "react-native-vector-icons": "^6.6.0",
     "react-test-renderer": "16.8.3"
diff --git a/react-native-background-downloader.podspec b/react-native-background-downloader.podspec
@@ -7,10 +7,10 @@ Pod::Spec.new do |s|
   A library for React-Native to help you download large files on iOS and Android both in the foreground and most importantly in the background.
                    DESC
   s.author       = 'elad@helleko.com'
-  s.homepage     = 'https://github.com/learnyst/react-native-background-downloader'
+  s.homepage     = 'https://github.com/EkoLabs/react-native-background-downloader'
   s.license      = 'MIT'
   s.platform     = :ios, '7.0'
-  s.source       = { git: 'https://github.com/learnyst/react-native-background-downloader.git', tag: 'master' }
+  s.source       = { git: 'https://github.com/EkoLabs/react-native-background-downloader.git', tag: 'master' }
   s.source_files = 'ios/**/*.{h,m}'
   s.requires_arc = true
 
diff --git a/testApp/App.js b/testApp/App.js
@@ -66,7 +66,7 @@ export default class App extends Component {
     async loadDownloads() {
         const mapStr = await AsyncStorage.getItem('idsToData');
         try {
-            this.idsToData = JSON.parse(mapStr);
+            this.idsToData = JSON.parse(mapStr) || {};
         } catch (e) {
             console.error(e);
         }
diff --git a/testApp/android/app/src/main/java/com/testapp/MainApplication.java b/testApp/android/app/src/main/java/com/testapp/MainApplication.java
@@ -8,40 +8,44 @@
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.rnfs.RNFSPackage;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
 
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
+    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+        @Override
+        public boolean getUseDeveloperSupport() {
+            return BuildConfig.DEBUG;
+        }
+
+        @Override
+        protected List<ReactPackage> getPackages() {
+            return Arrays.<ReactPackage>asList(
+                    new MainReactPackage(),
+                    new RNBackgroundDownloaderPackage(),
+                    new RNFSPackage(),
+                    new VectorIconsPackage()
+            );
+        }
+
+        @Override
+        protected String getJSMainModuleName() {
+            return "testApp/index";
+        }
+    };
 
     @Override
-    protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-            new RNBackgroundDownloaderPackage()
-      );
+    public ReactNativeHost getReactNativeHost() {
+        return mReactNativeHost;
     }
 
     @Override
-    protected String getJSMainModuleName() {
-      return "testApp/index";
+    public void onCreate() {
+        super.onCreate();
+        SoLoader.init(this, /* native exopackage */ false);
     }
-  };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    SoLoader.init(this, /* native exopackage */ false);
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export default class App extends Component {`
`66`	`66`	`async loadDownloads() {`
`67`	`67`	`const mapStr = await AsyncStorage.getItem('idsToData');`
`68`	`68`	`try {`
`69`		`- this.idsToData = JSON.parse(mapStr);`
	`69`	`+ this.idsToData = JSON.parse(mapStr) \|\| {};`
`70`	`70`	`} catch (e) {`
`71`	`71`	`console.error(e);`
`72`	`72`	`}`