Merge branch 'develop' into feature/enhanced_framework

Conflicts:
	README.md
	SmartDeviceLink-iOS.xcodeproj/project.pbxproj

1 files changed, 39 insertions, 0 deletions

diff --git a/SmartDeviceLink/SDLPermissionConstants.h b/SmartDeviceLink/SDLPermissionConstants.h
new file mode 100644
index 000000000..49a6dd187
--- /dev/null
+++ b/SmartDeviceLink/SDLPermissionConstants.h
@@ -0,0 +1,39 @@
+//
+//  SDLPermissionsConstants.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Joel Fischer on 11/18/15.
+//  Copyright © 2015 smartdevicelink. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "NSNumber+NumberType.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NSString SDLPermissionRPCName;
+typedef NSUUID SDLPermissionObserverIdentifier;
+
+typedef NS_ENUM(NSUInteger, SDLPermissionGroupType) {
+    SDLPermissionGroupTypeAllAllowed,
+    SDLPermissionGroupTypeAny
+};
+
+typedef NS_ENUM(NSUInteger, SDLPermissionGroupStatus) {
+    SDLPermissionGroupStatusAllowed,
+    SDLPermissionGroupStatusDisallowed,
+    SDLPermissionGroupStatusMixed,
+    SDLPermissionGroupStatusUnknown
+};
+
+/**
+ *  The PermissionObserver is a block that is passed in to some methods that will be stored and called when specified permissions change.
+ *
+ *  @param change  A dictionary of permission changes containing <key(String): RPC Name, object(BOOL): YES if the RPC is allowed, NO if it is not allowed>
+ *  @param status       The change made to all of the RPCs in the changedDict. Allowed, if all RPCs are now allowed, Disallowed if all RPCs are now disallowed, or Mixed if some are allowed, and some are disallowed
+ */
+typedef void (^SDLPermissionObserver)(NSDictionary<SDLPermissionRPCName *, NSNumber<SDLBool> *> * _Nonnull change, SDLPermissionGroupStatus status);
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file