From f99b756505f54b828fdd47ade68e6a023ec78fe1 Mon Sep 17 00:00:00 2001
From: Patrick Santana <psantana@moogu.com>
Date: Thu, 6 Jun 2013 12:31:54 -0700
Subject: [PATCH] #313: removing photos from Settings

---
 Photo/Constants.h                |  2 --
 Photo/Constants.m                |  4 ----
 Photo/InitializerService.m       |  7 +------
 Photo/JobUploaderController.m    | 14 +++++++++++---
 Photo/Settings.bundle/Root.plist | 20 --------------------
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/Photo/Constants.h b/Photo/Constants.h
index 1792d94..48fe571 100644
--- a/Photo/Constants.h
+++ b/Photo/Constants.h
@@ -20,8 +20,6 @@
 @interface Constants : NSObject
 
 extern NSString * const kAppInitialized;
-extern NSString * const kPhotosSaveCameraRollOrSnapshot;
-extern NSString * const kPhotosSaveFiltered;
 extern NSString * const kPhotosArePrivate;
 extern NSString * const kTroveboxServer;
 extern NSString * const kTroveboxNameUser;
diff --git a/Photo/Constants.m b/Photo/Constants.m
index 219c379..b61c9ae 100644
--- a/Photo/Constants.m
+++ b/Photo/Constants.m
@@ -24,10 +24,6 @@
 
 // Const for the app initialization variable
 NSString * const kAppInitialized = @"app_initialized";
-// Save original to Library - NSUserDefaults name
-NSString * const kPhotosSaveCameraRollOrSnapshot=@"photos_save_camera_roll_or_snapshot";
-// Save filtered to Library - NSUserDefaults name
-NSString * const kPhotosSaveFiltered=@"photos_save_filtered";
 // Privacy - NSUserDefaults name
 NSString * const kPhotosArePrivate=@"photos_are_private";
 // NSUserDefault variable name for the Trovebox Server
diff --git a/Photo/InitializerService.m b/Photo/InitializerService.m
index 65cdfca..3e9e492 100644
--- a/Photo/InitializerService.m
+++ b/Photo/InitializerService.m
@@ -49,12 +49,7 @@
     /*
      * set the initial configuration for the user properties
      */
-    if (standardUserDefaults) {
-        // Save original to Library
-        [standardUserDefaults setBool:YES forKey:kPhotosSaveCameraRollOrSnapshot];
-        // Save filtered to Library
-        [standardUserDefaults setBool:YES forKey:kPhotosSaveFiltered];
-        
+    if (standardUserDefaults) {        
         // Privacy
         [standardUserDefaults setBool:YES forKey:kPhotosArePrivate];
         
diff --git a/Photo/JobUploaderController.m b/Photo/JobUploaderController.m
index ce88e6d..e40d63b 100644
--- a/Photo/JobUploaderController.m
+++ b/Photo/JobUploaderController.m
@@ -23,7 +23,8 @@
 @interface JobUploaderController (){
     BOOL running;
 }
-- (void) executeJob;
+- (void) executeUploadJob;
+- (void) executeSyncJob;
 
 @end
 
@@ -53,8 +54,11 @@
             while (running) {
                 // sleep for 3 seconds
                 [NSThread sleepForTimeInterval:3];
+                
                 // execute the method
-                [self executeJob];
+                [self executeUploadJob];
+                
+                // check if users enabled Sync
             }
         }@catch (NSException *exception) {
             NSLog(@"Error in the job %@", [exception description]);
@@ -74,8 +78,12 @@
     return running;
 }
 
+- (void) executeSyncJob
+{
+    
+}
 
-- (void) executeJob
+- (void) executeUploadJob
 {
     dispatch_async(dispatch_get_main_queue(), ^{
 #ifdef DEVELOPMENT_ENABLED
diff --git a/Photo/Settings.bundle/Root.plist b/Photo/Settings.bundle/Root.plist
index bbdcb99..e7a226e 100644
--- a/Photo/Settings.bundle/Root.plist
+++ b/Photo/Settings.bundle/Root.plist
@@ -26,26 +26,6 @@
 			<key>Title</key>
 			<string>Photos</string>
 		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>photos_save_camera_roll_or_snapshot</string>
-			<key>Title</key>
-			<string>Save original to Library</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>photos_save_filtered</string>
-			<key>Title</key>
-			<string>Save filtered to Library</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>