From 9e02e398e748535ec51696d4b578a8056aca96ef Mon Sep 17 00:00:00 2001
From: Jesper Lekland <jesper.lekland@push2prod.se>
Date: Thu, 16 Nov 2017 21:36:02 +0100
Subject: [PATCH] Fix example Fix android Generalize android permissions (might
 support most permissions in the future)

---
 App.js                                        | 57 ---------------
 __tests__/App.js                              |  2 +-
 android/app/build.gradle                      |  6 +-
 android/app/src/main/AndroidManifest.xml      |  1 +
 example.js                                    | 43 ++++++++++++
 index.js                                      |  2 +-
 package.json                                  |  1 +
 src/index.js                                  | 12 +++-
 src/location/location-hoc/index.android.js    |  6 +-
 src/location/location-hoc/index.ios.js        | 11 +--
 src/location/permission.android.js            | 69 ++----------------
 src/location/permission.ios.js                | 70 +++++++++----------
 src/notification/notification-hoc.js          |  3 +-
 src/notification/permission.js                | 19 ++---
 src/permissions-android.js                    | 63 +++++++++++++++++
 src/util/async-storage.js                     | 48 +++++++++++++
 src/{util.js => util/index.js}                |  0
 .../constants.js => util/results.js}          |  6 +-
 yarn.lock                                     |  4 ++
 19 files changed, 238 insertions(+), 185 deletions(-)
 delete mode 100644 App.js
 create mode 100644 example.js
 create mode 100644 src/permissions-android.js
 create mode 100644 src/util/async-storage.js
 rename src/{util.js => util/index.js} (100%)
 rename src/{location/constants.js => util/results.js} (68%)

diff --git a/App.js b/App.js
deleted file mode 100644
index d4ae45c..0000000
--- a/App.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Sample React Native App
- * https://github.com/facebook/react-native
- * @flow
- */
-
-import React, { Component } from 'react';
-import {
-  Platform,
-  StyleSheet,
-  Text,
-  View
-} from 'react-native';
-
-const instructions = Platform.select({
-  ios: 'Press Cmd+R to reload,\n' +
-    'Cmd+D or shake for dev menu',
-  android: 'Double tap R on your keyboard to reload,\n' +
-    'Shake or press menu button for dev menu',
-});
-
-export default class App extends Component<{}> {
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>
-          Welcome to React Native!
-        </Text>
-        <Text style={styles.instructions}>
-          To get started, edit App.js
-        </Text>
-        <Text style={styles.instructions}>
-          {instructions}
-        </Text>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
-});
diff --git a/__tests__/App.js b/__tests__/App.js
index d0b9ee3..ad85ac0 100644
--- a/__tests__/App.js
+++ b/__tests__/App.js
@@ -1,6 +1,6 @@
 import 'react-native';
 import React from 'react';
-import App from '../App';
+import App from '../example';
 
 // Note: test renderer must be required after react-native.
 import renderer from 'react-test-renderer';
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 59074bf..7646c11 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -94,13 +94,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.rnpermissions"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e668b04..5c99f4b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/example.js b/example.js
new file mode 100644
index 0000000..fcfdf4b
--- /dev/null
+++ b/example.js
@@ -0,0 +1,43 @@
+import React from 'react'
+import { Button, StyleSheet, Text, View } from 'react-native'
+import { Location } from './src'
+
+class LocationExample extends React.PureComponent {
+
+    state = {
+        isLoading: false,
+    }
+
+    render() {
+
+        const { test, locationPermission, requestLocationPermission } = this.props
+        const { isLoading }                                           = this.state
+
+        return (
+            <View style={ styles.container }>
+                <Text>
+                    { 'havePermission: ' + locationPermission }
+                </Text>
+                <Text>
+                    { test }
+                </Text>
+                <Button
+                    title={ locationPermission === Location.Permission.RESULT.GRANTED ? 'continue' : 'request permisssion' }
+                    style={ { alignSelf: 'center', marginTop: 50 } }
+                    onPress={ requestLocationPermission }
+                />
+            </View>
+        )
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        marginVertical: 150,
+    }
+})
+
+export default Location.WithPermission(LocationExample)
diff --git a/index.js b/index.js
index 45d2c70..dbd35d4 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,4 @@
 import { AppRegistry } from 'react-native';
