v1.1

pixelomer · pixelomer · commit 09f5c7b22450 · 2020-01-11T12:56:39.000+03:00
diff --git a/AltDeploy.xcodeproj/xcshareddata/xcschemes/AltDeploy.xcscheme b/AltDeploy.xcodeproj/xcshareddata/xcschemes/AltDeploy.xcscheme
@@ -31,9 +31,9 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/AltDeploy/ALTAppleIDManager.h b/AltDeploy/ALTAppleIDManager.h
@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)getLastAppleID:(NSString *_Nullable*_Nullable)usernamePt;
 - (NSString *)passwordOfAppleID:(NSString *)username;
 - (BOOL)addAppleID:(NSString *)username password:(NSString *)password;
+- (void)removeAppleID:(NSString *)username;
 
 @end
 
diff --git a/AltDeploy/ALTAppleIDManager.m b/AltDeploy/ALTAppleIDManager.m
@@ -45,4 +45,8 @@ - (NSString *)passwordOfAppleID:(NSString *)username {
     return [SAMKeychain passwordForService:NSBundle.mainBundle.bundleIdentifier account:username];
 }
 
+- (void)removeAppleID:(NSString *)username {
+	[SAMKeychain deletePasswordForService:NSBundle.mainBundle.bundleIdentifier account:username];
+}
+
 @end
diff --git a/AltDeploy/ALTMainViewController.m b/AltDeploy/ALTMainViewController.m
@@ -52,6 +52,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(NSProgress *)object
 - (void)didClickPreferences:(id)sender {
     ALTPreferencesViewController *vc = (ALTPreferencesViewController *)[[NSStoryboard storyboardWithName:@"Main" bundle:NSBundle.mainBundle] instantiateControllerWithIdentifier:@"prefs"];
     [self presentViewControllerAsModalWindow:vc];
+    [self refreshAppleIDs];
 }
 
 #pragma mark - Life Cycle
