Merge pull request #9 from BaseflowIT/feature/example_app

mvanbeusekom · web-flow · commit f14553218432 · 2018-08-13T11:33:02.000+03:00
Implemented example app
diff --git a/android/src/main/kotlin/com/baseflow/permissionhandler/PermissionHandlerPlugin.kt b/android/src/main/kotlin/com/baseflow/permissionhandler/PermissionHandlerPlugin.kt
@@ -220,10 +220,14 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ
             }
         }
 
-        ActivityCompat.requestPermissions(
-                registrar.activity(),
-                permissionsToRequest.toTypedArray(),
-                permissionCode)
+        if (permissionsToRequest.count() > 0) {
+            ActivityCompat.requestPermissions(
+                    registrar.activity(),
+                    permissionsToRequest.toTypedArray(),
+                    permissionCode)
+        } else if (mRequestResults.count() > 0) {
+            processResult()
+        }
     }
 
     private fun handlePermissionsRequest(permissions: Array<String>, grantResults: IntArray) {
diff --git a/example/android/.idea/caches/build_file_checksums.ser b/example/android/.idea/caches/build_file_checksums.ser
diff --git a/example/android/.idea/misc.xml b/example/android/.idea/misc.xml
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -6,8 +6,28 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+	<uses-permission android:name="android.permission.RECEIVE_MMS" />
+	<uses-permission android:name="android.permission.RECEIVE_SMS" />
+	<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
+	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<uses-permission android:name="android.permission.CALL_PHONE" />
+	<uses-permission android:name="android.permission.CAMERA" />
+	<uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
+	<uses-permission android:name="android.permission.READ_CALL_LOG" />
+	<uses-permission android:name="android.permission.READ_CALENDAR" />
+	<uses-permission android:name="android.permission.READ_CONTACTS" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.READ_SMS" />
+	<uses-permission android:name="android.permission.SEND_SMS" />
+	<uses-permission android:name="android.permission.WRITE_CALENDAR" />
+	<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
+	<uses-permission android:name="android.permission.WRITE_CONTACTS" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.SENSORS" />
+	<uses-permission android:name="android.permission.BODY_SENSORS" />
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,24 +1,46 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_enums.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 void main() => runApp(new MyApp());
 
 class MyApp extends StatelessWidget {
-  
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-      home: new Scaffold(
-        appBar: new AppBar(
-          title: const Text('Plugin example app'),
-        ),
-        body: new Center(
-          child: new ListView(
+        home: new Scaffold(
+      appBar: new AppBar(
+        title: const Text('Plugin example app'),
+        actions: <Widget>[
+          IconButton(
+            icon: const Icon(Icons.settings),
+            onPressed: () {
+              PermissionHandler.openAppSettings();
+            },
+          )
+        ],
+      ),
+      body: new Center(
+        child: new ListView(
             children: PermissionGroup.values
-              .where((PermissionGroup permission) => permission != PermissionGroup.unknown)
-              .map((PermissionGroup permission) => new PermissionWidget(permission)).toList()
-        ),
+                .where((PermissionGroup permission) {
+                  if (Platform.isIOS) {
+                    return permission != PermissionGroup.unknown &&
+                        permission != PermissionGroup.phone &&
+                        permission != PermissionGroup.sms &&
+                        permission != PermissionGroup.storage;
+                  } else {
+                    return permission != PermissionGroup.unknown &&
+                        permission != PermissionGroup.mediaLibrary &&
+                        permission != PermissionGroup.photos &&
+                        permission != PermissionGroup.reminders;
+                  }
+                })
+                .map((PermissionGroup permission) =>
+                    new PermissionWidget(permission))
+                .toList()),
       ),
     ));
   }
@@ -38,7 +60,7 @@ class _PermissionState extends State<PermissionWidget> {
   PermissionStatus _permissionStatus = PermissionStatus.unknown;
 
   _PermissionState(this._permissionGroup);
-  
+
   @override
   void initState() {
     super.initState();
@@ -47,15 +69,46 @@ class _PermissionState extends State<PermissionWidget> {
   }
 
   void _listenForPermissionStatus() async {
-    print(_permissionGroup.toString());
-    _permissionStatus = await PermissionHandler.checkPermissionStatus(_permissionGroup);
+    final PermissionStatus status =
+        await PermissionHandler.checkPermissionStatus(_permissionGroup);
+
+    setState(() {
+      _permissionStatus = status;
+    });
+  }
+
+  Color getPermissionColor() {
+    switch (_permissionStatus) {
+      case PermissionStatus.denied:
+        return Colors.red;
+      case PermissionStatus.granted:
+        return Colors.green;
+      default:
+        return Colors.grey;
+    }
   }
 
-    @override
+  @override
   Widget build(BuildContext context) {
     return new ListTile(
       title: new Text(_permissionGroup.toString()),
-      subtitle: new Text(_permissionStatus.toString()),
+      subtitle: new Text(
+        _permissionStatus.toString(),
+        style: new TextStyle(color: getPermissionColor()),
+      ),
+      onTap: () async {
+        requestPermission(_permissionGroup); 
+      },
     );
   }
-}
+
+  void requestPermission(PermissionGroup permission) async {
+    final List<PermissionGroup> permissions = <PermissionGroup>[permission];
+    final Map<PermissionGroup, PermissionStatus> permissionRequestResult =
+        await PermissionHandler.requestPermissions(permissions);
+
+    setState(() {
+      _permissionStatus = permissionRequestResult[permission];
+    });
+  }
+}
diff --git a/ios/Classes/PermissionManager.swift b/ios/Classes/PermissionManager.swift
@@ -8,41 +8,36 @@
 import Flutter
 import Foundation
 import UIKit
+import Swift
 
 class PermissionManager: NSObject {
+    private var _strategyInstances: [ObjectIdentifier: PermissionStrategy] = [:]
     
     static func checkPermissionStatus(permission: PermissionGroup, result: @escaping FlutterResult) {
         let permissionStrategy = PermissionManager.createPermissionStrategy(permission: permission)
-        let permissionStatus = permissionStrategy?.checkPermissionStatus(permission: permission) ?? PermissionStatus.unknown
+        let permissionStatus = permissionStrategy.checkPermissionStatus(permission: permission)
         
         result(Codec.encodePermissionStatus(permissionStatus: permissionStatus))
     }
     
-    static func requestPermission(permissions: [PermissionGroup], result: @escaping FlutterResult) {
+    func requestPermission(permissions: [PermissionGroup], result: @escaping FlutterResult) {
         var requestQueue = Set(permissions.map { $0 })
         var permissionStatusResult: [PermissionGroup: PermissionStatus] = [:]
         
         for permission in permissions {
             let permissionStrategy = PermissionManager.createPermissionStrategy(permission: permission)
-        
-            if permissionStrategy == nil {
-                permissionStatusResult[permission] = PermissionStatus.unknown
+            let identifier = ObjectIdentifier(permissionStrategy as AnyObject)
+            _strategyInstances[identifier] = permissionStrategy
+
+            permissionStrategy.requestPermission(permission: permission) { (permissionStatus: PermissionStatus) in
+                permissionStatusResult[permission] = permissionStatus
                 requestQueue.remove(permission)
+                self._strategyInstances.removeValue(forKey: ObjectIdentifier(permissionStrategy as AnyObject))
                 
                 if requestQueue.count == 0 {
                     result(Codec.encodePermissionRequestResult(permissionStatusResult: permissionStatusResult))
                     return
                 }
-            } else {
-                permissionStrategy!.requestPermission(permission: permission) { (permissionStatus: PermissionStatus) in
-                    permissionStatusResult[permission] = permissionStatus
-                    requestQueue.remove(permission)
-                    
-                    if requestQueue.count == 0 {
-                        result(Codec.encodePermissionRequestResult(permissionStatusResult: permissionStatusResult))
-                        return
-                    }
-                }
             }
         }
     }
@@ -63,7 +58,7 @@ class PermissionManager: NSObject {
         result(false)
     }
     
-    private static func createPermissionStrategy(permission: PermissionGroup) -> PermissionStrategy? {
+    private static func createPermissionStrategy(permission: PermissionGroup) -> PermissionStrategy {
         switch permission {
         case PermissionGroup.calendar:
             return EventPermissionStrategy()
@@ -88,7 +83,7 @@ class PermissionManager: NSObject {
         case PermissionGroup.speech:
             return SpeechPermissionStrategy()
         default:
-            return nil
+            return UnknownPermissionStrategy()
         }
     }
 }
diff --git a/ios/Classes/SwiftPermissionHandlerPlugin.swift b/ios/Classes/SwiftPermissionHandlerPlugin.swift
@@ -9,6 +9,7 @@ import UIKit
     
 public class SwiftPermissionHandlerPlugin: NSObject, FlutterPlugin {
     private static let METHOD_CHANNEL_NAME = "flutter.baseflow.com/permissions/methods";
+    private let _permissionManager: PermissionManager = PermissionManager()
     
     public static func register(with registrar: FlutterPluginRegistrar) {
         let channel = FlutterMethodChannel(name: METHOD_CHANNEL_NAME, binaryMessenger: registrar.messenger())
@@ -23,7 +24,7 @@ public class SwiftPermissionHandlerPlugin: NSObject, FlutterPlugin {
                     from: call.arguments),
                     result: result)
         } else if call.method == "requestPermissions" {
-            PermissionManager.requestPermission(
+            _permissionManager.requestPermission(
                 permissions: Codec.decodePermissionGroups(
                     from: call.arguments),
                     result: result)
diff --git a/ios/Classes/strategies/LocationPermissionStrategy.swift b/ios/Classes/strategies/LocationPermissionStrategy.swift
@@ -9,6 +9,7 @@ import CoreLocation
 import Foundation
 
 class LocationPermissionStrategy : NSObject, PermissionStrategy, CLLocationManagerDelegate {
+    private var _locationManager: CLLocationManager? = nil
     private var _permissionStatusHandler: PermissionStatusHandler? = nil
     private var _requestedPermission: PermissionGroup? = nil
     
@@ -40,33 +41,40 @@ class LocationPermissionStrategy : NSObject, PermissionStrategy, CLLocationManag
         
         _permissionStatusHandler = completionHandler
         _requestedPermission = permission
-        let locationManager = CLLocationManager.init()
-        locationManager.delegate = self
         
-        if(permission != PermissionGroup.location) {
-            if (Bundle.main.object(forInfoDictionaryKey: "NSLocationWhenInUseUsageDescription") != nil) {
-                locationManager.requestWhenInUseAuthorization()
-            } else if (Bundle.main.object(forInfoDictionaryKey: "NSLocationAlwaysUsageDescription") != nil) {
-                locationManager.requestAlwaysAuthorization();
+        if(_locationManager == nil) {
+            _locationManager = CLLocationManager()
+            _locationManager!.delegate = self
+        }
+        
+        if(permission == PermissionGroup.location) {
+            if (Bundle.main.object(forInfoDictionaryKey: "NSLocationAlwaysUsageDescription") != nil) {
+                _locationManager!.requestAlwaysAuthorization()
+            } else if (Bundle.main.object(forInfoDictionaryKey: "NSLocationWhenInUseUsageDescription") != nil) {
+                _locationManager!.requestWhenInUseAuthorization();
             } else {
                 NSException(name: NSExceptionName.internalInconsistencyException, reason:"To use location in iOS8 you need to define either NSLocationWhenInUseUsageDescription or NSLocationAlwaysUsageDescription in the app bundle's Info.plist file", userInfo: nil).raise()
             }
         } else if permission == PermissionGroup.locationAlways {
             if (Bundle.main.object(forInfoDictionaryKey: "NSLocationAlwaysUsageDescription") != nil) {
-                locationManager.requestAlwaysAuthorization();
+                _locationManager!.requestAlwaysAuthorization();
             } else {
                 NSException(name: NSExceptionName.internalInconsistencyException, reason:"To use location in iOS8 you need to define NSLocationAlwaysUsageDescription in the app bundle's Info.plist file", userInfo: nil).raise()
             }
         } else if permission == PermissionGroup.locationWhenInUse {
             if (Bundle.main.object(forInfoDictionaryKey: "NSLocationWhenInUseUsageDescription") != nil) {
-                locationManager.requestWhenInUseAuthorization();
+                _locationManager!.requestWhenInUseAuthorization();
             } else {
                 NSException(name: NSExceptionName.internalInconsistencyException, reason:"To use location in iOS8 you need to define NSLocationWhenInUseUsageDescription in the app bundle's Info.plist file", userInfo: nil).raise()
             }
         }
     }
     
     func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+        if status == CLAuthorizationStatus.notDetermined {
+            return
+        }
+        
         guard let completionHandler = _permissionStatusHandler else { return }
         
         completionHandler(
diff --git a/ios/Classes/strategies/SensorPermissionStrategy.swift b/ios/Classes/strategies/SensorPermissionStrategy.swift
@@ -48,14 +48,13 @@ class SensorPermissionStrategy : NSObject, PermissionStrategy {
         if #available(iOS 11.0, *) {
             let motionManager = CMMotionActivityManager.init()
             
-            motionManager.queryActivityStarting(from: NSDate.distantPast, to: NSDate.distantFuture, to: OperationQueue.main) {
-                (results: [CMMotionActivity]?, error: Error?) in
-                    if results != nil {
-                        completionHandler(PermissionStatus.granted)
-                    } else {
-                        completionHandler(PermissionStatus.denied)
-                    }
+            motionManager.startActivityUpdates(to: OperationQueue.main) { (_) in
+                motionManager.stopActivityUpdates()
+                
+                completionHandler(.granted)
             }
+        } else {
+            completionHandler(.unknown)
         }
     }
 }
diff --git a/ios/Classes/strategies/SpeechPermissionStrategy.swift b/ios/Classes/strategies/SpeechPermissionStrategy.swift
@@ -38,9 +38,9 @@ class SpeechPermissionStrategy : NSObject, PermissionStrategy {
                     SpeechPermissionStrategy.determinePermissionStatus(authorizationStatus: authorizationStatus))
                 return
             }
+        } else {
+            completionHandler(PermissionStatus.unknown)
         }
-        
-        completionHandler(PermissionStatus.unknown)
     }
     
     @available(iOS 10.0, *)
diff --git a/ios/Classes/strategies/UnknownPermissionStrategy.swift b/ios/Classes/strategies/UnknownPermissionStrategy.swift
@@ -0,0 +1,18 @@
+//
+//  UnknownPermissionStrategy.swift
+//  permission_handler
+//
+//  Created by Maurits van Beusekom on 07/08/2018.
+//
+
+import Foundation
+
+class UnknownPermissionStrategy : NSObject, PermissionStrategy {
+    func checkPermissionStatus(permission: PermissionGroup) -> PermissionStatus {
+        return PermissionStatus.unknown
+    }
+    
+    func requestPermission(permission: PermissionGroup, completionHandler: @escaping PermissionStatusHandler) {
+        completionHandler(PermissionStatus.unknown)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,14 @@ class PermissionHandlerPlugin(private val registrar: Registrar, private var requ`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- ActivityCompat.requestPermissions(`
`224`		`- registrar.activity(),`
`225`		`- permissionsToRequest.toTypedArray(),`
`226`		`- permissionCode)`
	`223`	`+ if (permissionsToRequest.count() > 0) {`
	`224`	`+ ActivityCompat.requestPermissions(`
	`225`	`+ registrar.activity(),`
	`226`	`+ permissionsToRequest.toTypedArray(),`
	`227`	`+ permissionCode)`
	`228`	`+ } else if (mRequestResults.count() > 0) {`
	`229`	`+ processResult()`
	`230`	`+ }`
`227`	`231`	`}`
`228`	`232`
`229`	`233`	`private fun handlePermissionsRequest(permissions: Array<String>, grantResults: IntArray) {`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,13 @@ class SensorPermissionStrategy : NSObject, PermissionStrategy {`
`48`	`48`	`if #available(iOS 11.0, *) {`
`49`	`49`	`let motionManager = CMMotionActivityManager.init()`
`50`	`50`
`51`		`- motionManager.queryActivityStarting(from: NSDate.distantPast, to: NSDate.distantFuture, to: OperationQueue.main) {`
`52`		`- (results: [CMMotionActivity]?, error: Error?) in`
`53`		`- if results != nil {`
`54`		`- completionHandler(PermissionStatus.granted)`
`55`		`- } else {`
`56`		`- completionHandler(PermissionStatus.denied)`
`57`		`- }`
	`51`	`+ motionManager.startActivityUpdates(to: OperationQueue.main) { (_) in`
	`52`	`+ motionManager.stopActivityUpdates()`
	`53`	`+`
	`54`	`+ completionHandler(.granted)`
`58`	`55`	`}`
	`56`	`+ } else {`
	`57`	`+ completionHandler(.unknown)`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ class SpeechPermissionStrategy : NSObject, PermissionStrategy {`
`38`	`38`	`SpeechPermissionStrategy.determinePermissionStatus(authorizationStatus: authorizationStatus))`
`39`	`39`	`return`
`40`	`40`	`}`
	`41`	`+ } else {`
	`42`	`+ completionHandler(PermissionStatus.unknown)`
`41`	`43`	`}`
`42`		`-`
`43`		`- completionHandler(PermissionStatus.unknown)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@available(iOS 10.0, *)`