nativescript-barcodescanner
Advanced tools
Comparing version 2.1.3 to 2.1.4
@@ -6,3 +6,2 @@ import { ScanOptions } from "./barcodescanner.common"; | ||
private onPermissionRejected; | ||
private rememberedContext; | ||
constructor(); | ||
@@ -9,0 +8,0 @@ private wasCameraPermissionGranted; |
@@ -11,3 +11,2 @@ "use strict"; | ||
this.broadcastManager = null; | ||
this.rememberedContext = null; | ||
this.wasCameraPermissionGranted = function () { | ||
@@ -24,3 +23,3 @@ var hasPermission = android.os.Build.VERSION.SDK_INT < 23; | ||
this.onPermissionRejected = reject; | ||
android.support.v4.app.ActivityCompat.requestPermissions(appModule.android.currentContext, [android.Manifest.permission.CAMERA], 234); | ||
android.support.v4.app.ActivityCompat.requestPermissions(appModule.android.foregroundActivity, [android.Manifest.permission.CAMERA], 234); | ||
}; | ||
@@ -146,6 +145,2 @@ var self = this; | ||
appModule.android.onActivityResult = function (requestCode, resultCode, data) { | ||
if (self.rememberedContext !== null) { | ||
appModule.android.currentContext = self.rememberedContext; | ||
self.rememberedContext = null; | ||
} | ||
appModule.android.onActivityResult = previousResult_1; | ||
@@ -174,4 +169,3 @@ if (requestCode === SCANNER_REQUEST_CODE) { | ||
}; | ||
self.rememberedContext = appModule.android.currentContext; | ||
appModule.android.currentContext.startActivityForResult(intent, SCANNER_REQUEST_CODE); | ||
appModule.android.foregroundActivity.startActivityForResult(intent, SCANNER_REQUEST_CODE); | ||
if (isContinuous) { | ||
@@ -178,0 +172,0 @@ resolve(); |
# Change Log | ||
## [2.1.4](https://github.com/EddyVerbruggen/nativescript-barcodescanner/tree/2.1.4) (2016-11-21) | ||
[Full Changelog](https://github.com/EddyVerbruggen/nativescript-barcodescanner/compare/2.1.3...2.1.4) | ||
**Implemented enhancements:** | ||
- fix\(android\): change currentContext to foregroundActivity [\#51](https://github.com/EddyVerbruggen/nativescript-barcodescanner/pull/51) ([sis0k0](https://github.com/sis0k0)) | ||
**Fixed bugs:** | ||
- Error after scan, Android, Nativescript 2.4 [\#50](https://github.com/EddyVerbruggen/nativescript-barcodescanner/issues/50) | ||
- App Crash after scanning a barcode \(Android\) [\#39](https://github.com/EddyVerbruggen/nativescript-barcodescanner/issues/39) | ||
- fix\\(android\\): change currentContext to foregroundActivity [\#51](https://github.com/EddyVerbruggen/nativescript-barcodescanner/pull/51) ([sis0k0](https://github.com/sis0k0)) | ||
## [2.1.3](https://github.com/EddyVerbruggen/nativescript-barcodescanner/tree/2.1.3) (2016-11-04) | ||
@@ -10,2 +23,6 @@ [Full Changelog](https://github.com/EddyVerbruggen/nativescript-barcodescanner/compare/2.1.2...2.1.3) | ||
**Fixed bugs:** | ||
- make type script happy with barcodescanner.d.ts [\#47](https://github.com/EddyVerbruggen/nativescript-barcodescanner/issues/47) | ||
**Closed issues:** | ||
@@ -34,2 +51,6 @@ | ||
**Implemented enhancements:** | ||
- callback after permission granted \(android 6\) [\#26](https://github.com/EddyVerbruggen/nativescript-barcodescanner/issues/26) | ||
**Fixed bugs:** | ||
@@ -36,0 +57,0 @@ |
{ | ||
"name": "nativescript-barcodescanner", | ||
"version": "2.1.3", | ||
"version": "2.1.4", | ||
"description": "Scan QR/barcodes with a {N} app.", | ||
@@ -5,0 +5,0 @@ "main": "barcodescanner.js", |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1656471
529