iPadでも＋ボタンを出すように修正

Author: TakayukiHoshi1984

dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/Info.plist

@@ -46,21 +46,21 @@
 		<true/>
 	</dict>
 	<key>NSAppleMusicUsageDescription</key>
-	<string>端末のメディアを再生できます。</string>
+	<string>端末のメディアを再生することができます。</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Bluetoothの状態を取得します。</string>
+	<string>Bluetoothの状態を取得することができます。</string>
 	<key>NSCameraUsageDescription</key>
-	<string>写真を撮影します。</string>
+	<string>写真を撮影することができます。</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016年 NTT DOCOMO, INC. All rights reserved.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>常に位置情報を使用します。</string>
+	<string>位置情報を使用することができます。</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>アプリ使用時のみ位置情報を使用します。</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>電話をかけます。</string>
+	<string>電話をかけることができます。</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>写真を参照します。</string>
+	<string>写真を参照することができます。</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHBookmarkTopController.m

@@ -141,13 +141,6 @@ - (void)setEdiMode:(BOOL)edit
         self.folderBtn.enabled = NO;
         [self.editBtn setTitle:@"編集"];
     }
-
-    //iPadは常に完了ボタンを非表示
-    if ([GHUtils isiPad]) {
-        self.doneBtn.enabled = NO;
-        self.doneBtn.tintColor = nil;
-        self.navigationItem.rightBarButtonItem = nil;
-    }
 }
 
 

dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDeviceUtil.m

@@ -70,22 +70,23 @@ - (void)debug:(DConnectArray*)array
 - (void)updateDeviceList
 {
     __weak GHDeviceUtil *_self = self;
-    // タイミングによりアクセストークンが保存されない
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self callRequestAccessTokenAPI];
-
-        [self discoverDevices:^(DConnectArray *result) {
-            _self.currentDevices = result;
-            _self.recieveDeviceList(result);
+        [self callRequestAccessTokenAPI:^(DConnectArray *result) {
+            [self discoverDevices:^(DConnectArray *result) {
+                _self.currentDevices = result;
+                _self.recieveDeviceList(result);
+            }];
         }];
+
     });
 }
 
 - (void)discoverDevices:(DiscoverDeviceCompletion)completion
 {
     NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
     NSString *accessToken = [def stringForKey:ACCESS_TOKEN];
-    if (!accessToken) {
+    BOOL isLocalOAuth = [def boolForKey:IS_USE_LOCALOAUTH];
+    if (!accessToken && isLocalOAuth) {
         completion(nil);
         return;
     }
@@ -105,31 +106,28 @@ - (void)discoverDevices:(DiscoverDeviceCompletion)completion
                 return;
             }
         }
-        NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
-        [def removeObjectForKey:ACCESS_TOKEN];
-        [def synchronize];
-        [self callRequestAccessTokenAPI];
-        [self discoverDevices:completion];
-
+        if (isLocalOAuth) {
+            NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
+            [def removeObjectForKey:ACCESS_TOKEN];
+            [def synchronize];
+            [self callRequestAccessTokenAPI:^(DConnectArray *result) {
+                [self discoverDevices:completion];
+            }];
+        }
     }];
 }
 
-- (void)callRequestAccessTokenAPI {
+- (void)callRequestAccessTokenAPI:(DiscoverDeviceCompletion)completion {
     NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
     NSString *accessToken = [def stringForKey:ACCESS_TOKEN];
     if (accessToken)  {
+        completion(nil);
         return;
     }    
     NSArray *scopes = [@[DConnectServiceDiscoveryProfileName]
                        sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];;
 
 
-    /* セマフォ準備 */
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(1);
-    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC * DPSemaphoreTimeout);
-    
-    /* 応答が返るまでWait */
-    dispatch_semaphore_wait(semaphore, timeout);
 
     [DConnectUtil asyncAuthorizeWithOrigin: [self packageName]
                                    appName: @"Browser"
@@ -138,13 +136,11 @@ - (void)callRequestAccessTokenAPI {
                                        NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
                                        [def setObject:accessToken forKey:ACCESS_TOKEN];
                                        [def synchronize];
-                                       /* Wait解除 */
-                                       dispatch_semaphore_signal(semaphore);
+                                       completion(nil);
 
                                    }
                                      error:^(DConnectMessageErrorCodeType errorCode){
-                                         /* Wait解除 */
-                                         dispatch_semaphore_signal(semaphore);
+                                         completion(nil);
 
                                      }];
 }