Skip to content

Commit cb4a19a

Browse files
SalakarSalakar
committed
misc
1 parent 61e83cc commit cb4a19a

File tree

3 files changed

+56
-75
lines changed

3 files changed

+56
-75
lines changed

‎android/src/main/java/io/fullstack/firestack/FirestackModule.java

Lines changed: 49 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.fullstack.firestack;
22

33
import java.util.Map;
4+
45
import android.util.Log;
56
import android.content.Context;
67
import android.support.annotation.Nullable;
@@ -23,6 +24,7 @@ interface KeySetterFn {
2324
String setKeyOrDefault(String a, String b);
2425
}
2526

27+
@SuppressWarnings("WeakerAccess")
2628
class FirestackModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
2729
private static final String TAG = "Firestack";
2830
private Context context;
@@ -55,8 +57,8 @@ public void configureWithOptions(final ReadableMap params, @Nullable final Callb
5557

5658
KeySetterFn fn = new KeySetterFn() {
5759
public String setKeyOrDefault(
58-
final String key,
59-
final String defaultValue) {
60+
final String key,
61+
final String defaultValue) {
6062
if (params.hasKey(key)) {
6163
// User-set key
6264
final String val = params.getString(key);
@@ -71,47 +73,26 @@ public String setKeyOrDefault(
7173
}
7274
};
7375

74-
String val = fn.setKeyOrDefault("applicationId",
75-
defaultOptions.getApplicationId());
76-
if (val != null) {
77-
builder.setApplicationId(val);
78-
}
76+
String val = fn.setKeyOrDefault("applicationId", defaultOptions.getApplicationId());
77+
if (val != null) builder.setApplicationId(val);
7978

80-
val = fn.setKeyOrDefault("apiKey",
81-
defaultOptions.getApiKey());
82-
if (val != null) {
83-
builder.setApiKey(val);
84-
}
79+
val = fn.setKeyOrDefault("apiKey", defaultOptions.getApiKey());
80+
if (val != null) builder.setApiKey(val);
8581

86-
val = fn.setKeyOrDefault("gcmSenderID",
87-
defaultOptions.getGcmSenderId());
88-
if (val != null) {
89-
builder.setGcmSenderId(val);
90-
}
82+
val = fn.setKeyOrDefault("gcmSenderID", defaultOptions.getGcmSenderId());
83+
if (val != null) builder.setGcmSenderId(val);
9184

92-
val = fn.setKeyOrDefault("storageBucket",
93-
defaultOptions.getStorageBucket());
94-
if (val != null) {
95-
builder.setStorageBucket(val);
96-
}
85+
val = fn.setKeyOrDefault("storageBucket", defaultOptions.getStorageBucket());
86+
if (val != null) builder.setStorageBucket(val);
9787

98-
val = fn.setKeyOrDefault("databaseURL",
99-
defaultOptions.getDatabaseUrl());
100-
if (val != null) {
101-
builder.setDatabaseUrl(val);
102-
}
88+
val = fn.setKeyOrDefault("databaseURL", defaultOptions.getDatabaseUrl());
89+
if (val != null) builder.setDatabaseUrl(val);
10390

104-
val = fn.setKeyOrDefault("databaseUrl",
105-
defaultOptions.getDatabaseUrl());
106-
if (val != null) {
107-
builder.setDatabaseUrl(val);
108-
}
91+
val = fn.setKeyOrDefault("databaseUrl", defaultOptions.getDatabaseUrl());
92+
if (val != null) builder.setDatabaseUrl(val);
10993

110-
val = fn.setKeyOrDefault("clientId",
111-
defaultOptions.getApplicationId());
112-
if (val != null) {
113-
builder.setApplicationId(val);
114-
}
94+
val = fn.setKeyOrDefault("clientId", defaultOptions.getApplicationId());
95+
if (val != null) builder.setApplicationId(val);
11596

11697

11798
// if (params.hasKey("applicationId")) {
@@ -151,24 +132,23 @@ public String setKeyOrDefault(
151132
// }
152133

153134
try {
154-
Log.i(TAG, "Configuring app");
155-
if (app == null) {
156-
app = FirebaseApp.initializeApp(this.context, builder.build());
157-
}
158-
Log.i(TAG, "Configured");
135+
Log.i(TAG, "Configuring app");
136+
if (app == null) {
137+
app = FirebaseApp.initializeApp(this.context, builder.build());
138+
}
139+
Log.i(TAG, "Configured");
159140

160-
WritableMap resp = Arguments.createMap();
161-
resp.putString("msg", "success");
162-
onComplete.invoke(null, resp);
163-
}
164-
catch (Exception ex){
165-
Log.e(TAG, "ERROR configureWithOptions");
166-
Log.e(TAG, ex.getMessage());
141+
WritableMap resp = Arguments.createMap();
142+
resp.putString("msg", "success");
143+
onComplete.invoke(null, resp);
144+
} catch (Exception ex) {
145+
Log.e(TAG, "ERROR configureWithOptions");
146+
Log.e(TAG, ex.getMessage());
167147

168-
WritableMap resp = Arguments.createMap();
169-
resp.putString("msg", ex.getMessage());
148+
WritableMap resp = Arguments.createMap();
149+
resp.putString("msg", ex.getMessage());
170150

171-
onComplete.invoke(resp);
151+
onComplete.invoke(resp);
172152
}
173153
}
174154

@@ -181,26 +161,26 @@ public void serverValue(@Nullable final Callback onComplete) {
181161

182162
WritableMap map = Arguments.createMap();
183163
map.putMap("TIMESTAMP", timestampMap);
184-
onComplete.invoke(null, map);
164+
if (onComplete != null) onComplete.invoke(null, map);
185165
}
186166

187-
// Internal helpers
188-
@Override
189-
public void onHostResume() {
190-
WritableMap params = Arguments.createMap();
191-
params.putBoolean("isForground", true);
192-
FirestackUtils.sendEvent(mReactContext, "FirestackAppState", params);
193-
}
167+
// Internal helpers
168+
@Override
169+
public void onHostResume() {
170+
WritableMap params = Arguments.createMap();
171+
params.putBoolean("isForground", true);
172+
FirestackUtils.sendEvent(mReactContext, "FirestackAppState", params);
173+
}
194174

195-
@Override
196-
public void onHostPause() {
197-
WritableMap params = Arguments.createMap();
198-
params.putBoolean("isForground", false);
199-
FirestackUtils.sendEvent(mReactContext, "FirestackAppState", params);
200-
}
175+
@Override
176+
public void onHostPause() {
177+
WritableMap params = Arguments.createMap();
178+
params.putBoolean("isForground", false);
179+
FirestackUtils.sendEvent(mReactContext, "FirestackAppState", params);
180+
}
201181

202-
@Override
203-
public void onHostDestroy() {
182+
@Override
183+
public void onHostDestroy() {
204184

205-
}
185+
}
206186
}

‎android/src/main/java/io/fullstack/firestack/FirestackPackage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
import com.facebook.react.bridge.ReactApplicationContext;
99
import com.facebook.react.uimanager.ViewManager;
1010

11+
import java.util.List;
1112
import java.util.ArrayList;
1213
import java.util.Collections;
13-
import java.util.List;
1414

15+
@SuppressWarnings("unused")
1516
public class FirestackPackage implements ReactPackage {
1617
private Context mContext;
1718

@@ -24,7 +25,6 @@ public FirestackPackage() {
2425
@Override
2526
public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
2627
List<NativeModule> modules = new ArrayList<>();
27-
2828
modules.add(new FirestackModule(reactContext, reactContext.getBaseContext()));
2929
modules.add(new FirestackAuthModule(reactContext));
3030
modules.add(new FirestackDatabaseModule(reactContext));
@@ -54,4 +54,4 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
5454
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
5555
return Collections.emptyList();
5656
}
57-
}
57+
}

‎android/src/main/java/io/fullstack/firestack/FirestackStorage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.google.firebase.storage.OnProgressListener;
3535

3636

37+
@SuppressWarnings("WeakerAccess")
3738
class FirestackStorageModule extends ReactContextBaseJavaModule {
3839

3940
private static final String TAG = "FirestackStorage";
@@ -91,7 +92,6 @@ public void onSuccess(Uri uri) {
9192
@Override
9293
public void onSuccess(final StorageMetadata storageMetadata) {
9394
Log.d(TAG, "getMetadata success " + storageMetadata);
94-
res.putString("name", storageMetadata.getName());
9595

9696
WritableMap metadata = Arguments.createMap();
9797
metadata.putString("getBucket", storageMetadata.getBucket());
@@ -101,9 +101,10 @@ public void onSuccess(final StorageMetadata storageMetadata) {
101101
metadata.putDouble("updated_at", storageMetadata.getUpdatedTimeMillis());
102102
metadata.putString("md5hash", storageMetadata.getMd5Hash());
103103
metadata.putString("encoding", storageMetadata.getContentEncoding());
104-
res.putString("url", storageMetadata.getDownloadUrl().toString());
105104

106105
res.putMap("metadata", metadata);
106+
res.putString("name", storageMetadata.getName());
107+
res.putString("url", storageMetadata.getDownloadUrl().toString());
107108
callback.invoke(null, res);
108109
}
109110
})
@@ -254,7 +255,7 @@ private WritableMap makeErrorPayload(double code, Exception ex) {
254255
return error;
255256
}
256257

257-
// comes almost directly from react-native-fs
258+
258259
@Override
259260
public Map<String, Object> getConstants() {
260261
final Map<String, Object> constants = new HashMap<>();

0 commit comments

Comments
 (0)