diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index 757bfef..1b89694 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -40,17 +40,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -992,8 +982,8 @@
-
-
+
+
@@ -1480,7 +1470,7 @@
-
+
@@ -1495,7 +1485,7 @@
-
+
diff --git a/phoneClients/android/build/intermediates/model_data.bin b/phoneClients/android/build/intermediates/model_data.bin
index 35b04b0..6bb624d 100644
--- a/phoneClients/android/build/intermediates/model_data.bin
+++ b/phoneClients/android/build/intermediates/model_data.bin
Binary files differ
diff --git a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj
index 24cea96..e226176 100644
--- a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj
+++ b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj
@@ -1,410 +1,859 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- 8884704B1874EB9400867228 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8884704A1874EB9400867228 /* Foundation.framework */; };
- 8884704D1874EB9400867228 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8884704C1874EB9400867228 /* CoreGraphics.framework */; };
- 8884704F1874EB9400867228 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8884704E1874EB9400867228 /* UIKit.framework */; };
- 888470551874EB9400867228 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 888470531874EB9400867228 /* InfoPlist.strings */; };
- 888470571874EB9400867228 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 888470561874EB9400867228 /* main.m */; };
- 8884705B1874EB9400867228 /* WSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8884705A1874EB9400867228 /* WSAppDelegate.m */; };
- 8884705E1874EB9400867228 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8884705C1874EB9400867228 /* Main.storyboard */; };
- 888470611874EB9400867228 /* WSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 888470601874EB9400867228 /* WSViewController.m */; };
- 888470631874EB9400867228 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 888470621874EB9400867228 /* Images.xcassets */; };
- 888470801875826600867228 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8884707F1875826600867228 /* CoreLocation.framework */; };
- C2EA24936B40417481CBD07D /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C8880B2EE17432CA6FDD050 /* libPods.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
- 6C8880B2EE17432CA6FDD050 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 888470471874EB9400867228 /* GpsTracker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GpsTracker.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 8884704A1874EB9400867228 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
- 8884704C1874EB9400867228 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- 8884704E1874EB9400867228 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
- 888470521874EB9400867228 /* GpsTracker-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GpsTracker-Info.plist"; sourceTree = ""; };
- 888470541874EB9400867228 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; };
- 888470561874EB9400867228 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; };
- 888470581874EB9400867228 /* GpsTracker-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GpsTracker-Prefix.pch"; sourceTree = ""; };
- 888470591874EB9400867228 /* WSAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WSAppDelegate.h; sourceTree = ""; };
- 8884705A1874EB9400867228 /* WSAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WSAppDelegate.m; sourceTree = ""; };
- 8884705D1874EB9400867228 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; };
- 8884705F1874EB9400867228 /* WSViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WSViewController.h; sourceTree = ""; };
- 888470601874EB9400867228 /* WSViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WSViewController.m; sourceTree = ""; };
- 888470621874EB9400867228 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; };
- 888470691874EB9400867228 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
- 888470711874EB9400867228 /* GpsTrackerTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GpsTrackerTests-Info.plist"; sourceTree = ""; };
- 888470731874EB9400867228 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; };
- 888470751874EB9400867228 /* GpsTrackerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GpsTrackerTests.m; sourceTree = ""; };
- 8884707F1875826600867228 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
- BE3B3497D30F48C2ADC3BCE7 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 888470441874EB9400867228 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 888470801875826600867228 /* CoreLocation.framework in Frameworks */,
- 8884704D1874EB9400867228 /* CoreGraphics.framework in Frameworks */,
- 8884704F1874EB9400867228 /* UIKit.framework in Frameworks */,
- 8884704B1874EB9400867228 /* Foundation.framework in Frameworks */,
- C2EA24936B40417481CBD07D /* libPods.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 8884703E1874EB9400867228 = {
- isa = PBXGroup;
- children = (
- 888470501874EB9400867228 /* GpsTracker */,
- 8884706F1874EB9400867228 /* GpsTrackerTests */,
- 888470491874EB9400867228 /* Frameworks */,
- 888470481874EB9400867228 /* Products */,
- BE3B3497D30F48C2ADC3BCE7 /* Pods.xcconfig */,
- );
- sourceTree = "";
- };
- 888470481874EB9400867228 /* Products */ = {
- isa = PBXGroup;
- children = (
- 888470471874EB9400867228 /* GpsTracker.app */,
- );
- name = Products;
- sourceTree = "";
- };
- 888470491874EB9400867228 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 8884707F1875826600867228 /* CoreLocation.framework */,
- 8884704A1874EB9400867228 /* Foundation.framework */,
- 8884704C1874EB9400867228 /* CoreGraphics.framework */,
- 8884704E1874EB9400867228 /* UIKit.framework */,
- 888470691874EB9400867228 /* XCTest.framework */,
- 6C8880B2EE17432CA6FDD050 /* libPods.a */,
- );
- name = Frameworks;
- sourceTree = "";
- };
- 888470501874EB9400867228 /* GpsTracker */ = {
- isa = PBXGroup;
- children = (
- 888470591874EB9400867228 /* WSAppDelegate.h */,
- 8884705A1874EB9400867228 /* WSAppDelegate.m */,
- 8884705C1874EB9400867228 /* Main.storyboard */,
- 8884705F1874EB9400867228 /* WSViewController.h */,
- 888470601874EB9400867228 /* WSViewController.m */,
- 888470621874EB9400867228 /* Images.xcassets */,
- 888470511874EB9400867228 /* Supporting Files */,
- );
- path = GpsTracker;
- sourceTree = "";
- };
- 888470511874EB9400867228 /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- 888470521874EB9400867228 /* GpsTracker-Info.plist */,
- 888470531874EB9400867228 /* InfoPlist.strings */,
- 888470561874EB9400867228 /* main.m */,
- 888470581874EB9400867228 /* GpsTracker-Prefix.pch */,
- );
- name = "Supporting Files";
- sourceTree = "";
- };
- 8884706F1874EB9400867228 /* GpsTrackerTests */ = {
- isa = PBXGroup;
- children = (
- 888470751874EB9400867228 /* GpsTrackerTests.m */,
- 888470701874EB9400867228 /* Supporting Files */,
- );
- path = GpsTrackerTests;
- sourceTree = "";
- };
- 888470701874EB9400867228 /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- 888470711874EB9400867228 /* GpsTrackerTests-Info.plist */,
- 888470721874EB9400867228 /* InfoPlist.strings */,
- );
- name = "Supporting Files";
- sourceTree = "";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 888470461874EB9400867228 /* GpsTracker */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 888470791874EB9400867228 /* Build configuration list for PBXNativeTarget "GpsTracker" */;
- buildPhases = (
- 7112F83FD248433F80295246 /* Check Pods Manifest.lock */,
- 888470431874EB9400867228 /* Sources */,
- 888470441874EB9400867228 /* Frameworks */,
- 888470451874EB9400867228 /* Resources */,
- 2991F302B84B4A3AA863CB6A /* Copy Pods Resources */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = GpsTracker;
- productName = GpsTracker;
- productReference = 888470471874EB9400867228 /* GpsTracker.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 8884703F1874EB9400867228 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- CLASSPREFIX = WS;
- LastUpgradeCheck = 0510;
- ORGANIZATIONNAME = "Nick Fox";
- TargetAttributes = {
- 888470461874EB9400867228 = {
- SystemCapabilities = {
- com.apple.BackgroundModes = {
- enabled = 1;
- };
- };
- };
- };
- };
- buildConfigurationList = 888470421874EB9400867228 /* Build configuration list for PBXProject "GpsTracker" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- Base,
- );
- mainGroup = 8884703E1874EB9400867228;
- productRefGroup = 888470481874EB9400867228 /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 888470461874EB9400867228 /* GpsTracker */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 888470451874EB9400867228 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 888470631874EB9400867228 /* Images.xcassets in Resources */,
- 888470551874EB9400867228 /* InfoPlist.strings in Resources */,
- 8884705E1874EB9400867228 /* Main.storyboard in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
- 2991F302B84B4A3AA863CB6A /* Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
- 7112F83FD248433F80295246 /* Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Check Pods Manifest.lock";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 888470431874EB9400867228 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8884705B1874EB9400867228 /* WSAppDelegate.m in Sources */,
- 888470571874EB9400867228 /* main.m in Sources */,
- 888470611874EB9400867228 /* WSViewController.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 888470531874EB9400867228 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 888470541874EB9400867228 /* en */,
- );
- name = InfoPlist.strings;
- sourceTree = "";
- };
- 8884705C1874EB9400867228 /* Main.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 8884705D1874EB9400867228 /* Base */,
- );
- name = Main.storyboard;
- sourceTree = "";
- };
- 888470721874EB9400867228 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 888470731874EB9400867228 /* en */,
- );
- name = InfoPlist.strings;
- sourceTree = "";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- 888470771874EB9400867228 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
- ONLY_ACTIVE_ARCH = YES;
- SDKROOT = iphoneos;
- };
- name = Debug;
- };
- 888470781874EB9400867228 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = YES;
- ENABLE_NS_ASSERTIONS = NO;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
- SDKROOT = iphoneos;
- VALIDATE_PRODUCT = YES;
- };
- name = Release;
- };
- 8884707A1874EB9400867228 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BE3B3497D30F48C2ADC3BCE7 /* Pods.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "GpsTracker/GpsTracker-Prefix.pch";
- INFOPLIST_FILE = "GpsTracker/GpsTracker-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
- };
- name = Debug;
- };
- 8884707B1874EB9400867228 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = BE3B3497D30F48C2ADC3BCE7 /* Pods.xcconfig */;
- buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "GpsTracker/GpsTracker-Prefix.pch";
- INFOPLIST_FILE = "GpsTracker/GpsTracker-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 888470421874EB9400867228 /* Build configuration list for PBXProject "GpsTracker" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 888470771874EB9400867228 /* Debug */,
- 888470781874EB9400867228 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 888470791874EB9400867228 /* Build configuration list for PBXNativeTarget "GpsTracker" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 8884707A1874EB9400867228 /* Debug */,
- 8884707B1874EB9400867228 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 8884703F1874EB9400867228 /* Project object */;
-}
+
+
+
+
+ archiveVersion
+ 1
+ classes
+
+ objectVersion
+ 46
+ objects
+
+ 095D279048BDD3ABE76302E4
+
+ children
+
+ 1398343624697B72DF2EA093
+ 78FC6E6274DC283E0A27D4A1
+
+ isa
+ PBXGroup
+ name
+ Pods
+ sourceTree
+ <group>
+
+ 1398343624697B72DF2EA093
+
+ includeInIndex
+ 1
+ isa
+ PBXFileReference
+ lastKnownFileType
+ text.xcconfig
+ name
+ Pods.debug.xcconfig
+ path
+ Pods/Target Support Files/Pods/Pods.debug.xcconfig
+ sourceTree
+ <group>
+
+ 2991F302B84B4A3AA863CB6A
+
+ buildActionMask
+ 2147483647
+ files
+
+ inputPaths
+
+ isa
+ PBXShellScriptBuildPhase
+ name
+ Copy Pods Resources
+ outputPaths
+
+ runOnlyForDeploymentPostprocessing
+ 0
+ shellPath
+ /bin/sh
+ shellScript
+ "${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh"
+
+ showEnvVarsInLog
+ 0
+
+ 6C8880B2EE17432CA6FDD050
+
+ explicitFileType
+ archive.ar
+ includeInIndex
+ 0
+ isa
+ PBXFileReference
+ path
+ libPods.a
+ sourceTree
+ BUILT_PRODUCTS_DIR
+
+ 7112F83FD248433F80295246
+
+ buildActionMask
+ 2147483647
+ files
+
+ inputPaths
+
+ isa
+ PBXShellScriptBuildPhase
+ name
+ Check Pods Manifest.lock
+ outputPaths
+
+ runOnlyForDeploymentPostprocessing
+ 0
+ shellPath
+ /bin/sh
+ shellScript
+ diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
+if [[ $? != 0 ]] ; then
+ cat << EOM
+error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
+EOM
+ exit 1
+fi
+
+ showEnvVarsInLog
+ 0
+
+ 78FC6E6274DC283E0A27D4A1
+
+ includeInIndex
+ 1
+ isa
+ PBXFileReference
+ lastKnownFileType
+ text.xcconfig
+ name
+ Pods.release.xcconfig
+ path
+ Pods/Target Support Files/Pods/Pods.release.xcconfig
+ sourceTree
+ <group>
+
+ 8884703E1874EB9400867228
+
+ children
+
+ 888470501874EB9400867228
+ 888470491874EB9400867228
+ 888470481874EB9400867228
+ 095D279048BDD3ABE76302E4
+
+ isa
+ PBXGroup
+ sourceTree
+ <group>
+
+ 8884703F1874EB9400867228
+
+ attributes
+
+ CLASSPREFIX
+ WS
+ LastUpgradeCheck
+ 0510
+ ORGANIZATIONNAME
+ Nick Fox
+ TargetAttributes
+
+ 888470461874EB9400867228
+
+ DevelopmentTeam
+ 664X7G9P7V
+ SystemCapabilities
+
+ com.apple.BackgroundModes
+
+ enabled
+ 1
+
+
+
+
+
+ buildConfigurationList
+ 888470421874EB9400867228
+ compatibilityVersion
+ Xcode 3.2
+ developmentRegion
+ English
+ hasScannedForEncodings
+ 0
+ isa
+ PBXProject
+ knownRegions
+
+ en
+ Base
+
+ mainGroup
+ 8884703E1874EB9400867228
+ productRefGroup
+ 888470481874EB9400867228
+ projectDirPath
+
+ projectReferences
+
+ projectRoot
+
+ targets
+
+ 888470461874EB9400867228
+
+
+ 888470421874EB9400867228
+
+ buildConfigurations
+
+ 888470771874EB9400867228
+ 888470781874EB9400867228
+
+ defaultConfigurationIsVisible
+ 0
+ defaultConfigurationName
+ Release
+ isa
+ XCConfigurationList
+
+ 888470431874EB9400867228
+
+ buildActionMask
+ 2147483647
+ files
+
+ 8884705B1874EB9400867228
+ 888470571874EB9400867228
+ 888470611874EB9400867228
+
+ isa
+ PBXSourcesBuildPhase
+ runOnlyForDeploymentPostprocessing
+ 0
+
+ 888470441874EB9400867228
+
+ buildActionMask
+ 2147483647
+ files
+
+ 888470801875826600867228
+ 8884704D1874EB9400867228
+ 8884704F1874EB9400867228
+ 8884704B1874EB9400867228
+ C2EA24936B40417481CBD07D
+
+ isa
+ PBXFrameworksBuildPhase
+ runOnlyForDeploymentPostprocessing
+ 0
+
+ 888470451874EB9400867228
+
+ buildActionMask
+ 2147483647
+ files
+
+ 888470631874EB9400867228
+ 888470551874EB9400867228
+ 8884705E1874EB9400867228
+
+ isa
+ PBXResourcesBuildPhase
+ runOnlyForDeploymentPostprocessing
+ 0
+
+ 888470461874EB9400867228
+
+ buildConfigurationList
+ 888470791874EB9400867228
+ buildPhases
+
+ 7112F83FD248433F80295246
+ 888470431874EB9400867228
+ 888470441874EB9400867228
+ 888470451874EB9400867228
+ 2991F302B84B4A3AA863CB6A
+
+ buildRules
+
+ dependencies
+
+ isa
+ PBXNativeTarget
+ name
+ GpsTracker
+ productName
+ GpsTracker
+ productReference
+ 888470471874EB9400867228
+ productType
+ com.apple.product-type.application
+
+ 888470471874EB9400867228
+
+ explicitFileType
+ wrapper.application
+ includeInIndex
+ 0
+ isa
+ PBXFileReference
+ path
+ GpsTracker.app
+ sourceTree
+ BUILT_PRODUCTS_DIR
+
+ 888470481874EB9400867228
+
+ children
+
+ 888470471874EB9400867228
+
+ isa
+ PBXGroup
+ name
+ Products
+ sourceTree
+ <group>
+
+ 888470491874EB9400867228
+
+ children
+
+ 8884707F1875826600867228
+ 8884704A1874EB9400867228
+ 8884704C1874EB9400867228
+ 8884704E1874EB9400867228
+ 888470691874EB9400867228
+ 6C8880B2EE17432CA6FDD050
+
+ isa
+ PBXGroup
+ name
+ Frameworks
+ sourceTree
+ <group>
+
+ 8884704A1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ wrapper.framework
+ name
+ Foundation.framework
+ path
+ System/Library/Frameworks/Foundation.framework
+ sourceTree
+ SDKROOT
+
+ 8884704B1874EB9400867228
+
+ fileRef
+ 8884704A1874EB9400867228
+ isa
+ PBXBuildFile
+
+ 8884704C1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ wrapper.framework
+ name
+ CoreGraphics.framework
+ path
+ System/Library/Frameworks/CoreGraphics.framework
+ sourceTree
+ SDKROOT
+
+ 8884704D1874EB9400867228
+
+ fileRef
+ 8884704C1874EB9400867228
+ isa
+ PBXBuildFile
+
+ 8884704E1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ wrapper.framework
+ name
+ UIKit.framework
+ path
+ System/Library/Frameworks/UIKit.framework
+ sourceTree
+ SDKROOT
+
+ 8884704F1874EB9400867228
+
+ fileRef
+ 8884704E1874EB9400867228
+ isa
+ PBXBuildFile
+
+ 888470501874EB9400867228
+
+ children
+
+ 888470591874EB9400867228
+ 8884705A1874EB9400867228
+ 8884705C1874EB9400867228
+ 8884705F1874EB9400867228
+ 888470601874EB9400867228
+ 888470621874EB9400867228
+ 888470511874EB9400867228
+
+ isa
+ PBXGroup
+ path
+ GpsTracker
+ sourceTree
+ <group>
+
+ 888470511874EB9400867228
+
+ children
+
+ 888470521874EB9400867228
+ 888470531874EB9400867228
+ 888470561874EB9400867228
+ 888470581874EB9400867228
+
+ isa
+ PBXGroup
+ name
+ Supporting Files
+ sourceTree
+ <group>
+
+ 888470521874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ text.plist.xml
+ path
+ GpsTracker-Info.plist
+ sourceTree
+ <group>
+
+ 888470531874EB9400867228
+
+ children
+
+ 888470541874EB9400867228
+
+ isa
+ PBXVariantGroup
+ name
+ InfoPlist.strings
+ sourceTree
+ <group>
+
+ 888470541874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ text.plist.strings
+ name
+ en
+ path
+ en.lproj/InfoPlist.strings
+ sourceTree
+ <group>
+
+ 888470551874EB9400867228
+
+ fileRef
+ 888470531874EB9400867228
+ isa
+ PBXBuildFile
+
+ 888470561874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.objc
+ path
+ main.m
+ sourceTree
+ <group>
+
+ 888470571874EB9400867228
+
+ fileRef
+ 888470561874EB9400867228
+ isa
+ PBXBuildFile
+
+ 888470581874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.h
+ path
+ GpsTracker-Prefix.pch
+ sourceTree
+ <group>
+
+ 888470591874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.h
+ path
+ WSAppDelegate.h
+ sourceTree
+ <group>
+
+ 8884705A1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.objc
+ path
+ WSAppDelegate.m
+ sourceTree
+ <group>
+
+ 8884705B1874EB9400867228
+
+ fileRef
+ 8884705A1874EB9400867228
+ isa
+ PBXBuildFile
+
+ 8884705C1874EB9400867228
+
+ children
+
+ 8884705D1874EB9400867228
+
+ isa
+ PBXVariantGroup
+ name
+ Main.storyboard
+ sourceTree
+ <group>
+
+ 8884705D1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ file.storyboard
+ name
+ Base
+ path
+ Base.lproj/Main.storyboard
+ sourceTree
+ <group>
+
+ 8884705E1874EB9400867228
+
+ fileRef
+ 8884705C1874EB9400867228
+ isa
+ PBXBuildFile
+
+ 8884705F1874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.h
+ path
+ WSViewController.h
+ sourceTree
+ <group>
+
+ 888470601874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ sourcecode.c.objc
+ path
+ WSViewController.m
+ sourceTree
+ <group>
+
+ 888470611874EB9400867228
+
+ fileRef
+ 888470601874EB9400867228
+ isa
+ PBXBuildFile
+
+ 888470621874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ folder.assetcatalog
+ path
+ Images.xcassets
+ sourceTree
+ <group>
+
+ 888470631874EB9400867228
+
+ fileRef
+ 888470621874EB9400867228
+ isa
+ PBXBuildFile
+
+ 888470691874EB9400867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ wrapper.framework
+ name
+ XCTest.framework
+ path
+ Library/Frameworks/XCTest.framework
+ sourceTree
+ DEVELOPER_DIR
+
+ 888470771874EB9400867228
+
+ buildSettings
+
+ ALWAYS_SEARCH_USER_PATHS
+ NO
+ CLANG_CXX_LANGUAGE_STANDARD
+ gnu++0x
+ CLANG_CXX_LIBRARY
+ libc++
+ CLANG_ENABLE_MODULES
+ YES
+ CLANG_ENABLE_OBJC_ARC
+ YES
+ CLANG_WARN_BOOL_CONVERSION
+ YES
+ CLANG_WARN_CONSTANT_CONVERSION
+ YES
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE
+ YES_ERROR
+ CLANG_WARN_EMPTY_BODY
+ YES
+ CLANG_WARN_ENUM_CONVERSION
+ YES
+ CLANG_WARN_INT_CONVERSION
+ YES
+ CLANG_WARN_OBJC_ROOT_CLASS
+ YES_ERROR
+ CLANG_WARN__DUPLICATE_METHOD_MATCH
+ YES
+ CODE_SIGN_IDENTITY
+ iPhone Developer
+ CODE_SIGN_IDENTITY[sdk=iphoneos*]
+ iPhone Developer
+ COPY_PHASE_STRIP
+ NO
+ GCC_C_LANGUAGE_STANDARD
+ gnu99
+ GCC_DYNAMIC_NO_PIC
+ NO
+ GCC_OPTIMIZATION_LEVEL
+ 0
+ GCC_PREPROCESSOR_DEFINITIONS
+
+ DEBUG=1
+ $(inherited)
+
+ GCC_SYMBOLS_PRIVATE_EXTERN
+ NO
+ GCC_WARN_64_TO_32_BIT_CONVERSION
+ YES
+ GCC_WARN_ABOUT_RETURN_TYPE
+ YES_ERROR
+ GCC_WARN_UNDECLARED_SELECTOR
+ YES
+ GCC_WARN_UNINITIALIZED_AUTOS
+ YES
+ GCC_WARN_UNUSED_FUNCTION
+ YES
+ GCC_WARN_UNUSED_VARIABLE
+ YES
+ IPHONEOS_DEPLOYMENT_TARGET
+ 7.0
+ ONLY_ACTIVE_ARCH
+ YES
+ SDKROOT
+ iphoneos
+
+ isa
+ XCBuildConfiguration
+ name
+ Debug
+
+ 888470781874EB9400867228
+
+ buildSettings
+
+ ALWAYS_SEARCH_USER_PATHS
+ NO
+ CLANG_CXX_LANGUAGE_STANDARD
+ gnu++0x
+ CLANG_CXX_LIBRARY
+ libc++
+ CLANG_ENABLE_MODULES
+ YES
+ CLANG_ENABLE_OBJC_ARC
+ YES
+ CLANG_WARN_BOOL_CONVERSION
+ YES
+ CLANG_WARN_CONSTANT_CONVERSION
+ YES
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE
+ YES_ERROR
+ CLANG_WARN_EMPTY_BODY
+ YES
+ CLANG_WARN_ENUM_CONVERSION
+ YES
+ CLANG_WARN_INT_CONVERSION
+ YES
+ CLANG_WARN_OBJC_ROOT_CLASS
+ YES_ERROR
+ CLANG_WARN__DUPLICATE_METHOD_MATCH
+ YES
+ CODE_SIGN_IDENTITY
+ iPhone Developer
+ CODE_SIGN_IDENTITY[sdk=iphoneos*]
+ iPhone Developer
+ COPY_PHASE_STRIP
+ YES
+ ENABLE_NS_ASSERTIONS
+ NO
+ GCC_C_LANGUAGE_STANDARD
+ gnu99
+ GCC_WARN_64_TO_32_BIT_CONVERSION
+ YES
+ GCC_WARN_ABOUT_RETURN_TYPE
+ YES_ERROR
+ GCC_WARN_UNDECLARED_SELECTOR
+ YES
+ GCC_WARN_UNINITIALIZED_AUTOS
+ YES
+ GCC_WARN_UNUSED_FUNCTION
+ YES
+ GCC_WARN_UNUSED_VARIABLE
+ YES
+ IPHONEOS_DEPLOYMENT_TARGET
+ 7.0
+ SDKROOT
+ iphoneos
+ VALIDATE_PRODUCT
+ YES
+
+ isa
+ XCBuildConfiguration
+ name
+ Release
+
+ 888470791874EB9400867228
+
+ buildConfigurations
+
+ 8884707A1874EB9400867228
+ 8884707B1874EB9400867228
+
+ defaultConfigurationIsVisible
+ 0
+ defaultConfigurationName
+ Release
+ isa
+ XCConfigurationList
+
+ 8884707A1874EB9400867228
+
+ baseConfigurationReference
+ 1398343624697B72DF2EA093
+ buildSettings
+
+ ASSETCATALOG_COMPILER_APPICON_NAME
+ AppIcon
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
+ LaunchImage
+ CODE_SIGN_IDENTITY
+ iPhone Developer
+ GCC_PRECOMPILE_PREFIX_HEADER
+ YES
+ GCC_PREFIX_HEADER
+ GpsTracker/GpsTracker-Prefix.pch
+ INFOPLIST_FILE
+ GpsTracker/GpsTracker-Info.plist
+ IPHONEOS_DEPLOYMENT_TARGET
+ 7.0
+ PRODUCT_NAME
+ $(TARGET_NAME)
+ WRAPPER_EXTENSION
+ app
+
+ isa
+ XCBuildConfiguration
+ name
+ Debug
+
+ 8884707B1874EB9400867228
+
+ baseConfigurationReference
+ 78FC6E6274DC283E0A27D4A1
+ buildSettings
+
+ ASSETCATALOG_COMPILER_APPICON_NAME
+ AppIcon
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
+ LaunchImage
+ CODE_SIGN_IDENTITY
+ iPhone Developer
+ GCC_PRECOMPILE_PREFIX_HEADER
+ YES
+ GCC_PREFIX_HEADER
+ GpsTracker/GpsTracker-Prefix.pch
+ INFOPLIST_FILE
+ GpsTracker/GpsTracker-Info.plist
+ IPHONEOS_DEPLOYMENT_TARGET
+ 7.0
+ PRODUCT_NAME
+ $(TARGET_NAME)
+ WRAPPER_EXTENSION
+ app
+
+ isa
+ XCBuildConfiguration
+ name
+ Release
+
+ 8884707F1875826600867228
+
+ isa
+ PBXFileReference
+ lastKnownFileType
+ wrapper.framework
+ name
+ CoreLocation.framework
+ path
+ System/Library/Frameworks/CoreLocation.framework
+ sourceTree
+ SDKROOT
+
+ 888470801875826600867228
+
+ fileRef
+ 8884707F1875826600867228
+ isa
+ PBXBuildFile
+
+ C2EA24936B40417481CBD07D
+
+ fileRef
+ 6C8880B2EE17432CA6FDD050
+ isa
+ PBXBuildFile
+
+
+ rootObject
+ 8884703F1874EB9400867228
+
+
diff --git a/phoneClients/ios/GpsTracker.xcworkspace/contents.xcworkspacedata b/phoneClients/ios/GpsTracker.xcworkspace/contents.xcworkspacedata
index ff8c14a..87829f6 100644
--- a/phoneClients/ios/GpsTracker.xcworkspace/contents.xcworkspacedata
+++ b/phoneClients/ios/GpsTracker.xcworkspace/contents.xcworkspacedata
@@ -1 +1,10 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/Contents.json b/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/Contents.json
index 39169e3..bd76460 100644
--- a/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -26,9 +26,8 @@
"scale" : "3x"
},
{
- "size" : "57x57",
"idiom" : "iphone",
- "filename" : "icon@.png",
+ "size" : "57x57",
"scale" : "1x"
},
{
diff --git a/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/icon@.png b/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/icon@.png
deleted file mode 100644
index 599a4a6..0000000
--- a/phoneClients/ios/GpsTracker/Images.xcassets/AppIcon.appiconset/icon@.png
+++ /dev/null
Binary files differ
diff --git a/phoneClients/ios/Podfile b/phoneClients/ios/Podfile
index f560a47..30b438b 100644
--- a/phoneClients/ios/Podfile
+++ b/phoneClients/ios/Podfile
@@ -1,2 +1,3 @@
+source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '7.0'
-pod "AFNetworking/NSURLConnection", "~> 2.4"
+pod 'AFNetworking', '~> 2.5'
\ No newline at end of file
diff --git a/phoneClients/ios/Podfile.lock b/phoneClients/ios/Podfile.lock
index d1685e7..7618fb7 100644
--- a/phoneClients/ios/Podfile.lock
+++ b/phoneClients/ios/Podfile.lock
@@ -1,16 +1,30 @@
PODS:
- - AFNetworking/NSURLConnection (2.4.1):
+ - AFNetworking (2.5.1):
+ - AFNetworking/NSURLConnection (= 2.5.1)
+ - AFNetworking/NSURLSession (= 2.5.1)
+ - AFNetworking/Reachability (= 2.5.1)
+ - AFNetworking/Security (= 2.5.1)
+ - AFNetworking/Serialization (= 2.5.1)
+ - AFNetworking/UIKit (= 2.5.1)
+ - AFNetworking/NSURLConnection (2.5.1):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- - AFNetworking/Reachability (2.4.1)
- - AFNetworking/Security (2.4.1)
- - AFNetworking/Serialization (2.4.1)
+ - AFNetworking/NSURLSession (2.5.1):
+ - AFNetworking/Reachability
+ - AFNetworking/Security
+ - AFNetworking/Serialization
+ - AFNetworking/Reachability (2.5.1)
+ - AFNetworking/Security (2.5.1)
+ - AFNetworking/Serialization (2.5.1)
+ - AFNetworking/UIKit (2.5.1):
+ - AFNetworking/NSURLConnection
+ - AFNetworking/NSURLSession
DEPENDENCIES:
- - AFNetworking/NSURLConnection (~> 2.4)
+ - AFNetworking (~> 2.5)
SPEC CHECKSUMS:
- AFNetworking: 0aabc6fae66d6e5d039eeb21c315843c7aae51ab
+ AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a
-COCOAPODS: 0.33.1
+COCOAPODS: 0.35.0