From 1dd045a4d9d9117a067ccb805a596364d2948ac9 Mon Sep 17 00:00:00 2001
From: error500 <nonstopus.sha@gmail.com>
Date: Mon, 11 Oct 2021 13:12:19 +0600
Subject: [PATCH 1/3] fix_ssl_master

---
 android/app/src/main/AndroidManifest.xml |  2 +-
 lib/main.dart                            | 12 ++++++
 pubspec.lock                             | 50 ++++++++++++------------
 pubspec.yaml                             |  2 +-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8277d0d..dbd59eb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
         android:label="Аман Касса"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_rounded"
-        android:usesCleartextTraffic="true">
+        >
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
diff --git a/lib/main.dart b/lib/main.dart
index 1f0d5e6..498394b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,6 +3,8 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
+import 'dart:io';
+
 import 'package:aman_kassa_flutter/shared/app_colors.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -20,6 +22,7 @@ import 'views/start_up/start_up_view.dart';
 //main start
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  HttpOverrides.global = MyHttpOverrides();
   //initialize locator
   await LocatorInjector.setupLocator();
 
@@ -32,6 +35,15 @@ void main() async {
   runApp(MainApplication());
 }
 
+class MyHttpOverrides extends HttpOverrides{
+  @override
+  HttpClient createHttpClient(SecurityContext context){
+    return super.createHttpClient(context)
+      ..badCertificateCallback = (X509Certificate cert, String host, int port)=> true;
+  }
+}
+
+
 class MainApplication extends StatelessWidget {
 
   @override
diff --git a/pubspec.lock b/pubspec.lock
index 3f8ceb6..0f32a75 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   charset_converter:
     dependency: "direct main"
     description:
@@ -126,7 +126,7 @@ packages:
       name: equatable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.5"
+    version: "1.2.6"
   esc_pos_bluetooth:
     dependency: "direct main"
     description:
@@ -161,14 +161,14 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.2"
   fixnum:
     dependency: transitive
     description:
@@ -239,14 +239,14 @@ packages:
       name: get_it
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.4"
+    version: "5.0.6"
   google_fonts:
     dependency: "direct main"
     description:
       name: google_fonts
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   hex:
     dependency: transitive
     description:
@@ -337,21 +337,21 @@ packages:
       name: material_design_icons_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.5855"
+    version: "4.0.5955"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
       name: nested
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4"
+    version: "1.0.0"
   path:
     dependency: transitive
     description:
@@ -365,7 +365,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.27"
+    version: "1.6.28"
   path_provider_linux:
     dependency: transitive
     description:
@@ -393,14 +393,14 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+3"
+    version: "0.0.5"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:
@@ -428,7 +428,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.2"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -442,21 +442,21 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.13"
+    version: "4.2.3"
   protobuf:
     dependency: transitive
     description:
       name: protobuf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.4"
   provider:
     dependency: "direct main"
     description:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2+4"
+    version: "4.3.3"
   qr:
     dependency: transitive
     description:
@@ -554,7 +554,7 @@ packages:
       name: shared_preferences_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+3"
+    version: "0.0.2+3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -566,21 +566,21 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2+2"
+    version: "1.3.2+4"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.3+3"
   stack_trace:
     dependency: transitive
     description:
@@ -622,7 +622,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -664,7 +664,7 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5+1"
+    version: "0.1.5+3"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -685,7 +685,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.4"
+    version: "2.2.9"
   xdg_directories:
     dependency: transitive
     description:
@@ -701,5 +701,5 @@ packages:
     source: hosted
     version: "4.5.1"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.13.0 <3.0.0"
   flutter: ">=1.22.2"
diff --git a/pubspec.yaml b/pubspec.yaml
index 05a344e..f87dd89 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: aman_kassa_flutter
 description: A new Flutter project.
-version: 1.2.3+29
+version: 1.2.3+35
 environment:
     sdk: '>=2.3.0 <3.0.0'
 dependencies:

From 0fe16b5ac9ad1bded5a252e1770239157c51bae4 Mon Sep 17 00:00:00 2001
From: error500 <nonstopus.sha@gmail.com>
Date: Mon, 11 Oct 2021 17:12:53 +0600
Subject: [PATCH 2/3] and fix printer permissions

---
 android/app/src/main/AndroidManifest.xml     | 6 +-----
 lib/views/settings/setting_printer_view.dart | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index dbd59eb..6c9b830 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,13 +10,9 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+
 
 
     <application
diff --git a/lib/views/settings/setting_printer_view.dart b/lib/views/settings/setting_printer_view.dart
index a94b72f..cf10e01 100644
--- a/lib/views/settings/setting_printer_view.dart
+++ b/lib/views/settings/setting_printer_view.dart
@@ -164,7 +164,7 @@ class _SettingPrinterViewState extends State<SettingPrinterView> {
   //только для Android
   void _permission() async {
     if( Platform.isAndroid) {
-      var status = await Permission.locationAlways.status;
+      var status = await Permission.location.status;
       log.i(status);
       if (status.isUndetermined || status.isDenied || status.isPermanentlyDenied) {
         DialogResponse response = await _dialogService.showConfirmationDialog(
@@ -174,7 +174,7 @@ class _SettingPrinterViewState extends State<SettingPrinterView> {
           confirmationTitle: 'Хорошо',
         );
         if (response.confirmed) {
-          if (await Permission.locationAlways
+          if (await Permission.location
               .request()
               .isGranted) {
             print('Granted');

From 12040f4c2ac5c3eeba57159628d05397e36cd7b5 Mon Sep 17 00:00:00 2001
From: error500 <nonstopus.sha@gmail.com>
Date: Tue, 12 Oct 2021 09:29:13 +0600
Subject: [PATCH 3/3] 1.2.3+36 fix ssl for 5.0 sdk 21

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index f87dd89..8f8283c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: aman_kassa_flutter
 description: A new Flutter project.
-version: 1.2.3+35
+version: 1.2.3+36
 environment:
     sdk: '>=2.3.0 <3.0.0'
 dependencies: