From 4a7b4a531cbce104881823e368fb0dc243d1df3f Mon Sep 17 00:00:00 2001
From: Mohamed Nouffer <mohamednouffer@Mohameds-MacBook-Air.local>
Date: Thu, 12 Jan 2023 12:32:08 +0530
Subject: [PATCH] update external api call start

---
 android/app/build.gradle                 | 27 ++++++++++++++++++------
 android/app/src/main/AndroidManifest.xml |  4 +++-
 lib/pages/drawer/drawer_page.dart        |  7 ++++++
 lib/services/external_service.dart       |  4 ++--
 lib/utils/string_values.dart             |  6 ++++--
 pubspec.yaml                             |  2 +-
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7d8e0f3..2795483 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+       keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
 
     compileSdkVersion 33
@@ -56,13 +62,20 @@ android {
         multiDexEnabled true
     }
 
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
+   signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+   }
+   buildTypes {
+       release {
+           signingConfig signingConfigs.release
+       }
+   }
+
 }
 
 flutter {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 34187c1..e30c45d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,8 +4,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
    <application
-        android:label="岐阜ナビ"
+        android:label="岐阜ナビ"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/lib/pages/drawer/drawer_page.dart b/lib/pages/drawer/drawer_page.dart
index f0f2922..c782f38 100644
--- a/lib/pages/drawer/drawer_page.dart
+++ b/lib/pages/drawer/drawer_page.dart
@@ -117,6 +117,13 @@ class DrawerPage extends StatelessWidget {
               },
             ) : 
             Container(width: 0, height: 0,),
+            ListTile(
+              leading: const Icon(Icons.privacy_tip),
+              title: Text("privacy".tr),
+              onTap: (){
+                _launchURL("https://rogaining.sumasen.net/api/privacy/");
+              },
+            )
             // ListTile(
             //   leading: const Icon(Icons.router),
             //   title: Text("my_route".tr),
diff --git a/lib/services/external_service.dart b/lib/services/external_service.dart
index 3f0405b..0701a5e 100644
--- a/lib/services/external_service.dart
+++ b/lib/services/external_service.dart
@@ -39,7 +39,7 @@ class ExternalService {
     //print("--- _team : ${_team}-----");
     String _event_code = indexController.currentUser[0]["user"]["event_code"];
 
-    if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
+    if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
       DatabaseHelper db = DatabaseHelper.instance;
       Rog _rog = Rog(
         id:1,
@@ -84,7 +84,7 @@ class ExternalService {
 
     if(imageurl != null){
 
-      if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
+      if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
         DatabaseHelper db = DatabaseHelper.instance;
         Rog _rog = Rog(
           id:1,
diff --git a/lib/utils/string_values.dart b/lib/utils/string_values.dart
index d2acdca..859decd 100644
--- a/lib/utils/string_values.dart
+++ b/lib/utils/string_values.dart
@@ -70,7 +70,8 @@ class StringValues extends Translations{
       "You have not reached the goal yet.":"You have not reached the goal yet.",
       "delete_account": "Delete account",
       "accounted_deleted": "Account deleted",
-      "account_deleted_message": "your account has beed successfully deleted"
+      "account_deleted_message": "your account has beed successfully deleted",
+      "privacy": "Privacy policy"
     },
     'ja_JP': {
       'drawer_title':'ロゲイニング参加者はログイン するとチェックポイントが参照 できます',
@@ -141,7 +142,8 @@ class StringValues extends Translations{
       "You have not reached the goal yet.":"あなたはまだゴールに達していません。",
       "delete_account": "アカウントを削除する",
       "accounted_deleted": "アカウントが削除されました",
-      "account_deleted_message": "あなたのアカウントは正常に削除されました"
+      "account_deleted_message": "あなたのアカウントは正常に削除されました",
+      "privacy": "プライバシーポリシー"
     },
   };
 }
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 1676564..5c6f759 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
+version: 1.0.2+2
 
 environment:
   sdk: ">=2.16.0 <3.0.0"