Updated with small changes to fix blocking Android bug

fullstackreact · Jan 13, 2017 · d9babd5 · buhe · Mar 18, 2017 · d9babd5
1 parent 17b870d
commit d9babd5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -22,11 +22,11 @@ dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
     compile 'com.google.android.gms:play-services-base:+'
 
-    compile 'com.google.firebase:firebase-core:9.8.0'
-    compile 'com.google.firebase:firebase-auth:9.8.0'
-    compile 'com.google.firebase:firebase-analytics:9.8.0'
-    compile 'com.google.firebase:firebase-database:9.8.0'
-    compile 'com.google.firebase:firebase-storage:9.8.0'
-    compile 'com.google.firebase:firebase-messaging:9.8.0'
+    compile 'com.google.firebase:firebase-core:10.0.1'
+    compile 'com.google.firebase:firebase-auth:10.0.1'
+    compile 'com.google.firebase:firebase-analytics:10.0.1'
+    compile 'com.google.firebase:firebase-database:10.0.1'
+    compile 'com.google.firebase:firebase-storage:10.0.1'
+    compile 'com.google.firebase:firebase-messaging:10.0.1'
 }
 
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackPackage.java b/android/src/main/java/io/fullstack/firestack/FirestackPackage.java
@@ -29,8 +29,8 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         modules.add(new FirestackAuthModule(reactContext));
         modules.add(new FirestackDatabaseModule(reactContext));
         modules.add(new FirestackAnalyticsModule(reactContext));
-        modules.add(new FirestackStorageModule(reactContext));
-        modules.add(new FirestackCloudMessaging(reactContext));
+        modules.add(new FirestackStorage(reactContext));
+        // modules.add(new FirestackCloudMessaging(reactContext));
         return modules;
     }
 

diff --git a/android/src/main/java/io/fullstack/firestack/FirestackStorage.java b/android/src/main/java/io/fullstack/firestack/FirestackStorage.java
@@ -43,7 +43,7 @@
 import com.google.firebase.storage.StorageMetadata;
 import com.google.firebase.storage.StorageReference;
 
-class FirestackStorageModule extends ReactContextBaseJavaModule {
+class FirestackStorage extends ReactContextBaseJavaModule {
 
   private static final String TAG = "FirestackStorage";
   private static final String DocumentDirectoryPath = "DOCUMENT_DIRECTORY_PATH";
@@ -53,6 +53,7 @@ class FirestackStorageModule extends ReactContextBaseJavaModule {
   private static final String TemporaryDirectoryPath = "TEMPORARY_DIRECTORY_PATH";
   private static final String CachesDirectoryPath = "CACHES_DIRECTORY_PATH";
   private static final String DocumentDirectory = "DOCUMENT_DIRECTORY_PATH";
+  private static final String BundlePath = "MAIN_BUNDLE_PATH";
 
   private static final String FileTypeRegular = "FILETYPE_REGULAR";
   private static final String FileTypeDirectory = "FILETYPE_DIRECTORY";
@@ -62,8 +63,10 @@ class FirestackStorageModule extends ReactContextBaseJavaModule {
   private ReactContext mReactContext;
   private FirebaseApp app;
 
-  public FirestackStorageModule(ReactApplicationContext reactContext) {
+  public FirestackStorage(ReactApplicationContext reactContext) {
     super(reactContext);
+
+    Log.d(TAG, "Attaching FirestackStorage");
     this.context = reactContext;
     mReactContext = reactContext;
 
@@ -279,6 +282,7 @@ public Map<String, Object> getConstants() {
     constants.put(CachesDirectoryPath, this.getReactApplicationContext().getCacheDir().getAbsolutePath());
     constants.put(FileTypeRegular, 0);
     constants.put(FileTypeDirectory, 1);
+    constants.put(BundlePath, null);
 
     File externalStorageDirectory = Environment.getExternalStorageDirectory();
     if (externalStorageDirectory != null) {

diff --git a/lib/modules/storage.js b/lib/modules/storage.js
@@ -6,6 +6,8 @@ const FirestackStorageEvt = new NativeEventEmitter(FirestackStorage);
 import promisify from '../utils/promisify'
 import { Base, ReferenceBase } from './base'
 
+console.log('FirestackStorage ---->', FirestackStorage);
+
 class StorageRef extends ReferenceBase {
   constructor(storage, path) {
     super(storage.firestack, path);