Merge pull request #2287 from StoDevX/android-lazy-geo

Android Wifi Reporting: Use Lazy Geolocation

Author: rye

source/views/help/wifi-tools.js

@@ -2,6 +2,7 @@
 
 import deviceInfo from 'react-native-device-info'
 import networkInfo from 'react-native-network-info'
+import {Platform} from 'react-native'
 import pkg from '../../../package.json'
 
 export const getIpAddress = (): Promise<?string> =>
@@ -14,13 +15,17 @@ export const getIpAddress = (): Promise<?string> =>
 	})
 
 export const getPosition = (args: any = {}): Promise<Object> =>
-	new Promise(resolve => {
-		navigator.geolocation.getCurrentPosition(resolve, () => resolve({}), {
-			...args,
-			enableHighAccuracy: true,
-			maximumAge: 1000 /*ms*/,
-			timeout: 5000 /*ms*/,
-		})
+	new Promise((resolve, reject) => {
+		if (Platform.OS === 'android') {
+			navigator.geolocation.getCurrentPosition(resolve, reject)
+		} else {
+			navigator.geolocation.getCurrentPosition(resolve, reject, {
+				...args,
+				enableHighAccuracy: true,
+				maximumAge: 1000 /* ms */,
+				timeout: 15000 /* ms */,
+			})
+		}
 	})
 
 export const collectData = async () => ({

source/views/help/wifi.js

@@ -11,6 +11,7 @@ import {Error, ErrorMessage} from './components'
 import {getPosition, collectData, reportToServer} from './wifi-tools'
 import {styles} from './tool'
 import type {ToolOptions} from './types'
+import bugsnag from '../../bugsnag'
 
 export const toolName = 'wifi'
 
@@ -49,7 +50,13 @@ export class ToolView extends React.Component<Props, State> {
 		}
 
 		this.setState(() => ({status: 'collecting', error: ''}))
-		const [position, device] = await Promise.all([getPosition(), collectData()])
+		const [position, device] = await Promise.all([
+			getPosition().catch(error => {
+				bugsnag.notify(error)
+				return null
+			}),
+			collectData(),
+		])
 		this.setState(() => ({status: 'reporting'}))
 
 		try {