@@ -320,7 +321,7 @@ - (void)chooseIPA {
 - (void)fetchUtilities {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSArray<NSMenuItem *> * __block menuItems = nil;
-        NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"https://api.pixelomer.com/ALTImpactor/v1/utilities"]];
+        NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:@"https://api.pixelomer.com/ALTImpactor/v0/utilities"]];
         if (data) {
             NSError *error;
             NSArray *array = [NSJSONSerialization
diff --git a/AltDeploy/ALTPreferencesViewController.h b/AltDeploy/ALTPreferencesViewController.h
@@ -10,9 +10,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ALTPreferencesViewController : NSViewController<NSTableViewDelegate, NSTableViewDataSource> {
+@protocol ALTAddAppleIDDelegate;
+
+@interface ALTPreferencesViewController : NSViewController<NSTableViewDelegate, NSTableViewDataSource, ALTAddAppleIDDelegate> {
 	NSArray<NSDictionary<NSString *, id> *> *accounts;
-	NSArray<NSArray<NSTextFieldCell *> *> *cells;
 	NSDateFormatter *dateFormatter;
 }
 @property (weak) IBOutlet NSButton *modifyButton;
diff --git a/AltDeploy/ALTPreferencesViewController.m b/AltDeploy/ALTPreferencesViewController.m
@@ -8,7 +8,9 @@
 
 #import "ALTPreferencesViewController.h"
 #import <SAMKeychain/SAMKeychain.h>
+#import "ALTAppleIDManager.h"
 #import "ALTMainViewController.h"
+#import "ALTAddAppleIDViewController.h"
 
 @implementation ALTPreferencesViewController
 
@@ -31,6 +33,9 @@ - (void)viewDidLoad {
 - (void)refreshAccounts {
 	accounts = [SAMKeychain accountsForService:NSBundle.mainBundle.bundleIdentifier];
     [_tableView reloadData];
+    if ([self.presentingViewController conformsToProtocol:@protocol(ALTAddAppleIDDelegate)]) {
+		[(id<ALTAddAppleIDDelegate>)self.presentingViewController didAddAppleID];
+	}
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
@@ -59,4 +64,23 @@ - (void)tableViewSelectionDidChange:(NSNotification *)notification {
 	_setAsDefaultButton.enabled = enableButtons;
 }
 
+- (IBAction)didPressRemove:(id)sender {
+	[[ALTAppleIDManager sharedManager] removeAppleID:accounts[_tableView.selectedRow][kSAMKeychainAccountKey]];
+	[self refreshAccounts];
+}
+
+- (void)didAddAppleID {
+	[self refreshAccounts];
+}
+
+- (IBAction)didPressModify:(id)sender {
+	ALTAddAppleIDViewController *vc = (ALTAddAppleIDViewController *)[[NSStoryboard storyboardWithName:@"Main" bundle:NSBundle.mainBundle] instantiateControllerWithIdentifier:@"appleid"];
+	[vc loadView];
+	vc.title = @"Modify Apple ID";
+	vc.usernameField.enabled = NO;
+	vc.usernameField.stringValue = accounts[_tableView.selectedRow][kSAMKeychainAccountKey];
+	vc.delegate = self;
+	[self presentViewControllerAsModalWindow:vc];
+}
+
 @end
diff --git a/AltDeploy/Base.lproj/Main.storyboard b/AltDeploy/Base.lproj/Main.storyboard
@@ -450,23 +450,19 @@
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <connections>
+                                    <action selector="didPressModify:" target="WEI-QT-mNg" id="fLr-TM-ays"/>
+                                </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UGW-6C-vlA">
                                 <rect key="frame" x="276" y="13" width="89" height="32"/>
                                 <buttonCell key="cell" type="push" title="Remove" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="A67-xf-zXv">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
-                            </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jb3-6a-a3d">
-                                <rect key="frame" x="14" y="13" width="125" height="32"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="113" id="NjQ-PE-dpE"/>
-                                </constraints>
-                                <buttonCell key="cell" type="push" title="Set as Default" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="yGd-NX-mZM">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
+                                <connections>
+                                    <action selector="didPressRemove:" target="WEI-QT-mNg" id="cwD-YY-Jcq"/>
+                                </connections>
                             </button>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Y08-t2-UqR">
                                 <rect key="frame" x="20" y="46" width="428" height="178"/>
@@ -493,7 +489,7 @@
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                 </tableColumn>
                                                 <tableColumn editable="NO" width="181" minWidth="40" maxWidth="1000" id="JF0-6y-Y9q">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Last Modified">
@@ -506,7 +502,7 @@
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
-                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                                    <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                 </tableColumn>
                                             </tableColumns>
                                         </tableView>
@@ -535,21 +531,18 @@
                             <constraint firstItem="Y08-t2-UqR" firstAttribute="top" secondItem="MMb-x9-C2I" secondAttribute="top" constant="20" id="5O5-4V-dI6"/>
                             <constraint firstAttribute="trailing" secondItem="OHM-Ti-bbE" secondAttribute="trailing" constant="20" id="BJI-Ue-jHF"/>
                             <constraint firstAttribute="bottom" secondItem="UGW-6C-vlA" secondAttribute="bottom" constant="20" id="CJ5-pc-b5z"/>
-                            <constraint firstItem="jb3-6a-a3d" firstAttribute="top" secondItem="UGW-6C-vlA" secondAttribute="top" id="EZ0-Dm-bje"/>
                             <constraint firstItem="UGW-6C-vlA" firstAttribute="top" secondItem="Y08-t2-UqR" secondAttribute="bottom" constant="5" id="HXO-E5-kZs"/>
+                            <constraint firstItem="UGW-6C-vlA" firstAttribute="leading" secondItem="MMb-x9-C2I" secondAttribute="leading" constant="282" id="K7c-BW-74l"/>
                             <constraint firstItem="Y08-t2-UqR" firstAttribute="leading" secondItem="MMb-x9-C2I" secondAttribute="leading" constant="20" id="LnI-ig-4s8"/>
                             <constraint firstAttribute="trailing" secondItem="Y08-t2-UqR" secondAttribute="trailing" constant="20" id="OQM-eb-7QR"/>
                             <constraint firstItem="UGW-6C-vlA" firstAttribute="width" secondItem="OHM-Ti-bbE" secondAttribute="width" id="cJb-95-EjJ"/>
                             <constraint firstItem="OHM-Ti-bbE" firstAttribute="top" secondItem="UGW-6C-vlA" secondAttribute="top" id="gBr-gZ-iPd"/>
-                            <constraint firstItem="UGW-6C-vlA" firstAttribute="leading" secondItem="jb3-6a-a3d" secondAttribute="trailing" constant="149" id="iaY-PG-InM"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="modifyButton" destination="OHM-Ti-bbE" id="2LA-KR-7vo"/>
                         <outlet property="removeButton" destination="UGW-6C-vlA" id="578-I9-WVc"/>
                         <outlet property="scrollView" destination="Y08-t2-UqR" id="i0K-PF-IaW"/>
-                        <outlet property="setAsDefault" destination="jb3-6a-a3d" id="r4U-h9-QT4"/>
-                        <outlet property="setAsDefaultButton" destination="jb3-6a-a3d" id="yac-5o-a5K"/>
                         <outlet property="tableView" destination="mOE-Zm-JQd" id="6nS-lg-BLB"/>
                     </connections>
                 </viewController>

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,8 @@ - (NSString )passwordOfAppleID:(NSString )username {`
`45`	`45`	`return [SAMKeychain passwordForService:NSBundle.mainBundle.bundleIdentifier account:username];`
`46`	`46`	`}`
`47`	`47`
	`48`	`+- (void)removeAppleID:(NSString *)username {`
	`49`	`+ [SAMKeychain deletePasswordForService:NSBundle.mainBundle.bundleIdentifier account:username];`
	`50`	`+}`
	`51`	`+`
`48`	`52`	`@end`