Kapeli · Kapeli · Nov 25, 2016 · Nov 21, 2016 · Nov 23, 2016 · Nov 23, 2016
diff --git a/Dash/Base.lproj/Main.storyboard b/Dash/Base.lproj/Main.storyboard
diff --git a/Dash/DHAppDelegate.m b/Dash/DHAppDelegate.m
@@ -161,6 +161,16 @@ - (void)application:(UIApplication *)application handleEventsForBackgroundURLSes
     }];
 }
 
+#pragma mark - UIStateRestoration
+
+- (BOOL)application:(UIApplication *)application shouldSaveApplicationState:(NSCoder *)coder {
+    return YES;
+}
+
+- (BOOL)application:(UIApplication *)application shouldRestoreApplicationState:(NSCoder *)coder {
+    return YES;
+}
+
 - (void)setDoNotBackUp
 {
     NSString *path = [homePath stringByAppendingPathComponent:@"Docsets"];

diff --git a/Dash/DHEntryBrowser.m b/Dash/DHEntryBrowser.m
@@ -48,7 +48,7 @@ - (void)viewDidLoad
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    if(!self.didLoad)
+    if(!self.didLoad && self.docset)
     {
         self.didLoad = YES;
         self.tableView.allowsSelection = NO;
@@ -211,6 +211,11 @@ - (void)encodeRestorableStateWithCoder:(NSCoder *)coder
     [coder encodeObject:self.type forKey:@"type"];
     [coder encodeObject:self.title forKey:@"title"];
     [coder encodeObject:self.entries forKey:@"entries"];
+    NSIndexPath *selectedIndexPath = [self.tableView indexPathForSelectedRow];
+    if(selectedIndexPath != nil)
+    {
+        [coder encodeObject:selectedIndexPath forKey:@"selectedIndexPath"];
+    }
     [self.searchController encodeRestorableStateWithCoder:coder];
     [super encodeRestorableStateWithCoder:coder];
 }
@@ -225,6 +230,22 @@ - (void)decodeRestorableStateWithCoder:(NSCoder *)coder
     [self viewDidLoad];
     self.isRestoring = NO;
     self.entries = [coder decodeObjectForKey:@"entries"];
+    for (int i = 0; i < self.entries.count; i++) {
+        if ([self.entries[i] isKindOfClass:[DHDBResult class]]) {
+            DHDBResult *result = (DHDBResult *)self.entries[i];
+            NSArray *components = [result.fullPath componentsSeparatedByString:@"/Library/Docsets"];
+            if (components.count == 2) {
+                result.fullPath = [@"file://" stringByAppendingFormat:@"%@%@%@",homePath,@"/Docsets",components[1]];
+            }
+        }
+    }
+    NSIndexPath *selectedIndexPath = [coder decodeObjectForKey:@"selectedIndexPath"];
+    if(selectedIndexPath != nil)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.tableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+        });
+    }
     [self.searchController decodeRestorableStateWithCoder:coder];
     [super decodeRestorableStateWithCoder:coder];
 }

diff --git a/Dash/DHNestedViewController.m b/Dash/DHNestedViewController.m
@@ -186,15 +186,27 @@ - (void)encodeRestorableStateWithCoder:(NSCoder *)coder
     [super encodeRestorableStateWithCoder:coder];
     [coder encodeObject:self.result forKey:@"result"];
     [coder encodeBool:self.hasMultipleDocsets forKey:@"hasMultipleDocsets"];
+    NSIndexPath *selectedIndexPath = [self.tableView indexPathForSelectedRow];
+    if(selectedIndexPath != nil)
+    {
+        [coder encodeObject:selectedIndexPath forKey:@"selectedIndexPath"];
+    }
 }
 
 - (void)decodeRestorableStateWithCoder:(NSCoder *)coder
 {
+    [super decodeRestorableStateWithCoder:coder];
     self.didDecode = YES;
     self.result = [coder decodeObjectForKey:@"result"];
     self.hasMultipleDocsets = [coder decodeBoolForKey:@"hasMultipleDocsets"];
     self.title = self.result.name;
-    [super decodeRestorableStateWithCoder:coder];
+    NSIndexPath *selectedIndexPath = [coder decodeObjectForKey:@"selectedIndexPath"];
+    if(selectedIndexPath != nil)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.tableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+        });
+    }
 }
 
 @end
