From 3d9bcbcdd30dec0e1ea8668831ba15dc0c73fb3e Mon Sep 17 00:00:00 2001 From: Jon Green Date: Tue, 18 Jun 2019 14:10:52 -0700 Subject: [PATCH 1/2] Add `androidx` suppport. - Replace `android.support.annotation.Nullable` with `androidx.annotation.Nullable` import. - Thanks to @maieonbrix hard work finding this fix. (https://github.com/itinance/react-native-fs/issues/686#issuecomment-503249786) --- android/src/main/java/com/rnfs/RNFSManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/rnfs/RNFSManager.java b/android/src/main/java/com/rnfs/RNFSManager.java index aad1778d..6a2fa8ba 100755 --- a/android/src/main/java/com/rnfs/RNFSManager.java +++ b/android/src/main/java/com/rnfs/RNFSManager.java @@ -8,7 +8,7 @@ import android.os.Environment; import android.os.StatFs; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Base64; import android.util.SparseArray; import android.media.MediaScannerConnection; From 627fab070f250a31b608a962546bcf074ba87d49 Mon Sep 17 00:00:00 2001 From: Jon Green Date: Fri, 21 Jun 2019 14:54:51 -0700 Subject: [PATCH 2/2] Remove `@Nullable` annotation. - This removes the dependency on `android.support` and `androidx`. Side-stepping the need to make a major change to the project to support both libraries. --- android/src/main/java/com/rnfs/RNFSManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/java/com/rnfs/RNFSManager.java b/android/src/main/java/com/rnfs/RNFSManager.java index 6a2fa8ba..9957a61d 100755 --- a/android/src/main/java/com/rnfs/RNFSManager.java +++ b/android/src/main/java/com/rnfs/RNFSManager.java @@ -8,7 +8,6 @@ import android.os.Environment; import android.os.StatFs; import android.provider.MediaStore; -import androidx.annotation.Nullable; import android.util.Base64; import android.util.SparseArray; import android.media.MediaScannerConnection; @@ -682,7 +681,7 @@ public void mkdir(String filepath, ReadableMap options, Promise promise) { } } - private void sendEvent(ReactContext reactContext, String eventName, @Nullable WritableMap params) { + private void sendEvent(ReactContext reactContext, String eventName, WritableMap params) { reactContext .getJSModule(RCTNativeAppEventEmitter.class) .emit(eventName, params);