• I’ll have a #3 with extra bug fixes and a chocolate shake.

Author: overtake

Telegram-Mac.xcworkspace/contents.xcworkspacedata

@@ -442,26 +442,26 @@ private enum AccountInfoEntry : TableItemListNodeEntry {
         case .wallet:
             return GeneralInteractedRowItem(initialSize, stableId: stableId, name: L10n.accountSettingsWallet, icon: theme.icons.settingsWallet, activeIcon: theme.icons.settingsWalletActive, type: .next, action: {
                 let context = arguments.context
-                if #available(OSX 10.12, *) {
-                    
-                    let _ = combineLatest(queue: .mainQueue(), walletConfiguration(postbox: context.account.postbox), TONKeychain.hasKeys(for: context.account)).start(next: { configuration, hasKeys in
-                        if let config = configuration.config, let blockchainName = configuration.blockchainName {
-                            let tonContext = context.tonContext.context(config: config, blockchainName: blockchainName, enableProxy: !configuration.disableProxy)
-                            if hasKeys {
-                                let signal = tonContext.storage.getWalletRecords() |> deliverOnMainQueue
-                                _ = signal.start(next: { wallets in
-                                    if wallets.isEmpty {
-                                        arguments.presentController(WalletSplashController(context: context, tonContext: tonContext, mode: .intro), true)
-                                    } else {
-                                        arguments.presentController(WalletInfoController(context: context, tonContext: tonContext, walletInfo: wallets[0].info), true)
-                                    }
-                                })
-                            } else {
-                                arguments.presentController(WalletSplashController(context: context, tonContext: tonContext, mode: .unavailable), true)
-                            }
-                        }
-                    })
-                }
+//                if #available(OSX 10.12, *) {
+//
+//                    let _ = combineLatest(queue: .mainQueue(), walletConfiguration(postbox: context.account.postbox), TONKeychain.hasKeys(for: context.account)).start(next: { configuration, hasKeys in
+//                        if let config = configuration.config, let blockchainName = configuration.blockchainName {
+//                            let tonContext = context.tonContext.context(config: config, blockchainName: blockchainName, enableProxy: !configuration.disableProxy)
+//                            if hasKeys {
+//                                let signal = tonContext.storage.getWalletRecords() |> deliverOnMainQueue
+//                                _ = signal.start(next: { wallets in
+//                                    if wallets.isEmpty {
+//                                        arguments.presentController(WalletSplashController(context: context, tonContext: tonContext, mode: .intro), true)
+//                                    } else {
+//                                        arguments.presentController(WalletInfoController(context: context, tonContext: tonContext, walletInfo: wallets[0].info), true)
+//                                    }
+//                                })
+//                            } else {
+//                                arguments.presentController(WalletSplashController(context: context, tonContext: tonContext, mode: .unavailable), true)
+//                            }
+//                        }
+//                    })
+//                }
 
             }, border:[BorderType.Right], inset:NSEdgeInsets(left:16))
         case .faq:
@@ -592,10 +592,10 @@ private func accountInfoEntries(peerView:PeerView, accounts: [AccountWithInfo],
         entries.append(.passport(index: index, peer: peer))
         index += 1
     }
-    if hasWallet {
-        entries.append(.wallet(index: index))
-        index += 1
-    }
+//    if hasWallet {
+//        entries.append(.wallet(index: index))
+//        index += 1
+//    }
 
 
 

Telegram-Mac/AccountContext.swift

@@ -9,14 +9,21 @@ import Quartz
 import MtProtoKit
 import CoreServices
 import LocalAuthentication
-import WalletCore
+//import WalletCore
 import OpenSSLEncryption
 import CoreSpotlight
 #if !APP_STORE
 import AppCenter
 import AppCenterCrashes
 #endif
 
+#if !SHARE
+extension Account {
+    var diceCache: DiceCache? {
+        return (NSApp.delegate as? AppDelegate)?.contextValue?.context.diceCache
+    }
+}
+#endif
 
 
 private final class SharedApplicationContext {
@@ -63,7 +70,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
     }
 
 
-    private var contextValue: AuthorizedApplicationContext?
+    fileprivate var contextValue: AuthorizedApplicationContext?
     private let context = Promise<AuthorizedApplicationContext?>()
 
     private var authContextValue: UnauthorizedApplicationContext?
@@ -377,7 +384,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
                 }
             })
 
-            let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: CallBridge.voipMaxLayer(), appData: .single(ApiEnvironment.appData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider())
+            let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: CallBridge.voipMaxLayer(), voipVersions: [CallBridge.voipVersion()], appData: .single(ApiEnvironment.appData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider())
 
             let sharedContext = SharedAccountContext(accountManager: accountManager, networkArguments: networkArguments, rootPath: rootPath, encryptionParameters: encryptionParameters, displayUpgradeProgress: displayUpgrade)
 
@@ -439,31 +446,31 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
             })
 
 
