Mirrors/Catima-Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2025-12-28 13:21:45 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #2289 from CatimaLoyalty/hack/espass_as_pkpass
Some checks failed
Android CI / build (Foss) (push) Waiting to run
Details
Android CI / build (Gplay) (push) Waiting to run
Details
Convert CHANGELOG to Fastlane / Convert CHANGELOG to Fastlane (push) Has been cancelled
Details
Write contributors to file / Write contributors to file (push) Has been cancelled
Details

Browse Source 
Add unofficial support for espass
This commit is contained in:
Sylvia van Os 2025-01-11 12:50:06 +01:00 committed by GitHub
commit 5fdc575485
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@
<data android:mimeType="application/pdf" />
<data android:mimeType="application/vnd.apple.pkpass" />
<data android:mimeType="application/vnd-com.apple.pkpass" />
<data android:mimeType="application/vnd.espass-espass" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
@ -60,6 +61,7 @@
<data android:mimeType="application/pdf" />
<data android:mimeType="application/vnd.apple.pkpass" />
<data android:mimeType="application/vnd-com.apple.pkpass" />
<data android:mimeType="application/vnd.espass-espass" />
</intent-filter>
</activity>
<activity

5
app/src/main/java/protect/card_locker/MainActivity.java
View File

@ -502,6 +502,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
} else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
} else if (receivedType.equals("application/vnd.espass-espass")) {
// FIXME: espass is not pkpass
// However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
// So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
} else {
Log.e(TAG, "Wrong mime-type");
return;