Merge branch 'convergence-dev' into convergence

AzureAD · Jun 10, 2016 · 56bb8bd · 56bb8bd
2 parents a3990ea + 10dcdc4
commit 56bb8bd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ADALiOS/ADALiOS/ADKeychainTokenCacheStore.m b/ADALiOS/ADALiOS/ADKeychainTokenCacheStore.m
@@ -25,6 +25,7 @@
 #import "ADProfileInfo.h"
 #import "ADKeychainQuery.h"
 #import "ADKeychainItem.h"
+#import "ADWorkPlaceJoinUtil.h"
 
 
 /************************************************************************************************
@@ -85,7 +86,12 @@ - (id)initWithGroup:(NSString *)sharedGroup
         return nil;
     }
 
-    _sharedGroup = sharedGroup;
+    if (!sharedGroup)
+    {
+        sharedGroup = [[NSBundle mainBundle] bundleIdentifier];
+    }
+
+    _sharedGroup = [[NSString alloc] initWithFormat:@"%@.%@", [[ADWorkPlaceJoinUtil WorkPlaceJoinUtilManager]  getApplicationIdentifierPrefix], sharedGroup];
     _serviceKey = s_kDefaultADALServiceKey;
 
     return self;