-import App from './App';
+import App from './example';
 
 AppRegistry.registerComponent('rnPermissions', () => App);
diff --git a/package.json b/package.json
index 88b2927..43350b5 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
 		"notification"
 	],
 	"dependencies": {
+		"hoist-non-react-statics": "^2.3.1",
 		"react": "16.0.0",
 		"react-native": "0.50.3"
 	},
diff --git a/src/index.js b/src/index.js
index e7c3180..b3350c9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,20 @@
 import LocationPermission, { WithLocationPermission } from './location'
 import NotificationPermission, { WithNotificationPermission } from './notification'
+import RESULT from './util/results'
+
 
 export const Location = {
-    Permission: LocationPermission,
+    Permission: {
+        ...LocationPermission,
+        RESULT,
+    },
     WithPermission: WithLocationPermission,
 }
 
 export const Notification = {
-    Permission: NotificationPermission,
+    Permission: {
+        ...NotificationPermission,
+        RESULT,
+    },
     WithPermission: WithNotificationPermission,
 }
diff --git a/src/location/location-hoc/index.android.js b/src/location/location-hoc/index.android.js
index 6662bf4..bc7fc54 100644
--- a/src/location/location-hoc/index.android.js
+++ b/src/location/location-hoc/index.android.js
@@ -1,7 +1,9 @@
 import React from 'react'
 import { AppState } from 'react-native'
-import { Permissions } from '../../common/location'
+import Permissions from '../permission'
 import hoistNonReactStatic from 'hoist-non-react-statics'
+import { getDisplayName } from '../../util'
+import RESULT from '../../util/results'
 
 const LocationHoc = (WrappedComponent) => {
     /**
@@ -11,7 +13,7 @@ const LocationHoc = (WrappedComponent) => {
     class WithLocationPermission extends React.PureComponent {
 
         state = {
-            permission: Permissions.RESULTS.UNDEFINED,
+            permission: RESULT.UNDEFINED,
         }
 
         async componentDidMount() {
diff --git a/src/location/location-hoc/index.ios.js b/src/location/location-hoc/index.ios.js
index e777c32..592df73 100644
--- a/src/location/location-hoc/index.ios.js
+++ b/src/location/location-hoc/index.ios.js
@@ -1,8 +1,9 @@
 import React from 'react'
 import { AppState } from 'react-native'
-import { Permissions } from '../../common/location'
+import Permissions from '../permission'
 import hoistNonReactStatic from 'hoist-non-react-statics'
 import { getDisplayName } from '../../util'
+import RESULT from '../../util/results'
 
 const LocationHoc = (WrappedComponent) => {
 
@@ -15,7 +16,7 @@ const LocationHoc = (WrappedComponent) => {
         resolveOngoingRequest
 
         state = {
-            permission: Permissions.RESULTS.UNDEFINED,
+            permission: RESULT.UNDEFINED,
         }
 
         async componentDidMount() {
@@ -29,7 +30,7 @@ const LocationHoc = (WrappedComponent) => {
                 const permission = await Permissions.check()
                 this.setState({ permission })
 
-                if (permission === Permissions.RESULTS.GRANTED) {
+                if (permission === RESULT.GRANTED) {
                     this.resolveOngoingRequest && this.resolveOngoingRequest(permission)
                 }
 
@@ -58,9 +59,9 @@ const LocationHoc = (WrappedComponent) => {
             return new Promise((resolve) => {
                 this.resolveOngoingRequest = resolve
 
-                if (permission === Permissions.RESULTS.UNDEFINED) {
+                if (permission === RESULT.UNDEFINED) {
                     Permissions.request()
-                } else if (permission === Permissions.RESULTS.DENIED) {
+                } else if (permission === RESULT.DENIED) {
                     Permissions.openSettings()
                 }
             })
diff --git a/src/location/permission.android.js b/src/location/permission.android.js
index 5e70d78..fff4a96 100644
--- a/src/location/permission.android.js
+++ b/src/location/permission.android.js
@@ -1,69 +1,14 @@
-import { PermissionsAndroid } from 'react-native'
-import AsyncStorage, { ASYNC_STORAGE_KEYS } from '../../AsyncStorage'
-import RNOpenSettings from 'react-native-open-settings'
-import Constants from './constants'
-
-let ongoingRequest
+import PermissionsAndroid from '../permissions-android'
 
 const LocationPermissions = {
 
-  ...Constants,
-
-  async request() {
-
-    const permission = await
-      LocationPermissions.check()
-
-    if (permission === Constants.RESULTS.GRANTED) {
-      return
-    }
-
-    if (permission === Constants.RESULTS.DENIED) {
-      return RNOpenSettings.openSettings()
-    }
-
-    const response = await
-      PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION,
-      )
-
-    await
-      AsyncStorage.setItem(
-        ASYNC_STORAGE_KEYS.LOCATION_PERMISSION_NEVER_ASK_AGAIN,
-        response === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN,
-      )
-
-    switch (response) {
-      case PermissionsAndroid.RESULTS.GRANTED:
-        return Constants.RESULTS.GRANTED
-      case PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN:
-        return Constants.RESULTS.DENIED
-      default:
-        return Constants.RESULTS.UNDEFINED
-    }
-  },
-
-  /**
-   * Returns a promise that resolve to either "true" or "false"
-   */
-  async check() {
-    const haveClickedNeverAskAgain = await AsyncStorage.getItem(
-      ASYNC_STORAGE_KEYS.LOCATION_PERMISSION_NEVER_ASK_AGAIN,
-      false
-    )
-
-    const permission = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION)
-
-    if (permission) {
-      return Constants.RESULTS.GRANTED
-    }
-
-    if (haveClickedNeverAskAgain) {
-      return Constants.RESULTS.DENIED
-    }
+    async request() {
+        return PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION)
+    },
 
