wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bugs in the URLRewriteActivity and USAirwaysLoadActivity

Browse source
This commit is contained in:
Liuhao 2019-08-19 19:05:26 +08:00 committed by ligi
parent d6d276e349
commit b3eeda7cff
No known key found for this signature in database
GPG key ID: 8E81894010ABF23D
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/main/java/org/ligi/passandroid/ui/quirk_fix/URLRewriteActivity.java
View file

@ -16,7 +16,7 @@ public class URLRewriteActivity extends PassAndroidActivity {
final Uri data = getIntent().getData(); final Uri data = getIntent().getData();
final String url = data != null ? new URLRewriteController(getTracker()).getUrlByUri(data) : null; final String url = data != null ? new URLRewriteController(getTracker()).getUrlByUri(data) : null;
if (data != null && url == null) { if ((data != null && url == null) || data == null) {
new AlertDialog.Builder(this).setTitle("Workaround failed") new AlertDialog.Builder(this).setTitle("Workaround failed")
.setMessage( .setMessage(
"The URL PassAndroid tried to work around failed :-( some companies just send PassBooks to Apple Devices - this was an attempt to workaround this." + "The URL PassAndroid tried to work around failed :-( some companies just send PassBooks to Apple Devices - this was an attempt to workaround this." +

30
android/src/main/java/org/ligi/passandroid/ui/quirk_fix/USAirwaysLoadActivity.kt
View file

@ -1,8 +1,10 @@
package org.ligi.passandroid.ui.quirk_fix package org.ligi.passandroid.ui.quirk_fix
import android.content.DialogInterface
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import org.ligi.passandroid.ui.PassAndroidActivity import org.ligi.passandroid.ui.PassAndroidActivity
import org.ligi.passandroid.ui.PassImportActivity import org.ligi.passandroid.ui.PassImportActivity
@ -13,12 +15,38 @@ class USAirwaysLoadActivity : PassAndroidActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val data = intent.data val data = intent.data
val url = data?.toString()?.removeSuffix("/") ?: "" if (data == null){
AlertDialog.Builder(this).setTitle("Workaround failed")
.setMessage(
"The URL PassAndroid tried to work around failed :-( some companies just send PassBooks to Apple Devices - this was an attempt to workaround this." + "Unfortunately it failed - perhaps there where changes on the serverside - you can open the site with your browser now - to see it in PassAndroid in future again it would help if you can send me the pass")
.setPositiveButton("Browser") { dialog, which ->
tracker.trackException("URLRewrite with invalid activity", false)
val intent = Intent(this@USAirwaysLoadActivity, OpenIphoneWebView::class.java)
intent.data = data
startActivity(intent)
}
.setNeutralButton("send") { dialog, which ->
val intent = Intent(Intent.ACTION_SEND)
intent.putExtra(Intent.EXTRA_SUBJECT, "PassAndroid: URLRewrite Problem")
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("ligi@ligi.de"))
intent.putExtra(Intent.EXTRA_TEXT, data.toString())
intent.type = "text/plain"
startActivity(Intent.createChooser(intent, "How to send Link?"))
finish()
}
.setNegativeButton("cancel") { dialog, which -> this@USAirwaysLoadActivity.finish() }
.show()
return
}
val url = data?.toString()?.removeSuffix("/") ?: ""
val split = url.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() val split = url.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
val passId = split[split.size - 2] + "/" + split[split.size - 1] val passId = split[split.size - 2] + "/" + split[split.size - 1]
val redirectUrl = "http://prod.wap.ncrwebhost.mobi/mobiqa/wap/$passId/passbook" val redirectUrl = "http://prod.wap.ncrwebhost.mobi/mobiqa/wap/$passId/passbook"
tracker.trackEvent("quirk_fix", "redirect", "usairways", null) tracker.trackEvent("quirk_fix", "redirect", "usairways", null)