rename files

Author: Salakar

…lstack/firestack/FirestackAnalytics.java …va/io/fullstack/firestack/Analytics.javaandroid/src/main/java/io/fullstack/firestack/FirestackAnalytics.java renamed to android/src/main/java/io/fullstack/firestack/Analytics.java android/src/main/java/io/fullstack/firestack/FirestackAnalytics.java renamed to android/src/main/java/io/fullstack/firestack/Analytics.java

@@ -10,6 +10,7 @@
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReactMethod;
@@ -78,11 +79,9 @@ public void onCancelled(DatabaseError error) {
           self.handleDatabaseError(name, mPath, error);
         }
       };
+      Query ref = this.getDatabaseQueryAtPathAndModifiers(modifiersArray);
+      ref.addChildEventListener(mEventListener);
     }
-
-    Query ref = this.getDatabaseQueryAtPathAndModifiers(modifiersArray);
-    ref.addChildEventListener(mEventListener);
-    //this.setListeningTo(mPath, modifiersString, name);
   }
 
   public void addValueEventListener(final String name, final ReadableArray modifiersArray, final String modifiersString) {

…o/fullstack/firestack/FirestackAuth.java …in/java/io/fullstack/firestack/Auth.javaandroid/src/main/java/io/fullstack/firestack/FirestackAuth.java renamed to android/src/main/java/io/fullstack/firestack/Auth.java android/src/main/java/io/fullstack/firestack/FirestackAuth.java renamed to android/src/main/java/io/fullstack/firestack/Auth.java

@@ -2,7 +2,6 @@
 
 import android.util.Log;
 import android.os.Environment;
-import android.content.Context;
 
 import java.io.File;
 import java.util.Map;
@@ -18,7 +17,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 
@@ -49,11 +47,8 @@ class Storage extends ReactContextBaseJavaModule {
   private static final String FileTypeRegular = "FILETYPE_REGULAR";
   private static final String FileTypeDirectory = "FILETYPE_DIRECTORY";
 
-  private ReactContext mReactContext;
-
   public Storage(ReactApplicationContext reactContext) {
     super(reactContext);
-    mReactContext = reactContext;
 
     Log.d(TAG, "New instance");
   }
@@ -142,7 +137,13 @@ public void uploadFile(final String urlStr, final String name, final String file
     Log.i(TAG, "From file: " + filepath + " to " + urlStr + " with name " + name);
 
     try {
-      Uri file = Uri.fromFile(new File(filepath));
+      Uri file;
+      if (filepath.startsWith("content://")) {
+        String realPath = getRealPathFromURI(filepath);
+        file = Uri.fromFile(new File(realPath));
+      } else {
+        file = Uri.fromFile(new File(filepath));
+      }
 
       StorageMetadata.Builder metadataBuilder = new StorageMetadata.Builder();
       Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(metadata);
@@ -190,7 +191,7 @@ public void onProgress(UploadTask.TaskSnapshot taskSnapshot) {
                 WritableMap data = Arguments.createMap();
                 data.putString("eventName", "upload_progress");
                 data.putDouble("progress", progress);
-                Utils.sendEvent(mReactContext, "upload_progress", data);
+                Utils.sendEvent(getReactApplicationContext(), "upload_progress", data);
               }
             }
           })
@@ -203,7 +204,7 @@ public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
               WritableMap data = Arguments.createMap();
               data.putString("eventName", "upload_paused");
               data.putString("ref", bucket);
-              Utils.sendEvent(mReactContext, "upload_paused", data);
+              Utils.sendEvent(getReactApplicationContext(), "upload_paused", data);
             }
           });
     } catch (Exception ex) {
@@ -214,21 +215,29 @@ public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
   @ReactMethod
   public void getRealPathFromURI(final String uri, final Callback callback) {
     try {
-      Context context = getReactApplicationContext();
-      String[] proj = {MediaStore.Images.Media.DATA};
-      Cursor cursor = context.getContentResolver().query(Uri.parse(uri), proj, null, null, null);
-      int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-      cursor.moveToFirst();
-      String path = cursor.getString(column_index);
-      cursor.close();
-
+      String path = getRealPathFromURI(uri);
       callback.invoke(null, path);
     } catch (Exception ex) {
       ex.printStackTrace();
       callback.invoke(makeErrorPayload(1, ex));
     }
   }
 
+  private String getRealPathFromURI(final String uri) {
+    Cursor cursor = null;
+    try {
+      String[] proj = {MediaStore.Images.Media.DATA};
+      cursor = getReactApplicationContext().getContentResolver().query(Uri.parse(uri), proj, null, null, null);
+      int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+      cursor.moveToFirst();
+      return cursor.getString(column_index);
+    } finally {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+
   private WritableMap getDownloadData(final UploadTask.TaskSnapshot taskSnapshot) {
     Uri downloadUrl = taskSnapshot.getDownloadUrl();
     StorageMetadata d = taskSnapshot.getMetadata();

…llstack/firestack/FirestackDatabase.java …ava/io/fullstack/firestack/Database.javaandroid/src/main/java/io/fullstack/firestack/FirestackDatabase.java renamed to android/src/main/java/io/fullstack/firestack/Database.java android/src/main/java/io/fullstack/firestack/FirestackDatabase.java renamed to android/src/main/java/io/fullstack/firestack/Database.java

@@ -258,7 +258,7 @@ firestack.auth().updateUserEmail('foo@bar.com')
 Important: this is a security sensitive operation that requires the user to have recently signed in. If this requirement isn't met, ask the user to authenticate again and then call firebase.User#reauthenticate.  This will Promise reject is the user is anonymous.
 
 ```javascript
-firestack.auth().updateUserPassword('foobar1234')
+firestack.auth().updatePassword('foobar1234')
   .then()
   .catch();
 ```