diff --git a/Dash/DHPreferences.m b/Dash/DHPreferences.m
@@ -85,6 +85,7 @@ - (IBAction)dismissModal:(id)sender
     }
     if(toPopTo)
     {
+        [(DHWebViewController *)toPopTo view].frame = rightNavController.view.bounds;
         [rightNavController popToViewController:toPopTo animated:YES];
     }
     else
@@ -242,6 +243,17 @@ - (void)decodeRestorableStateWithCoder:(NSCoder *)coder
     {
         [self.tableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
     }
+    else
+        selectedIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    if (self.splitViewController.viewControllers.count == 2 && [selectedIndexPath compare:[NSIndexPath indexPathForRow:0 inSection:0]] == NSOrderedSame) {
+        UINavigationController *nav = [self.splitViewController.viewControllers lastObject];
+        if ([nav isKindOfClass:[UINavigationController class]] && ![nav.topViewController isKindOfClass:[DHDocsetDownloader class]]) {
+            NSMutableArray *newViewControllers = [NSMutableArray array];
+            [newViewControllers addObjectsFromArray:nav.viewControllers];
+            [newViewControllers addObject:[DHDocsetDownloader sharedDownloader]];
+            [nav setViewControllers:newViewControllers];
+        }
+    }
 }
 
 - (IBAction)getDashForMacOS:(id)sender

diff --git a/Dash/DHRemoteBrowser.m b/Dash/DHRemoteBrowser.m
@@ -210,6 +210,33 @@ - (DHNestedViewController *)nestedViewController
     return nil;
 }
 
+- (void)encodeRestorableStateWithCoder:(NSCoder *)coder
+{
+    [super encodeRestorableStateWithCoder:coder];
+    [coder encodeObject:self.remote forKey:@"remote"];
+    [coder encodeObject:self.results forKey:@"results"];
+    NSIndexPath *selectedIndexPath = [self.tableView indexPathForSelectedRow];
+    if(selectedIndexPath != nil)
+    {
+        [coder encodeObject:selectedIndexPath forKey:@"selectedIndexPath"];
+    }
+}
+
+- (void)decodeRestorableStateWithCoder:(NSCoder *)coder
+{
+    [super decodeRestorableStateWithCoder:coder];
+    self.remote = [coder decodeObjectForKey:@"remote"];
+    [self.remote connect];
+    self.results = [coder decodeObjectForKey:@"results"];
+    NSIndexPath *selectedIndexPath = [coder decodeObjectForKey:@"selectedIndexPath"];
+    if(selectedIndexPath != nil)
+    {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.tableView selectRowAtIndexPath:selectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
+        });
+    }
+}
+
 - (void)dealloc
 {
 

diff --git a/Dash/DHRepo.m b/Dash/DHRepo.m
@@ -723,6 +723,8 @@ - (BOOL)canInstallFeed:(DHFeed *)feed
 
 - (void)viewDidLoad
 {
+    if(!self.navigationController)
+        return;
     [super viewDidLoad];
     [self.tableView registerNib:[UINib nibWithNibName:@"DHRepoCell" bundle:nil] forCellReuseIdentifier:@"DHRepoCell"];
 }
@@ -888,6 +890,12 @@ - (NSInteger)indexOfFeedWithFeedURL:(NSString *)feedURL
     return NSNotFound;
 }
 
+- (void)decodeRestorableStateWithCoder:(NSCoder *)coder
+{
+    [super decodeRestorableStateWithCoder:coder];
+    [self viewDidLoad];
+}
+
 @end
 
 NSInteger compareFeeds(id feed1, id feed2, void *context)

