resolve conflit

.gitignore

@@ -46,3 +46,11 @@ android/key.jks
 android/app/src/prod/AndroidManifest.xml
 android/app/src/prod/google-services.json
 android/app/src/prod/res/values/strings.xml
+.gradle/5.6.2/gc.properties
+.gradle/5.6.2/executionHistory/executionHistory.bin
+.gradle/5.6.2/executionHistory/executionHistory.lock
+.gradle/5.6.2/fileChanges/last-build.bin
+.gradle/5.6.2/fileHashes/fileHashes.lock
+.gradle/buildOutputCleanup/buildOutputCleanup.lock
+.gradle/buildOutputCleanup/cache.properties
+.gradle/vcs-1/gc.properties

.vscode/launch.json

@@ -24,6 +24,18 @@
                 "--flavor",
                 "dev"
             ],
+        },    
+        {
+            "name": "Local Dev2",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main-local.dart",
+            "args": [
+                "-t",
+                "lib/main-local.dart",
+                "--flavor",
+                "dev"
+            ],
         },       
         {
             "name": "Dev",
@@ -37,6 +49,18 @@
                 "dev"
             ],
         },
+        {
+            "name": "Dev2",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main-dev.dart",
+            "args": [
+                "-t",
+                "lib/main-dev.dart",
+                "--flavor",
+                "dev"
+            ],
+        },
         {
             "name": "Dev iOS",
             "request": "launch",

lib/pages/package/model/package_model.dart

@@ -156,6 +156,7 @@ class PackageModel extends BaseModel {
       var snaps = await Firestore.instance
           .collection("$path")
           .where("tracking_id", isEqualTo: trackingID)
+          .where("is_deleted", isEqualTo: false)
           .getDocuments(source: Source.server);
       if (snaps.documents.length == 1) {
         var snap = snaps.documents[0];

pubspec.lock

@@ -91,7 +91,7 @@ packages:
       name: connectivity
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9+2"
+    version: "2.0.2"
   connectivity_for_web:
     dependency: transitive
     description:
@@ -525,13 +525,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.1"
-  platform_detect:
-    dependency: transitive
-    description:
-      name: platform_detect
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -560,13 +553,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.3.2+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.4"
   quill_delta:
     dependency: transitive
     description:
@@ -601,7 +587,7 @@ packages:
       name: share
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.5+4"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -725,7 +711,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.5.0"
+    version: "5.7.10"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -746,14 +732,21 @@ packages:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.7"
+    version: "1.0.9"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+1"
+    version: "0.1.5+1"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+3"
   uuid:
     dependency: "direct main"
     description:
@@ -785,12 +778,10 @@ packages:
   zefyr:
     dependency: "direct main"
     description:
-      path: "packages/zefyr"
+      name: zefyr
-      ref: HEAD
+      url: "https://pub.dartlang.org"
-      resolved-ref: "20b890b7714fd54ccd0028da5b354d3d8ac68251"
+    source: hosted
-      url: "git://github.com/masewo/zefyr.git"
+    version: "0.12.0"
-    source: git
-    version: "0.11.0"
 sdks:
   dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.20.0 <2.0.0"
+  flutter: ">=1.22.0 <2.0.0"

pubspec.yaml

@@ -35,15 +35,11 @@ dependencies:
   photo_view: ^0.9.0  
   uuid: ^2.0.4
   zefyr:
-        git:
-          url: git://github.com/masewo/zefyr.git
-          path: packages/zefyr
-          commit: 2e379982e97cc9b5aeb4fc0fcd85d6d32833f4ea
   path_provider: ^1.6.11
   camera: ^0.4.2
-  url_launcher: ^5.4.1
+  url_launcher: ^5.7.10
   device_info: ^0.4.1+4
-  connectivity: ^0.4.8+1
+  connectivity: ^2.0.2
   logging: ^0.11.4
   permission_handler: ^4.0.0
   country_code_picker: ^1.3.12
@@ -53,8 +49,8 @@ dependencies:
   timeline_list: ^0.0.5
   barcode_scan: ^2.0.2
   flutter_pdfview: ^1.0.3
-  flutter_local_notifications: ^1.4.4+4
+  flutter_local_notifications: ^1.4.4+4  
-  share: ^0.6.5
+  share: '>=0.6.5+4 <2.0.0'
   cached_network_image: ^2.3.2+1
   flutter_cache_manager: ^2.0.0