-    return Constants.RESULTS.UNDEFINED
-  },
+    async check() {
+        return PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION)
+    },
 }
 
 export default LocationPermissions
diff --git a/src/location/permission.ios.js b/src/location/permission.ios.js
index 33cf47e..af6a428 100644
--- a/src/location/permission.ios.js
+++ b/src/location/permission.ios.js
@@ -1,51 +1,51 @@
 import { Linking } from 'react-native'
-import AsyncStorage, { ASYNC_STORAGE_KEYS } from '../../AsyncStorage'
-import Constants from './constants'
+import AsyncStorage, { ASYNC_STORAGE_KEYS } from '../util/async-storage'
+import RESULT from '../util/results'
 
 const LocationPermissions = {
 
-  ...Constants,
+    RESULT,
 
-  async request() {
-    const permission = await LocationPermissions.check()
+    async request() {
+        const permission = await LocationPermissions.check()
 
-    if (permission === Constants.RESULTS.GRANTED) {
-      return
-    }
+        if (permission === RESULT.GRANTED) {
+            return
+        }
 
-    AsyncStorage.setItem(ASYNC_STORAGE_KEYS.HAVE_ASKED_FOR_LOCATION_PERMISSION, true)
+        AsyncStorage.setItem(ASYNC_STORAGE_KEYS.HAVE_ASKED_FOR_LOCATION_PERMISSION, true)
 
-    navigator.geolocation.requestAuthorization()
-  },
+        navigator.geolocation.requestAuthorization()
+    },
 
-  openSettings() {
-    Linking.openURL('app-settings:')
-  },
+    openSettings() {
+        Linking.openURL('app-settings:')
+    },
 
-  /**
-   * Returns a promise that resolve to either "true", "false" or
-   * PERMISSION_UNDEFINED if we haven't asked yet
-   */
-  async check() {
-    const haveAsked = await AsyncStorage.getItem(
-      ASYNC_STORAGE_KEYS.HAVE_ASKED_FOR_LOCATION_PERMISSION,
-      false,
-    )
+    /**
+     * Returns a promise that resolve to either "true", "false" or
+     * PERMISSION_UNDEFINED if we haven't asked yet
+     */
+    async check() {
+        const haveAsked = await AsyncStorage.getItem(
+            ASYNC_STORAGE_KEYS.HAVE_ASKED_FOR_LOCATION_PERMISSION,
+            false,
+        )
 
-    if (!haveAsked) {
-      return Constants.RESULTS.UNDEFINED
-    }
+        if (!haveAsked) {
+            return RESULT.UNDEFINED
+        }
 
-    const permission = await new Promise((resolve) => {
-      navigator.geolocation.getCurrentPosition(
-        position => resolve(true),
-        error => resolve(error.code !== error.PERMISSION_DENIED),
-        { timeout: 100 }
-      )
-    })
+        const permission = await new Promise((resolve) => {
+            navigator.geolocation.getCurrentPosition(
+                position => resolve(true),
+                error => resolve(error.code !== error.PERMISSION_DENIED),
+                { timeout: 100 }
+            )
+        })
 
-    return permission ? Constants.RESULTS.GRANTED : Constants.RESULTS.DENIED
-  }
+        return permission ? RESULT.GRANTED : RESULT.DENIED
+    }
 }
 
 export default LocationPermissions
