mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-18 05:36:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

More zip types

Browse Source
This commit is contained in:
Sylvia van Os
2019-12-16 16:45:45 +01:00
parent ca8243de01
commit 80b45973ac
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -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"/>

20
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -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;
}

4
app/src/main/java/protect/card_locker/PkpassImporter.java
View File

@@ -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));
}