-            let tonKeychain: TonKeychain
-            
-            tonKeychain = TonKeychain(encryptionPublicKey: {
-                return Signal { subscriber in
-                    return EmptyDisposable
-                }
-            }, encrypt: { data in
-                return Signal { subscriber in
-                    if #available(OSX 10.12, *) {
-                        if let context = self.contextValue?.context, let publicKey = TKPublicKey.get(for: context.account) {
-                            if let result = publicKey.encrypt(data: data) {
-                                subscriber.putNext(TonKeychainEncryptedData(publicKey: publicKey.key, data: result))
-                                subscriber.putCompletion()
-                                return EmptyDisposable
-                            }
-                        }
-                    }
-                    subscriber.putError(.generic)
-                    return EmptyDisposable
-                }
-            }, decrypt: { encryptedData in
-                return Signal { subscriber in
-                    return EmptyDisposable
-                }
-            })
+//            let tonKeychain: TonKeychain
+//            
+//            tonKeychain = TonKeychain(encryptionPublicKey: {
+//                return Signal { subscriber in
+//                    return EmptyDisposable
+//                }
+//            }, encrypt: { data in
+//                return Signal { subscriber in
+//                    if #available(OSX 10.12, *) {
+//                        if let context = self.contextValue?.context, let publicKey = TKPublicKey.get(for: context.account) {
+//                            if let result = publicKey.encrypt(data: data) {
+//                                subscriber.putNext(TonKeychainEncryptedData(publicKey: publicKey.key, data: result))
+//                                subscriber.putCompletion()
+//                                return EmptyDisposable
+//                            }
+//                        }
+//                    }
+//                    subscriber.putError(.generic)
+//                    return EmptyDisposable
+//                }
+//            }, decrypt: { encryptedData in
+//                return Signal { subscriber in
+//                    return EmptyDisposable
+//                }
+//            })
 
 
 
@@ -493,9 +500,9 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
                                         }.start()
                                     semaphore.wait()
                                 }
-                                let tonContext = StoredTonContext(basePath: account.basePath, postbox: account.postbox, network: account.network, keychain: tonKeychain)
+                              //  let tonContext = StoredTonContext(basePath: account.basePath, postbox: account.postbox, network: account.network, keychain: tonKeychain)
 
-                                let context = AccountContext(sharedContext: sharedApplicationContext.sharedContext, window: window, tonContext: tonContext, account: account)
+                                let context = AccountContext(sharedContext: sharedApplicationContext.sharedContext, window: window, account: account)
                                 return AuthorizedApplicationContext(window: window, context: context, launchSettings: settings ?? LaunchSettings.defaultSettings)
 
                             } else {

Telegram-Mac/AccountViewController.swift

@@ -124,7 +124,6 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
     private let chatUndoManagerDisposable = MetaDisposable()
     private let appUpdateDisposable = MetaDisposable()
     private let updatesDisposable = MetaDisposable()
-    
     private let _ready:Promise<Bool> = Promise()
     var ready: Signal<Bool, NoError> {
         return _ready.get() |> filter { $0 } |> take (1)
@@ -531,9 +530,7 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
                 }
             })
         }
-        
-        
-        
+            
        // _ready.set(.single(true))
     }
 

Telegram-Mac/AppDelegate.swift

@@ -177,6 +177,29 @@ final class CachedPatternWallpaperMaskRepresentation: CachedMediaResourceReprese
 }
 
 
+final class CachedDiceRepresentation: CachedMediaResourceRepresentation {
+    let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    let value: String
+    let size: NSSize
+    var uniqueId: String {
+        return value
+    }
+    
+    init(value: String, size: NSSize) {
+        self.value = value
+        self.size = size
+    }
+    
+    func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedDiceRepresentation {
+            return self.value == to.value && self.size == to.size
+        } else {
+            return false
+        }
+    }
+}
+
 
 
 public enum EmojiFitzModifier: Int32, Equatable {

Telegram-Mac/ApplicationContext.swift

@@ -83,6 +83,10 @@ class CalendarController: GenericViewController<CalendarControllerView> {
             if let strongSelf = self {
                 strongSelf.navigation.push(strongSelf.stepMonth(date: CalendarUtils.stepMonth(1, date: date)), style: .push)
             }
+        }, changeYear: { [weak self] year, date in
+            if let strongSelf = self {
+                strongSelf.navigation.push(strongSelf.stepMonth(date: CalendarUtils.year(Int(year), date: date)), style: .push)
+            }
         })
 
         self.navigation = CalendarNavigation(stepMonth(date: current), window)
@@ -93,6 +97,10 @@ class CalendarController: GenericViewController<CalendarControllerView> {
     func stepMonth(date:Date) -> CalendarMonthController {
         return CalendarMonthController(date, onlyFuture: self.onlyFuture, selectDayAnyway: CalendarUtils.isSameDate(current, date: date, checkDay: false), interactions: interactions)
     }
+    
+    override var isAutoclosePopover: Bool {
+        return false
+    }
 }
 
 