diff --git a/src/notification/notification-hoc.js b/src/notification/notification-hoc.js
index 51b193b..914f94a 100644
--- a/src/notification/notification-hoc.js
+++ b/src/notification/notification-hoc.js
@@ -3,6 +3,7 @@ import { AppState } from 'react-native'
 import { Permissions } from './permission'
 import hoistNonReactStatic from 'hoist-non-react-statics'
 import { getDisplayName } from '../util'
+import RESULT from '../util/results'
 
 const LocationHoc = (WrappedComponent) => {
 
@@ -13,7 +14,7 @@ const LocationHoc = (WrappedComponent) => {
     class LocationHocComponentIOS extends React.PureComponent {
 
         state = {
-            permission: Permissions.RESULTS.UNDEFINED,
+            permission: RESULT.UNDEFINED,
         }
 
         async componentDidMount() {
diff --git a/src/notification/permission.js b/src/notification/permission.js
index f88d18c..c6d2b7d 100644
--- a/src/notification/permission.js
+++ b/src/notification/permission.js
@@ -1,26 +1,21 @@
 import { Linking, Platform, PushNotificationIOS } from 'react-native'
-import AsyncStorage, { ASYNC_STORAGE_KEYS } from '../AsyncStorage'
+import AsyncStorage, { ASYNC_STORAGE_KEYS } from '../util/async-storage'
+import RESULT from '../util/results'
 
 const mapPermissionObjectToResult = (permission, haveAsked) => {
   if (Object.values(permission).every(value => value === 1)) {
-    return Permissions.RESULTS.GRANTED
+    return RESULT.GRANTED
   } else if (haveAsked) {
-    return Permissions.RESULTS.DENIED
+    return RESULT.DENIED
   }
-  return Permissions.RESULTS.UNDEFINED
+  return RESULT.UNDEFINED
 }
 
 export const Permissions = {
 
-  RESULTS: {
-    GRANTED: 'granted',
-    DENIED: 'denied',
-    UNDEFINED: 'undefined',
-  },
-
   async check() {
     if (Platform.OS === 'android') {
-      return Permissions.RESULTS.GRANTED
+      return RESULT.GRANTED
     } else {
       const haveAsked  = await AsyncStorage.getItem(
         ASYNC_STORAGE_KEYS.HAVE_ASKED_FOR_NOTIFICATION_PERMISSION,
@@ -35,7 +30,7 @@ export const Permissions = {
   async request() {
     const _permission = await this.check()
 
-    if (_permission === Permissions.RESULTS.DENIED) {
+    if (_permission === RESULT.DENIED) {
       return this.openSettings()
     }
 
diff --git a/src/permissions-android.js b/src/permissions-android.js
new file mode 100644
index 0000000..93cb5a0
--- /dev/null
+++ b/src/permissions-android.js
@@ -0,0 +1,63 @@
+import { PermissionsAndroid } from 'react-native'
+import AsyncStorage, { ASYNC_STORAGE_KEYS } from './util/async-storage'
+import RESULT from './util/results'
+
+const _PermissionsAndroid = {
+
+    PERMISSIONS: PermissionsAndroid.PERMISSIONS,
+
+    async request(permission) {
+        const status = await this.check(permission)
+
+        if (status === RESULT.GRANTED) {
+            return RESULT.GRANTED
+        }
+
+        if (status === RESULT.DENIED) {
+            return RESULT.DENIED
+        }
+
+        const response = await PermissionsAndroid.request(permission)
+
+        await AsyncStorage.setItem(
+            `${ASYNC_STORAGE_KEYS.LOCATION_PERMISSION_NEVER_ASK_AGAIN}-${permission}`,
+            response === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN,
+        )
+
+        switch (response) {
+            case PermissionsAndroid.RESULTS.GRANTED:
+                return RESULT.GRANTED
+            case PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN:
+                return RESULT.DENIED
+            default:
+                return RESULT.UNDEFINED
+        }
+    },
+
+    async check(permission) {
+
+        const haveClickedNeverAskAgain = await AsyncStorage.getItem(
+            `${ASYNC_STORAGE_KEYS.LOCATION_PERMISSION_NEVER_ASK_AGAIN}-${permission}`,
+            false
+        )
+
+        const status = await PermissionsAndroid.check(permission)
+
+        if (status) {
+            await AsyncStorage.setItem(
+                `${ASYNC_STORAGE_KEYS.LOCATION_PERMISSION_NEVER_ASK_AGAIN}-${permission}`,
+                false,
+            )
+
+            return RESULT.GRANTED
+        }
+
+        if (haveClickedNeverAskAgain) {
+            return RESULT.DENIED
+        }
+
+        return RESULT.UNDEFINED
+    },
+}
+
+export default _PermissionsAndroid
diff --git a/src/util/async-storage.js b/src/util/async-storage.js
new file mode 100644
index 0000000..912e36b
--- /dev/null
+++ b/src/util/async-storage.js
@@ -0,0 +1,48 @@
+import { AsyncStorage } from 'react-native'
+
+const Storage = {
+
+    _stringify(value) {
+        return JSON.stringify(value)
+    },
+
+    _parse(string) {
+        return JSON.parse(string)
+    },
+
+    async getItem(key, defaultValue) {
+        try {
+            const value = await AsyncStorage.getItem(key)
+            if (value) {
+                return this._parse(value)
+            }
+            return defaultValue
+        } catch (error) {
+            console.warn('error getting item for key', key)
+        }
+    },
+
+    async setItem(key, value) {
+        try {
+            return await AsyncStorage.setItem(key, this._stringify(value))
+        } catch (error) {
+            console.warn(`error setting value "${this._stringify(value)}" for key "${key}"`)
+        }
+    },
+
+    async removeItem(key) {
+        try {
+            return await AsyncStorage.removeItem(key)
+        } catch (error) {
+            console.warn(`error deleting item with key`, key)
+        }
+    }
+}
+
+export const ASYNC_STORAGE_KEYS = {
+    LOCATION_PERMISSION_NEVER_ASK_AGAIN: 'LOCATION_PERMISSION_NEVER_ASK_AGAIN',
+    HAVE_ASKED_FOR_NOTIFICATION_PERMISSION: 'HAVE_ASKED_FOR_NOTIFICATION_PERMISSION',
+    HAVE_ASKED_FOR_LOCATION_PERMISSION: 'HAVE_ASKED_FOR_LOCATION_PERMISSION',
+}
+
+export default Storage
diff --git a/src/util.js b/src/util/index.js
similarity index 100%
rename from src/util.js
rename to src/util/index.js
diff --git a/src/location/constants.js b/src/util/results.js
similarity index 68%
rename from src/location/constants.js
rename to src/util/results.js
index fe08364..7d88bbb 100644
--- a/src/location/constants.js
+++ b/src/util/results.js
@@ -1,7 +1,5 @@
-export default {
-  RESULTS: {
-    DENIED: 'denied',
+export default RESULTS = {
     GRANTED: 'granted',
+    DENIED: 'denied',
     UNDEFINED: 'undefined',
-  },
 }
diff --git a/yarn.lock b/yarn.lock
index deaad93..35a8602 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1839,6 +1839,10 @@ hoek@4.x.x:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
 
+hoist-non-react-statics@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
+
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"