Fixes computed properties. Refs #37.

svet · May 31, 2015 · 08359b0 · 08359b0
1 parent 81d6797
commit 08359b0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/src/App_delegate.m b/src/App_delegate.m
@@ -59,7 +59,10 @@ - (BOOL)application:(UIApplication *)application
 {
 	DLOG(@"Lunching application with %@", launch_options);
 
-    [[SGPS get] start];
+    SGPS* test = [SGPS get];
+    [test start];
+    test.gpsIsOn = YES;
+    test.saveAllPositions = YES;
 
 	[[UIDevice currentDevice] setBatteryMonitoringEnabled:YES];
 	_set_globals();

diff --git a/src/SGPS.swift b/src/SGPS.swift
@@ -7,21 +7,15 @@ enum Accuracy
     case High, Medium, Low
 }
 
-@objc public class SGPS : NSObject, CLLocationManagerDelegate
+@objc class SGPS : NSObject, CLLocationManagerDelegate
 {
     private let _GPS_IS_ON_KEY = "gps_is_on"
     private let _KEY_SAVE_SINGLE_POSITION = "save_single_positions"
 
-    static private let cInstance: SGPS = SGPS();
-    private var mSaveAllPositions: Bool {
-        get { return self.mSaveAllPositions }
-        set {
-            let defaults = NSUserDefaults.standardUserDefaults()
-            defaults.setBool(newValue, forKey:_KEY_SAVE_SINGLE_POSITION)
-            defaults.synchronize()
-        }
-    }
+    static private let cInstance: SGPS = SGPS()
 
+    private var mSaveAllPositions = false
+    private var mGpsIsOn = false
     private var mManager: CLLocationManager
     private var mAccuracy: Accuracy
 
@@ -30,7 +24,7 @@ enum Accuracy
         return cInstance
     }
 
-    override public init()
+    override init()
     {
         println("Initializing SGPS")
         mManager = CLLocationManager()
@@ -55,23 +49,32 @@ enum Accuracy
         //mManager = nil
     }
 
-    public var mGpsIsOn: Bool {
-        get {
-            return self.mGpsIsOn
+    var saveAllPositions: Bool {
+        get { return mSaveAllPositions }
+        set {
+            mSaveAllPositions = newValue
+            let defaults = NSUserDefaults.standardUserDefaults()
+            defaults.setBool(newValue, forKey:_KEY_SAVE_SINGLE_POSITION)
+            defaults.synchronize()
         }
+    }
+
+    var gpsIsOn: Bool {
+        get { return mGpsIsOn }
         set {
+            mGpsIsOn = newValue
             let defaults = NSUserDefaults.standardUserDefaults()
             defaults.setBool(newValue, forKey:_GPS_IS_ON_KEY)
             defaults.synchronize()
         }
     }
 
-    public func start()
+    func start()
     {
         println("Starting!")
     }
 
-    public func stop()
+    func stop()
     {
         println("Stopping")
     }