From b499d2ce5d8ee65933570672ffbdc79b89545cc3 Mon Sep 17 00:00:00 2001
From: Ivan Murashov <ivan.murashov@u-s.su>
Date: Fri, 28 Jul 2017 20:38:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=81=D1=87=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BD=D0=B0=D0=B3=D1=80=D0=B0=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BC=D1=83=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml | 2 +-
 lib/purchase.dart                        | 7 ++++---
 lib/splash.dart                          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 89c9540..8db4365 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dinect.checker"
     android:versionCode="1"
-    android:versionName="0.1">
+    android:versionName="0.3">
 
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
 
diff --git a/lib/purchase.dart b/lib/purchase.dart
index 723865a..7e737fd 100644
--- a/lib/purchase.dart
+++ b/lib/purchase.dart
@@ -106,7 +106,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
     if (await platform.invokeMethod('isOnline')) {
 
       var headers = {
-        'DM-Authorization': 'dmapptoken 9fec83cdca38c357e6b65dbb17514cdd36bf2a08',
+        'DM-Authorization': 'dmapptoken $appToken',
         'Authorization': 'dmtoken ${token}'
       };
 
@@ -121,7 +121,8 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
             this.loyality = '${user['discount']}%';
           } else {
             List amountToBonus = bonuses['amount_to_bonus'];
-            this.loyality = '${(amountToBonus[0] / double.parse(amountToBonus[1])).toStringAsFixed(0)}%';
+            double loyalityVal = (double.parse(amountToBonus[1]) / amountToBonus[0]) * 100;
+            this.loyality = '${loyalityVal.toStringAsFixed(0)}%';     
           }
         });
       }).catchError((error) {
@@ -183,7 +184,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
           };
 
           var headers = {
-            'DM-Authorization': 'dmapptoken 9fec83cdca38c357e6b65dbb17514cdd36bf2a08',
+            'DM-Authorization': 'dmapptoken $appToken',
             'Authorization': 'dmtoken ${token}'
           };
 
diff --git a/lib/splash.dart b/lib/splash.dart
index 96bec76..4d61455 100644
--- a/lib/splash.dart
+++ b/lib/splash.dart
@@ -76,7 +76,7 @@ class SplashScreen extends StatelessWidget {
     } else {
         
       Map statusResponseMap = JSON.decode(statusResponse.body);
-      bool active = statusResponseMap['active'];
+      bool active = statusResponseMap['active'] == null ? false : statusResponseMap['active'];
 
       if (active) {
         startScanner(context);