diff --git a/CHANGELOG.md b/CHANGELOG.md index aa4f751..1e77a7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,4 +5,9 @@ ## [0.0.2] - 11/7/17 -* Rewrite iOS scanner in Objective-C to avoid Swift use_frameworks! conflicts with other plugins (see https://github.com/flutter/flutter/issues/10968) \ No newline at end of file +* Rewrite iOS scanner in Objective-C to avoid Swift use_frameworks! conflicts with other plugins (see https://github.com/flutter/flutter/issues/10968) + +## [0.0.3] - 1/19/17 + +* Improved permission handling (thanks to [BenSower](https://github.com/BenSower)) +* Added MIT license \ No newline at end of file diff --git a/LICENSE b/LICENSE index ba75c69..736d914 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1,21 @@ -TODO: Add your license here. +The MIT License + +Copyright (c) 2018 AppTree Software http://www.apptreesoftware.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt b/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt index 5113947..f8c211b 100644 --- a/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt +++ b/android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScannerActivity.kt @@ -1,24 +1,3 @@ -/* - * ************************************************************************ - * * - * * AppTree Software Inc CONFIDENTIAL - * * __________________ - * * - * * [2012] - [2016] AppTree Software Inc - * * All Rights Reserved. - * * - * * NOTICE: All information contained herein is, and remains - * * the property of AppTree Software Inc and its suppliers, - * * if any. The intellectual and technical concepts contained - * * herein are proprietary to AppTree Software Inc - * * and its suppliers and may be covered by U.S. and Foreign Patents, - * * patents in process, and are protected by trade secret or copyright law. - * * Dissemination of this information or reproduction of this material - * * is strictly forbidden unless prior written permission is obtained - * * from AppTree Software Inc. - * - */ - package com.apptreesoftware.barcodescan import android.Manifest