Telegram-Mac/CachedResourceRepresentations.swift

@@ -13,10 +13,12 @@ struct CalendarMonthInteractions {
     let selectAction:(Date)->Void
     let backAction:((Date)->Void)?
     let nextAction:((Date)->Void)?
-    init(selectAction:@escaping (Date)->Void, backAction:((Date)->Void)? = nil, nextAction:((Date)->Void)? = nil) {
+    let changeYear: (Int32, Date)->Void
+    init(selectAction:@escaping (Date)->Void, backAction:((Date)->Void)? = nil, nextAction:((Date)->Void)? = nil, changeYear: @escaping(Int32, Date)->Void) {
         self.selectAction = selectAction
         self.backAction = backAction
         self.nextAction = nextAction
+        self.changeYear = changeYear
     }
 }
 
@@ -188,7 +190,37 @@ class CalendarMonthController: GenericViewController<CalendarMonthView> {
         formatter.dateFormat = "yyyy"
         let yearString:String = formatter.string(from: month.month)
 
-        return TitledBarView(controller: self, .initialize(string: monthString, color: theme.colors.text, font:.medium(.text)), .initialize(string:yearString, color: theme.colors.grayText, font:.normal(.small)))
+        let barView = TitledBarView(controller: self, .initialize(string: monthString, color: theme.colors.text, font:.medium(.text)), .initialize(string:yearString, color: theme.colors.grayText, font:.normal(.small)))
+        
+        barView.set(handler: { [weak self] control in
+            
+            guard let `self` = self else {
+                return
+            }
+            
+            let nowTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970)
+            
+            var now: time_t = time_t(nowTimestamp)
+            var timeinfoNow: tm = tm()
+            localtime_r(&now, &timeinfoNow)
+            
+             var items:[SPopoverItem] = []
+            
+            for i in stride(from: 1900 + timeinfoNow.tm_year - 1, to: 2012, by: -1) {
+                items.append(.init("\(i)", { [weak self] in
+                    guard let `self` = self else {
+                        return
+                    }
+                    self.interactions.changeYear(i, self.month.month)
+                }))
+            }
+            if !items.isEmpty {
+                showPopover(for: control, with: SPopoverViewController(items: items), edge: .maxY, inset: NSMakePoint(30, -50))
+            }
+            
+        }, for: .Click)
+        
+        return barView
     }
 
     var isNextEnabled:Bool {

Telegram-Mac/CalendarController.swift

@@ -12,5 +12,5 @@
 + (NSDate*) monthDay:(NSInteger)day date:(NSDate *)date;
 + (NSInteger)weekDay:(NSDate *)date;
 + (NSDate *) stepMonth:(NSInteger)dm date:(NSDate *)date;
-
++ (NSDate *) year:(NSInteger)dm date:(NSDate *)date;
 @end

Telegram-Mac/CalendarMonthController.swift

@@ -95,4 +95,14 @@ + (NSDate *) stepMonth:(NSInteger)dm date:(NSDate *)date {
     return [cal dateFromComponents:components];
 }
 
++ (NSDate *) year:(NSInteger)dm date:(NSDate *)date {
+    NSCalendar *cal = [NSCalendar currentCalendar];
+    unsigned unitFlags = NSCalendarUnitDay| NSCalendarUnitYear | NSCalendarUnitMonth;
+    NSDateComponents *components = [cal components:unitFlags fromDate:date];
+    components.day = 1;
+    components.year = dm;
+    components.month = components.month;
+    return [cal dateFromComponents:components];
+}
+
 @end

Telegram-Mac/CalendarUtils.h

@@ -27,6 +27,8 @@
 @interface CallBridge : NSObject
 -(void)startTransmissionIfNeeded:(bool)outgoing allowP2p:(bool)allowP2p serializedData:(NSString *)serializedData connection:(TGCallConnection *)connection;
 
+-(id)initWithProxy:(CProxy *)proxy;
+
 -(void)mute;
 -(void)unmute;
 -(BOOL)isMuted;
@@ -41,6 +43,7 @@
 @property (nonatomic, copy) void (^stateChangeHandler)(int);
 
 +(int32_t)voipMaxLayer;
++(NSString *)voipVersion;
 
 +(NSArray<AudioDevice *> *)outputDevices;
 +(NSArray<AudioDevice *> *)inputDevices;

Telegram-Mac/CalendarUtils.m

@@ -136,6 +136,9 @@ - (void)controllerStateChanged:(int)state
 +(int32_t)voipMaxLayer {
     return tgvoip::VoIPController::GetConnectionMaxLayer();
 }
++(NSString *)voipVersion {
+    return [NSString stringWithUTF8String:tgvoip::VoIPController::GetVersion()];
+}
 
 +(NSArray<AudioDevice *> *)inputDevices {