kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-04-26 13:34:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move file methods / constants from storage to utils (#2511)

Browse Source 
* stash

* move commons into the app

* move utils module into app

* Update index.d.ts

* re-trigger build

* fix eslint issues

* Fix formatting eslint issues

* move utils documentation to app

* Dissalow number values in setUserProperties

* fix test

* add utils export to app module

* clean up utils export

* Move path helpers to utilities module

* I have no idea

* Update RNFBUtilsModule.m

* remove duplicate util files

* fix RNFBUtilsModule merge conflict

* fix android build

* Move path constants from storage to utils, remove old GH Actions

* resolve remaining merge confs

* resolve type definition conflict

* add requiresMainQueueSetup to RNFBUtilsModule
This commit is contained in:
Ilja Daderko
2019-08-28 13:17:48 +03:00
committed by GitHub
parent f835519285
commit 16e67ddbf8
15 changed files with 144 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/storage/android/src/main/java/io/invertase/firebase/storage/ReactNativeFirebaseStorageModule.java
View File

@@ -19,16 +19,11 @@ package io.invertase.firebase.storage;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.google.android.gms.tasks.Task;
import com.google.firebase.FirebaseApp;
import com.google.firebase.storage.FirebaseStorage;
@@ -36,7 +31,6 @@ import com.google.firebase.storage.ListResult;
import com.google.firebase.storage.StorageMetadata;
import com.google.firebase.storage.StorageReference;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -52,15 +46,6 @@ import static io.invertase.firebase.storage.ReactNativeFirebaseStorageCommon.pro
public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule {
private static final String TAG = "Storage";
private static final String KEY_MAIN_BUNDLE = "MAIN_BUNDLE";
private static final String KEY_DOCUMENT_DIRECTORY = "DOCUMENT_DIRECTORY";
private static final String KEY_LIBRARY_DIRECTORY = "LIBRARY_DIRECTORY";
private static final String KEY_EXTERNAL_DIRECTORY = "EXTERNAL_DIRECTORY";
private static final String KEY_EXT_STORAGE_DIRECTORY = "EXTERNAL_STORAGE_DIRECTORY";
private static final String KEY_PICS_DIRECTORY = "PICTURES_DIRECTORY";
private static final String KEY_MOVIES_DIRECTORY = "MOVIES_DIRECTORY";
private static final String KEY_TEMP_DIRECTORY = "TEMP_DIRECTORY";
private static final String KEY_CACHE_DIRECTORY = "CACHES_DIRECTORY";
ReactNativeFirebaseStorageModule(ReactApplicationContext reactContext) {
super(reactContext, TAG);
@@ -319,36 +304,6 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
Map<String, Object> constants = new HashMap<>();
Context context = getReactApplicationContext();
constants.put(KEY_MAIN_BUNDLE, "");
constants.put(KEY_LIBRARY_DIRECTORY, context.getFilesDir().getAbsolutePath());
constants.put(KEY_TEMP_DIRECTORY, context.getCacheDir().getAbsolutePath());
constants.put(KEY_CACHE_DIRECTORY, context.getCacheDir().getAbsolutePath());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
File folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
constants.put(KEY_DOCUMENT_DIRECTORY, folder.getAbsolutePath());
} else {
constants.put(KEY_DOCUMENT_DIRECTORY, context.getFilesDir().getAbsolutePath());
}
constants.put(KEY_PICS_DIRECTORY, Environment
.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)
.getAbsolutePath());
constants.put(KEY_MOVIES_DIRECTORY, Environment
.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES)
.getAbsolutePath());
File externalStorageDirectory = Environment.getExternalStorageDirectory();
if (externalStorageDirectory != null) {
constants.put(KEY_EXT_STORAGE_DIRECTORY, externalStorageDirectory.getAbsolutePath());
}
File externalDirectory = context.getExternalFilesDir(null);
if (externalDirectory != null) {
constants.put(KEY_EXTERNAL_DIRECTORY, externalDirectory.getAbsolutePath());
}
// a 'safe' way of checking if any apps have been initialized
List<FirebaseApp> apps = FirebaseApp.getApps(context);