initial

czenpai · Sep 3, 2019 · 815bbd7 · 815bbd7
1 parent 323e71c
commit 815bbd7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 19 deletions.
diff --git a/packages/cloud_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.9+3
+
+* Updated error handling on Android for transactions to prevent crashes.
+
 ## 0.12.9+2
 
 * Fix flaky integration test for `includeMetadataChanges`.

diff --git a/...ndroid/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java b/...ndroid/src/main/java/io/flutter/plugins/firebase/cloudfirestore/CloudFirestorePlugin.java
@@ -474,7 +474,7 @@ public void run() {
                         result.success(snapshotMap);
                       }
                     });
-              } catch (final FirebaseFirestoreException e) {
+              } catch (final Exception e) {
                 activity.runOnUiThread(
                     new Runnable() {
                       @Override
@@ -506,7 +506,7 @@ public void run() {
                         result.success(null);
                       }
                     });
-              } catch (final IllegalStateException e) {
+              } catch (final Exception e) {
                 activity.runOnUiThread(
                     new Runnable() {
                       @Override
@@ -529,14 +529,24 @@ public void run() {
             @Override
             protected Void doInBackground(Void... voids) {
               Map<String, Object> data = (Map<String, Object>) arguments.get("data");
-              transaction.set(getDocumentReference(arguments), data);
-              activity.runOnUiThread(
-                  new Runnable() {
-                    @Override
-                    public void run() {
-                      result.success(null);
-                    }
-                  });
+              try {
+                transaction.set(getDocumentReference(arguments), data);
+                activity.runOnUiThread(
+                        new Runnable() {
+                          @Override
+                          public void run() {
+                            result.success(null);
+                          }
+                        });
+              } catch (final Exception e) {
+                activity.runOnUiThread(
+                        new Runnable() {
+                          @Override
+                          public void run() {
+                            result.error("Error performing Transaction#set", e.getMessage(), null);
+                          }
+                        });
+              }
               return null;
             }
           }.execute();
@@ -549,14 +559,24 @@ public void run() {
           new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... voids) {
-              transaction.delete(getDocumentReference(arguments));
-              activity.runOnUiThread(
-                  new Runnable() {
-                    @Override
-                    public void run() {
-                      result.success(null);
-                    }
-                  });
+              try {
+                transaction.delete(getDocumentReference(arguments));
+                activity.runOnUiThread(
+                        new Runnable() {
+                          @Override
+                          public void run() {
+                            result.success(null);
+                          }
+                        });
+              } catch (final Exception e) {
+                activity.runOnUiThread(
+                        new Runnable() {
+                          @Override
+                          public void run() {
+                            result.error("Error performing Transaction#delete", e.getMessage(), null);
+                          }
+                        });
+              }
               return null;
             }
           }.execute();

diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Cloud Firestore, a cloud-hosted, noSQL database
   live synchronization and offline support on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore
-version: 0.12.9+2
+version: 0.12.9+3
 
 flutter:
   plugin: