commit 677352398bb1b8bb2bd30db4a14aef5ea1c6b7b4
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Thu May 10 15:05:32 2018 -0400
committer Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Fri May 11 17:20:07 2018 -0400
tree 6ec96a44962a12565070c3b147c3bb868b5cfc96
parent 50b05f5a0c4de1b559c9e141d1ad3e7e55cafa97

data transfer: select download folder

Add setting to select folder for incoming images.

Change-Id: I2ee21e0b9195e8ebfcaf11e101160b8058d39792
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>

src/RingWindowController.mm

diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 676c2cf..dc082a7 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -39,6 +39,7 @@
 #import <api/conversation.h>
 #import <api/contactmodel.h>
 #import <api/contact.h>
+#import <api/datatransfermodel.h>
 
 // Ring
 #import "AppDelegate.h"
@@ -123,6 +124,16 @@
     NSToolbar *toolbar = self.window.toolbar;
     toolbar.delegate = self;
     [toolbar insertItemWithItemIdentifier:kChangeAccountToolBarItemIdentifier atIndex:1];
+    // set download folder (default - 'Downloads')
+    NSString* path = [[NSUserDefaults standardUserDefaults] stringForKey:Preferences::DownloadFolder];
+    if (!path || path.length == 0) {
+        NSURL *downloadsURL = [[NSFileManager defaultManager]
+                               URLForDirectory:NSDownloadsDirectory
+                               inDomain:NSUserDomainMask appropriateForURL:nil
+                               create:YES error:nil];
+        path = [[downloadsURL path] stringByAppendingString:@"/"];
+    }
+    lrc_->getDataTransferModel().downloadDirectory = std::string([path UTF8String]);
 }
 
 - (void) connect
@@ -310,7 +321,7 @@
 
 - (IBAction)openPreferences:(id)sender
 {
-    preferencesWC = [[PreferencesWC alloc] initWithWindowNibName:@"PreferencesWindow"];
+    preferencesWC = [[PreferencesWC alloc] initWithNibName:@"PreferencesWindow" bundle: nil model:&(lrc_->getDataTransferModel())];
     [preferencesWC.window makeKeyAndOrderFront:preferencesWC.window];
 }