fast-forward master up to the merge

abitofalchemy · Aug 13, 2014 · 7c4a235 · 7c4a235
2 parents 37436a9 + d072617
commit 7c4a235
Show file tree

Hide file tree

Showing 57 changed files with 3,381 additions and 3,660 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+FriensoAlpha/FriensoAlpha.xcodeproj/project.xcworkspace/xcuserdata/sal.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FriensoAlpha/FriensoAlpha.xcodeproj/project.pbxproj b/FriensoAlpha/FriensoAlpha.xcodeproj/project.pbxproj
diff --git a/FriensoAlpha/FriensoAlpha.xcodeproj/project.xcworkspace/xcshareddata/FriensoAlpha.xccheckout b/FriensoAlpha/FriensoAlpha.xcodeproj/project.xcworkspace/xcshareddata/FriensoAlpha.xccheckout
@@ -5,7 +5,7 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>4C0C5EC2-4E20-4B70-B3F2-15C26726F64B</string>
+	<string>20371245-6455-41D7-9DD1-3109984448DC</string>
 	<key>IDESourceControlProjectName</key>
 	<string>FriensoAlpha</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>

diff --git a/...a.xcodeproj/project.xcworkspace/xcuserdata/sal.xcuserdatad/UserInterfaceState.xcuserstate b/...a.xcodeproj/project.xcworkspace/xcuserdata/sal.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...ha/FriensoAlpha.xcodeproj/xcuserdata/sal.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...ha/FriensoAlpha.xcodeproj/xcuserdata/sal.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -42,12 +42,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/ABALoginTVC.m"
-            timestampString = "425842323.592751"
+            timestampString = "428319274.088672"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "864"
-            endingLineNumber = "864"
-            landmarkName = "-reloadSection:withRowAnimation:"
+            startingLineNumber = "927"
+            endingLineNumber = "927"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
             <Locations>
                <Location
@@ -88,11 +88,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/NewCoreCircleTVC.m"
-            timestampString = "425415991.818356"
+            timestampString = "428948708.978759"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "111"
-            endingLineNumber = "111"
+            startingLineNumber = "136"
+            endingLineNumber = "136"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -120,11 +120,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/NewCoreCircleTVC.m"
-            timestampString = "419792679.345218"
+            timestampString = "426483359.693407"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "16"
-            endingLineNumber = "16">
+            startingLineNumber = "25"
+            endingLineNumber = "25">
             <Locations>
                <Location
                   shouldBeEnabled = "No"
@@ -194,11 +194,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FriensoOptionsTVC.m"
-            timestampString = "424378361.382961"
+            timestampString = "427621220.548954"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "246"
-            endingLineNumber = "246"
+            startingLineNumber = "245"
+            endingLineNumber = "245"
             landmarkName = "-imageWithString:font:size:"
             landmarkType = "5">
          </BreakpointContent>
@@ -226,11 +226,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "228"
-            endingLineNumber = "228"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
             landmarkName = "-fetchPhoneNbrForThoseIWatch:withCount:"
             landmarkType = "5">
          </BreakpointContent>
@@ -242,11 +242,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "244"
-            endingLineNumber = "244"
+            startingLineNumber = "269"
+            endingLineNumber = "269"
             landmarkName = "-fetchPhoneNbrForThoseIWatch:withCount:"
             landmarkType = "5">
             <Locations>
@@ -288,11 +288,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "228"
-            endingLineNumber = "228"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
             landmarkName = "-fetchPhoneNbrForThoseIWatch:withCount:"
             landmarkType = "5">
          </BreakpointContent>
@@ -304,11 +304,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "243"
-            endingLineNumber = "243"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
             landmarkName = "-fetchPhoneNbrForThoseIWatch:withCount:"
             landmarkType = "5">
             <Locations>
@@ -350,13 +350,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FriensoViewController.m"
-            timestampString = "426072194.229056"
+            timestampString = "429625707.251156"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1415"
-            endingLineNumber = "1415"
-            landmarkName = "@implementation FriensoViewController"
-            landmarkType = "3">
+            startingLineNumber = "1842"
+            endingLineNumber = "1842"
+            landmarkName = "-amiWatchingUserEvent:"
+            landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -366,11 +366,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "349"
-            endingLineNumber = "349"
+            startingLineNumber = "374"
+            endingLineNumber = "374"
             landmarkName = "-isFriendUnique:"
             landmarkType = "5">
          </BreakpointContent>
@@ -382,11 +382,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "106"
-            endingLineNumber = "106"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
             landmarkName = "-syncUWatchToCoreFriends"
             landmarkType = "5">
          </BreakpointContent>
@@ -398,11 +398,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FRSyncFriendConnections.m"
-            timestampString = "424757043.161704"
+            timestampString = "426542522.523892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "347"
-            endingLineNumber = "347"
+            startingLineNumber = "372"
+            endingLineNumber = "372"
             landmarkName = "-isFriendUnique:"
             landmarkType = "5">
          </BreakpointContent>
@@ -414,12 +414,92 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FriensoViewController.m"
-            timestampString = "426072599.726106"
+            timestampString = "429625707.251156"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2381"
+            endingLineNumber = "2381"
+            landmarkName = "-coreFriendOnMapInteraction:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FriensoAlpha/CDFriensoEvent.m"
+            timestampString = "426768206.352529"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "11"
+            endingLineNumber = "11"
+            landmarkName = "@implementation CDFriensoEvent"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FriensoAlpha/ABALoginTVC.m"
+            timestampString = "428903558.037779"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1678"
+            endingLineNumber = "1678"
+            landmarkName = "-syncExistingCoreFriendsFromParseForUser:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FriensoAlpha/ABALoginTVC.m"
+            timestampString = "428903558.037779"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1692"
+            endingLineNumber = "1692"
+            landmarkName = "-syncExistingCoreFriendsFromParseForUser:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FriensoAlpha/FriensoViewController.m"
+            timestampString = "428578511.086515"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "343"
+            endingLineNumber = "343"
+            landmarkName = "-helpMeNowSwitchAction:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FriensoAlpha/WelcomeViewCtrl.m"
+            timestampString = "427229129.126064"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1865"
-            endingLineNumber = "1865"
-            landmarkName = "-friendLocInteraction:"
+            startingLineNumber = "192"
+            endingLineNumber = "192"
+            landmarkName = "-updatePageImage:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -430,12 +510,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "FriensoAlpha/FriensoViewController.m"
-            timestampString = "426072194.229056"
+            timestampString = "429002276.670877"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "957"
-            endingLineNumber = "957"
-            landmarkName = "-setupNavigationBarImage"
+            startingLineNumber = "602"
+            endingLineNumber = "602"
+            landmarkName = "-pendingRqstAction:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/FriensoAlpha/FriensoAlpha/ABALoginTVC.h b/FriensoAlpha/FriensoAlpha/ABALoginTVC.h
@@ -34,6 +34,7 @@
 @property(nonatomic, assign) BOOL retVal;
 @property(nonatomic, retain) IBOutlet UISwitch *keepMeLoggedin;
 @property (nonatomic, retain) CLLocationManager *locationManager;
+@property (nonatomic, strong) NSMutableArray *coreCircleRequestStatus;
 
 
 - (void) reloadSection:(NSInteger)section withRowAnimation:(UITableViewRowAnimation)rowAnimation;