diff --git a/Dash/DHSplitViewController.m b/Dash/DHSplitViewController.m
@@ -28,6 +28,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     self.delegate = (id)self;
+    self.preferredPrimaryColumnWidthFraction = (iPad) ? 0.39 : 0.35;
+    self.maximumPrimaryColumnWidth = 320;
+
 }
 
 - (BOOL)splitViewController:(UISplitViewController *)splitViewController collapseSecondaryViewController:(UINavigationController *)secondaryViewController ontoPrimaryViewController:(UIViewController *)primaryViewController

diff --git a/Dash/DHTypeBrowser.m b/Dash/DHTypeBrowser.m
@@ -49,7 +49,7 @@ - (void)viewDidLoad
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    if(!self.didLoad)
+    if(!self.didLoad && self.docset)
     {
         self.didLoad = YES;
         if(isRegularHorizontalClass && self.isActive)

diff --git a/Dash/DHWebViewController.h b/Dash/DHWebViewController.h
@@ -51,6 +51,8 @@
 @property (assign) BOOL didLoadInitialRequest;
 @property (assign) BOOL didLoadOnce;
 @property (strong) NSString *urlToLoad;
+@property (assign) BOOL isRestoreScroll;
+@property (assign) CGPoint webViewOffset;
 
 + (instancetype)sharedWebViewController;
 - (void)loadURL:(NSString *)urlString;
@@ -66,4 +68,4 @@
 - (IBAction)tocButtonPressed:(id)sender;
 - (void)reload;
 
-@end
+@end
diff --git a/Dash/DHWebViewController.m b/Dash/DHWebViewController.m
@@ -62,8 +62,6 @@ - (void)viewDidLoad
     self.progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
 
     [self.splitViewController setPreferredDisplayMode:UISplitViewControllerDisplayModeAllVisible];
-    self.splitViewController.preferredPrimaryColumnWidthFraction = (iPad) ? 0.39 : 0.35;
-    self.splitViewController.maximumPrimaryColumnWidth = 320;
     self.splitViewController.presentsWithGesture = NO;
 
     if(isRegularHorizontalClass)
@@ -297,6 +295,10 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
     [self setUpScripts];
     [self setUpTOC];
     [self.progressView setProgress:1.0 animated:YES];
+    if (self.isRestoreScroll) {
+        [self.webView.scrollView setContentOffset:self.webViewOffset animated:NO];
+        self.isRestoreScroll = NO;
+    }
 }
 
 - (void)setUpTOC
@@ -738,15 +740,30 @@ - (BOOL)dismissMethodsPopoverIfVisible:(BOOL)animated
 - (void)encodeRestorableStateWithCoder:(NSCoder *)coder
 {
     [super encodeRestorableStateWithCoder:coder];
+    [coder encodeObject:self.webView.request.URL.absoluteString forKey:@"webViewURL"];
+    [coder encodeObject:homePath forKey:@"homePath"];
+    [coder encodeCGPoint:self.webView.scrollView.contentOffset forKey:@"webViewOffset"];
 }
 
 - (void)decodeRestorableStateWithCoder:(NSCoder *)coder
 {
+    [super decodeRestorableStateWithCoder:coder];
+    NSString *loadURL = [coder decodeObjectForKey:@"webViewURL"];
+    NSString *lastHomePath = [coder decodeObjectForKey:@"homePath"];
+    self.webViewOffset = [coder decodeCGPointForKey:@"webViewOffset"];
+    if (lastHomePath) {
+        loadURL = [[loadURL stringByReplacingOccurrencesOfString:lastHomePath withString:homePath] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    }
+
     self.isRestoring = YES;
     [self viewDidLoad];
     self.isRestoring = NO;
     self.isDecoding = YES;
-    [super decodeRestorableStateWithCoder:coder];
+    [self loadURL:loadURL];
+    if (isRegularHorizontalClass) {
+        [self.splitViewController setPreferredDisplayMode:UISplitViewControllerDisplayModeAllVisible];
+    }
+    self.isRestoreScroll = YES;
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender