summaryrefslogtreecommitdiff
path: root/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
diff options
context:
space:
mode:
Diffstat (limited to 'android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java')
-rw-r--r--android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java18
1 files changed, 16 insertions, 2 deletions
diff --git a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
index 68a13d2e3..976f50f07 100644
--- a/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
+++ b/android-integration/src/com/google/zxing/integration/android/IntentIntegrator.java
@@ -92,7 +92,7 @@ import android.util.Log;
* @author Brad Drehmer
* @author gcstang
*/
-public final class IntentIntegrator {
+public class IntentIntegrator {
public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
private static final String TAG = IntentIntegrator.class.getSimpleName();
@@ -235,9 +235,23 @@ public final class IntentIntegrator {
intentScan.setPackage(targetAppPackage);
intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
- activity.startActivityForResult(intentScan, REQUEST_CODE);
+ startActivityForResult(intentScan, REQUEST_CODE);
return null;
}
+
+ /**
+ * Start an activity.<br>
+ * This method is defined to allow different methods of activity starting for
+ * newer versions of Android and for compatibility library.
+ *
+ * @param intent Intent to start.
+ * @param code Request code for the activity
+ * @see android.app.Activity#startActivityForResult(Intent, int)
+ * @see android.app.Fragment#startActivityForResult(Intent, int)
+ */
+ protected void startActivityForResult(Intent intent, int code) {
+ activity.startActivityForResult(intent, code);
+ }
private String findTargetAppPackage(Intent intent) {
PackageManager pm = activity.getPackageManager();