marinofaggiana il y a 5 ans
Parent
commit
f1939b8ed1
2 fichiers modifiés avec 7 ajouts et 7 suppressions
  1. 6 6
      iOSClient/Activity/NCActivity.swift
  2. 1 1
      iOSClient/PeekPop/CCPeekPop.m

+ 6 - 6
iOSClient/Activity/NCActivity.swift

@@ -54,17 +54,17 @@ class NCActivity: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelega
         tableView.separatorColor = UIColor.clear
         tableView.tableFooterView = UIView()
         tableView.contentInset = insets
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
         
         // Color
         appDelegate.aspectNavigationControllerBar(self.navigationController?.navigationBar, online: appDelegate.reachability.isReachable(), hidden: false)
         appDelegate.aspectTabBar(self.tabBarController?.tabBar, hidden: false)
-    
+        
         self.title = NSLocalizedString("_activity_", comment: "")
-
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
         loadDataSource()
         loadActivity(idActivity: 0)
     }

+ 1 - 1
iOSClient/PeekPop/CCPeekPop.m

@@ -78,7 +78,7 @@
     
     if (self.showShare) {
         UIPreviewAction *share = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_share_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController) {
-            [[NCMainCommon sharedInstance] openShareWithViewController:self metadata:self.metadata indexPage:2];
+            [[NCMainCommon sharedInstance] openShareWithViewController:appDelegate.activeMain metadata:self.metadata indexPage:2];
         }];
         [items addObject:share];
     }