From 80b45973acf2b48291967618c32892248fe3a637 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 16 Dec 2019 16:45:45 +0100
Subject: [PATCH] More zip types

---
 app/src/main/AndroidManifest.xml              |  5 +++--
 .../card_locker/LoyaltyCardEditActivity.java  | 20 +++++++------------
 .../protect/card_locker/PkpassImporter.java   |  4 ----
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7d8152d65..afcb2c197 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,17 +49,18 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Accepts URIs that begin with "https://github.com/brarcher/loyalty-card-locker/” -->
+                <!-- Accepts URIs that begin with "https://brarcher.github.io/loyalty-card-locker/share” -->
                 <data android:scheme="https"
                     android:host="@string/intent_import_card_from_url_host"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
             </intent-filter>
             <intent-filter android:label="@string/intent_import_card_from_url">
                 <action android:name="android.intent.action.VIEW"/>
-
                 <category android:name="android.intent.category.DEFAULT"/>
                 <!-- Accept pkpass files -->
                 <data android:scheme="content" android:mimeType="application/octet-stream"/>
+                <data android:scheme="content" android:mimeType="application/x-compressed"/>
+                <data android:scheme="content" android:mimeType="application/x-zip-compressed"/>
                 <data android:scheme="content" android:mimeType="application/zip"/>
                 <data android:scheme="content" android:mimeType="application/vnd.apple.pkpass"/>
                 <data android:scheme="content" android:mimeType="application/pkpass"/>
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 03b26e6a2..a9cb3e57c 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -85,19 +85,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     private LoyaltyCard importCard(String type, Uri uri)
     {
-        // Pkpass
-        if(type != null && pkpassImporter.isPkpass(type))
-        {
-            try
-            {
-                return pkpassImporter.fromURI(uri);
-            }
-            catch (IOException | JSONException ex)
-            {
-                return null;
-            }
-        }
-
         // Import URI
         if(importUriHelper.isImportUri(uri))
         {
@@ -111,6 +98,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         }
 
+        // Pkpass
+        try
+        {
+            return pkpassImporter.fromURI(uri);
+        }
+        catch (IOException | JSONException ex) {}
+
         return null;
     }
 
diff --git a/app/src/main/java/protect/card_locker/PkpassImporter.java b/app/src/main/java/protect/card_locker/PkpassImporter.java
index e2f08a4f9..9fcca227c 100644
--- a/app/src/main/java/protect/card_locker/PkpassImporter.java
+++ b/app/src/main/java/protect/card_locker/PkpassImporter.java
@@ -138,10 +138,6 @@ public class PkpassImporter {
         return extrasHelper;
     }
 
-    public boolean isPkpass(String type) {
-        return Arrays.asList("application/octet-stream", "application/zip", "application/vnd.apple.pkpass", "application/pkpass", "application/vndapplepkpass", "application/vnd-com.apple.pkpass").contains(type);
-    }
-
     public LoyaltyCard fromURI(Uri uri) throws IOException, JSONException {
         return fromInputStream(context.getContentResolver().openInputStream(uri));
     }