From ed87995931f5d8804b0b0c4e0e3f17b6bd4da573 Mon Sep 17 00:00:00 2001
From: Putu Aditya Bayu Trana Suta <aditya@portalnesia.com>
Date: Sat, 14 Aug 2021 13:19:19 +0700
Subject: [PATCH] Fix network check (#42)

* Fix network
* Remove unused code
---
 activity/auth/AuthProvider.js | 4 ++--
 app.json                      | 2 +-
 package-lock.json             | 4 ++--
 package.json                  | 2 +-
 provider/AuthProvider.tsx     | 4 ++--
 utils/VerifyApps.ts           | 9 +++++++--
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/activity/auth/AuthProvider.js b/activity/auth/AuthProvider.js
index abdb589..ef49a72 100644
--- a/activity/auth/AuthProvider.js
+++ b/activity/auth/AuthProvider.js
@@ -15,7 +15,7 @@ import {PortalProvider} from'@gorhom/portal'
 import RNFS from 'react-native-fs'
 import {addEventListener as ExpoAddListener,removeEventListener as ExpoRemoveListener,getInitialURL} from 'expo-linking'
 import {requestPermissionsAsync as AdsRequest} from 'expo-ads-admob'
-
+import verifyApps from '@pn/utils/VerifyApps'
 import * as Notifications from 'expo-notifications'
 import {FontAwesomeIconsPack} from '../../components/utils/FontAwesomeIconsPack'
 import {IoniconsPack} from '../../components/utils/IoniconsPack'
@@ -101,6 +101,7 @@ const AuthProviderFunc = (props) => {
 	useEffect(()=>{
 		async function asyncTask(){
 			try {
+				await verifyApps();
 				let [res,lang,ads] = await Promise.all([AsyncStorage.getItem("theme"),AsyncStorage.getItem("lang"),AsyncStorage.getItem("ads")])
 
 				if(res !== null) {
@@ -117,7 +118,6 @@ const AuthProviderFunc = (props) => {
 						}
 					}
 				} catch(e){}
-
 				await refreshToken();
 				return Promise.resolve();
 			} catch(err){
diff --git a/app.json b/app.json
index a1b16c9..4ee730c 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,7 @@
     "name": "Portalnesia",
     "slug": "portalnesia",
     "scheme": "pn",
-    "version": "2.9.1",
+    "version": "2.9.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "backgroundColor": "#ffffff",
diff --git a/package-lock.json b/package-lock.json
index 5b3a107..2192f2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "portal-native",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "2.9.1",
+      "version": "2.9.2",
       "license": "MIT",
       "dependencies": {
         "@eva-design/eva": "^2.1.0",
diff --git a/package.json b/package.json
index f5b5fbf..a3935e1 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
   },
   "private": true,
   "name": "portal-native",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "author": "Putu Aditya <aditya@portalnesia.com>",
   "license": "MIT"
 }
diff --git a/provider/AuthProvider.tsx b/provider/AuthProvider.tsx
index dc3871e..90b8c8a 100644
--- a/provider/AuthProvider.tsx
+++ b/provider/AuthProvider.tsx
@@ -38,8 +38,8 @@ import {default as en_locale} from '@pn/locale/en.json'
 import {default as id_locale} from '@pn/locale/id.json'
 import loadResources from '@pn/utils/Assets'
 import { logError,log } from '@pn/utils/log';
-import { UserType } from '@pn/types/UserTypes';
-import { TokenResponse } from 'expo-auth-session';
+//import { UserType } from '@pn/types/UserTypes';
+//import { TokenResponse } from 'expo-auth-session';
 
 const customMap = (mapping as any)
 LogBox.ignoreLogs(['Setting a timer for a long period of time']);
diff --git a/utils/VerifyApps.ts b/utils/VerifyApps.ts
index 08b95b1..9b42872 100644
--- a/utils/VerifyApps.ts
+++ b/utils/VerifyApps.ts
@@ -7,6 +7,7 @@ import i18n from 'i18n-js'
 import { log, logError } from './log'
 import * as Secure from 'expo-secure-store'
 import moment from 'moment'
+import NetInfo from '@react-native-community/netinfo'
 
 async function alertWarning(msg: string) {
     return new Promise<void>(res=>{
@@ -55,6 +56,10 @@ async function checkRemoteVerification(force=true): Promise<RemoteResult> {
 
 type LocalResult = {verify:boolean,signature?:string}
 async function checkLocalVerification() {
+    const netinfo = await NetInfo.fetch();
+    if(!netinfo.isConnected) {
+        throw new Error(i18n.t("net_offline"));
+    }
     const local = await Secure.getItemAsync('signature');
     let result: LocalResult = {verify:false,signature:null};
     if(local !== null) {
@@ -120,8 +125,8 @@ export default async function verifyApps() {
         }
         return Promise.resolve();
     } catch(e) {
-        log(`Safety verification ${e?.message}`);
-        logError(e,"Verification error");
+        //log(`Safety verification ${e?.message}`);
+        //logError(e,"Verification error");
         await alertWarning(e?.message)
     }
 }
\ No newline at end of file