[ios, osx] Require progress to be requested manually

Requesting progress is expensive, so it is once again computed only on demand, rather than automatically at launch. Moved progress requesting back to iosapp and osxapp.

2 files changed, 14 insertions, 1 deletions

diff --git a/platform/osx/app/AppDelegate.m b/platform/osx/app/AppDelegate.m
index 186a3a1ab3..d9fd967410 100644
--- a/platform/osx/app/AppDelegate.m
+++ b/platform/osx/app/AppDelegate.m
@@ -58,6 +58,7 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
 @interface AppDelegate ()
 
 @property (weak) IBOutlet NSArrayController *offlinePacksArrayController;
+@property (weak) IBOutlet NSPanel *offlinePacksPanel;
 
 @end
 
@@ -177,6 +178,14 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
 
 #pragma mark Offline pack management
 
+- (IBAction)showOfflinePacksPanel:(id)sender {
+    [self.offlinePacksPanel makeKeyAndOrderFront:sender];
+    
+    for (MGLOfflinePack *pack in self.offlinePacksArrayController.arrangedObjects) {
+        [pack requestProgress];
+    }
+}
+
 - (IBAction)delete:(id)sender {
     for (MGLOfflinePack *pack in self.offlinePacksArrayController.selectedObjects) {
         [[MGLOfflineStorage sharedOfflineStorage] removePack:pack withCompletionHandler:^(NSError * _Nullable error) {
@@ -247,6 +256,9 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
     if (menuItem.action == @selector(showPreferences:)) {
         return YES;
     }
+    if (menuItem.action == @selector(showOfflinePacksPanel:)) {
+        return YES;
+    }
     if (menuItem.action == @selector(delete:)) {
         return self.offlinePacksArrayController.selectedObjects.count;
     }
diff --git a/platform/osx/app/MainMenu.xib b/platform/osx/app/MainMenu.xib
index c408bdc568..646c4ae40d 100644
--- a/platform/osx/app/MainMenu.xib
+++ b/platform/osx/app/MainMenu.xib
@@ -18,6 +18,7 @@
         <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
             <connections>
                 <outlet property="offlinePacksArrayController" destination="dWe-R6-sRz" id="Ar5-xu-ABm"/>
+                <outlet property="offlinePacksPanel" destination="Jjv-gs-Tx6" id="0vK-rR-3ZX"/>
                 <outlet property="preferencesWindow" destination="UWc-yQ-qda" id="Ota-aT-Mz2"/>
             </connections>
         </customObject>
@@ -527,7 +528,7 @@
                             <menuItem title="Offline Packs" id="YW3-jR-knj">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="makeKeyAndOrderFront:" target="Jjv-gs-Tx6" id="cJK-pv-fl5"/>
+                                    <action selector="showOfflinePacksPanel:" target="Voe-Tx-rLC" id="kj9-ht-KmF"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>