Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed

- Minimum supported version of macOS is [now 12.0](https://github.com/chucker/Mastonaut/pull/26)

### Fixed

- Fixed deprecation warnings about using [strings as type identifiers](https://github.com/chucker/Mastonaut/issues/25)
- Fixed deprecation warning about [NSKeyedUnarchiver in TimelinesWindowController](https://github.com/chucker/Mastonaut/issues/30)

## [1.3.10] - 2022-08-17

### First OSS release

### Added

- Use Sparkle for application updating

[Unreleased]: https://github.com/chucker/Mastonaut/compare/app-1.3.10...HEAD
[1.3.10]: https://github.com/chucker/Mastonaut/releases/tag/app-1.3.10
2 changes: 2 additions & 0 deletions Mastonaut.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@
5FE7A52D292E704D00F7EB73 /* PullRefreshableScrollView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PullRefreshableScrollView.xcodeproj; path = Dependencies/PullRefreshableScrollView/PullRefreshableScrollView.xcodeproj; sourceTree = "<group>"; };
613EECFE95639DB968A362BE /* Pods-QuickToot.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuickToot.adhoc.xcconfig"; path = "Target Support Files/Pods-QuickToot/Pods-QuickToot.adhoc.xcconfig"; sourceTree = "<group>"; };
7AEAB27D6CB6D651C5299936 /* Pods-MastonautTests.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MastonautTests.adhoc.xcconfig"; path = "Target Support Files/Pods-MastonautTests/Pods-MastonautTests.adhoc.xcconfig"; sourceTree = "<group>"; };
7CE6D387292F0303005D2702 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
8BE1B4746437CF8AAE269D73 /* Pods-Mastonaut (Mock).adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastonaut (Mock).adhoc.xcconfig"; path = "Target Support Files/Pods-Mastonaut (Mock)/Pods-Mastonaut (Mock).adhoc.xcconfig"; sourceTree = "<group>"; };
BDA5F885C761EEC9A0A80081 /* Pods-Mastonaut (Mock).release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastonaut (Mock).release.xcconfig"; path = "Target Support Files/Pods-Mastonaut (Mock)/Pods-Mastonaut (Mock).release.xcconfig"; sourceTree = "<group>"; };
C98AE161223D7FB700A8DD22 /* AvatarImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarImageCache.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1485,6 +1486,7 @@
isa = PBXGroup;
children = (
5512395829181BCA0026C1D5 /* README.md */,
7CE6D387292F0303005D2702 /* CHANGELOG.md */,
551239562917FA370026C1D5 /* userspecific.xcconfig */,
15C4DD0E21D41EC0002AF6DA /* Mastonaut */,
1512DB82221B8D030090F2BD /* Dependencies */,
Expand Down
22 changes: 14 additions & 8 deletions Mastonaut/Window Controllers/TimelinesWindowController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
//

import Cocoa
import MastodonKit
import CoreTootin
import PullRefreshableScrollView
import Logging
import MastodonKit
import PullRefreshableScrollView

class TimelinesWindowController: NSWindowController, UserPopUpButtonDisplaying, ToolbarWindowController
{
Expand Down Expand Up @@ -71,6 +71,8 @@ class TimelinesWindowController: NSWindowController, UserPopUpButtonDisplaying,
// MARK: Lifecycle Support
private var preservedWindowFrameStack: Stack<CGRect> = []

private var logger: Logger = Logger(label: "TimelinesWindowController")

var currentInstance: Instance? {
didSet {
if let sidebarMode = self.sidebarSubcontroller.navigationStack?.currentItem,
Expand Down Expand Up @@ -257,12 +259,16 @@ class TimelinesWindowController: NSWindowController, UserPopUpButtonDisplaying,
// the class name level and encodes only the internals.
// if let stack: NavigationStack<SidebarMode> = coder.decodeObject(forKey: CodingKeys.sidebarNavigationStack)
if let stackEncodedData: Data = coder.decodeObject(forKey: CodingKeys.sidebarNavigationStack) {
let decoder = NSKeyedUnarchiver(forReadingWith: stackEncodedData)
if let stack = NavigationStack<SidebarMode>(coder: decoder) {
timelinesSplitViewController.preserveSplitViewSizeForNextSidebarInstall = true
sidebarSubcontroller = SidebarSubcontroller(sidebarContainer: self,
navigationControl: sidebarNavigationSegmentedControl,
navigationStack: stack)
do {
let decoder = try NSKeyedUnarchiver(forReadingFrom: stackEncodedData)
if let stack = NavigationStack<SidebarMode>(coder: decoder) {
timelinesSplitViewController.preserveSplitViewSizeForNextSidebarInstall = true
sidebarSubcontroller = SidebarSubcontroller(sidebarContainer: self,
navigationControl: sidebarNavigationSegmentedControl,
navigationStack: stack)
}
} catch {
logger.error("Error creating NSKeyedUnarchiver for navigation stack. \(error.localizedDescription)")
}
}

Expand Down