Page MenuHomeGitPull.it
Files F13770778

D244.1787238160.diff
No OneTemporary
Actions

Authored By
Unknown
Size
7 KB
Referenced Files
None
Subscribers
None

D244.1787238160.diff
View Options

diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt
--- a/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/BarcodeFragment.kt
@@ -41,12 +41,13 @@
abstract fun onQrScanSuccess(busIDToSearch: String)
protected fun launchBarcodeScan() {
+ val context = getContext() ?: return
val scanOptions = BarcodeScanOptions()
val intent = scanOptions.createScanIntent()
- if (!BarcodeScanUtils.checkTargetPackageExists(getContext(), intent)) {
- BarcodeScanUtils.showDownloadDialog(null, this)
+ if (!BarcodeScanUtils.checkTargetPackageExists(context, intent)) {
+ BarcodeScanUtils.showDownloadDialog(context)
} else {
barcodeLauncher.launch(scanOptions)
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
--- a/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanOptions.java
@@ -19,6 +19,7 @@
public class BarcodeScanOptions {
public static final String BS_PACKAGE = "com.google.zxing.client.android";
+ public static final String BINARY_EYE_PACKAGE = "de.markusfisch.android.binaryeye";
// supported barcode formats
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
--- a/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/BarcodeScanUtils.java
@@ -13,6 +13,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.Barrier;
import androidx.fragment.app.Fragment;
import java.util.List;
@@ -25,34 +26,27 @@
public static boolean checkTargetPackageExists(Context context,Intent intent) {
PackageManager pm = context.getPackageManager();
List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
- if (availableApps != null) {
- return !availableApps.isEmpty();
- }
- return false;
+ return !availableApps.isEmpty();
}
- public static AlertDialog showDownloadDialog(@Nullable Activity activity,@Nullable final Fragment fragment) {
- if (activity == null){
- if (fragment==null) throw new IllegalArgumentException("Cannot put both activity and fragment null");
- activity = fragment.getActivity();
- }
- AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
+ public static AlertDialog showDownloadDialog(@NonNull Context context) {
+
+ AlertDialog.Builder downloadDialog = new AlertDialog.Builder(context);
downloadDialog.setTitle(R.string.title_barcode_scanner_install);
downloadDialog.setMessage(R.string.message_install_barcode_scanner);
- final Activity finalActivity = activity;
downloadDialog.setPositiveButton(R.string.yes, (dialogInterface, i) -> {
- final String packageName = BarcodeScanOptions.BS_PACKAGE;
+ final String packageName = BarcodeScanOptions.BINARY_EYE_PACKAGE;
Uri uri = Uri.parse("market://details?id=" + packageName);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
try {
- if (fragment == null) {
- finalActivity.startActivity(intent);
- } else {
- fragment.startActivity(intent);
- }
+ context.startActivity(intent);
} catch (ActivityNotFoundException anfe) {
// Hmm, market is not installed
Log.w("BusTO-BarcodeScanUtils", "Google Play is not installed; cannot install " + packageName);
+ //Open the browser on the F-Droid web page
+ intent = new Intent(Intent.ACTION_VIEW,
+ Uri.parse("https://f-droid.org/en/packages/"+BarcodeScanOptions.BINARY_EYE_PACKAGE+"/"));
+ context.startActivity(intent);
}
});
downloadDialog.setNegativeButton(R.string.no, null);
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -8,8 +8,8 @@
<string name="no">No</string>
<string name="next">Prossimo</string>
<string name="previous">Precedente</string>
- <string name="title_barcode_scanner_install">Installare Barcode Scanner?</string>
- <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR. Vuoi installare Barcode Scanner?</string>
+ <string name="title_barcode_scanner_install">Necessaria app per leggere i codici QR</string>
+ <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR, ma non è stata trovata sul dispositivo. Vuoi installare Binary Eye?</string>
<string name="insert_bus_stop_number">Numero fermata</string>
<string name="insert_bus_stop_name">Nome fermata</string>
<string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
@@ -37,7 +37,7 @@
<string name="results">Scegli la fermata…</string>
<string name="vehicle_fill">Matricola %1$s</string>
<string name="no_passages">Nessun passaggio</string>
- <string name="no_qrcode">Nessun QR code trovato, prova ad usare un\'altra app</string>
+ <string name="no_qrcode">Nessun QR code trovato, riprova</string>
<string name="action_favorites">Preferiti</string>
<string name="action_help">Aiuto</string>
<string name="action_about">Informazioni</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,9 +14,10 @@
<string name="next">Next</string>
<string name="previous">Previous</string>
- <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
- <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
- to install Barcode Scanner now?
+ <string name="title_barcode_scanner_install">Barcode scanner app is needed</string>
+ <!-- make nice message indicating that we like this app and want to install it if clicking OK-->
+ <string name="message_install_barcode_scanner">This functionality requires another app to scan the QR codes, which has not been found on the device. We suggest using Binary Eye, which
+ is open source software, would you like to install it now?
</string>
<string name="insert_bus_stop_number">Bus stop number</string>
@@ -50,7 +51,7 @@
<string name="stop_fill">Stop %1$s</string>
<string name="vehicle_fill">Vehicle %1$s</string>
<string name="no_passages">No timetable found</string>
- <string name="no_qrcode">No QR code found, try using another app to scan</string>
+ <string name="no_qrcode">No QR code found, retry</string>
<string name="scan_qr_code_stop">Scan QR code at the bus stop</string>
<string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
<string name="action_help">Help</string>

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 20, 17:02 (22 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2072588
Default Alt Text
D244.1787238160.diff (7 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register