Merge branch 'release/1.1_43'

PowZone · Dec 8, 2014 · 26fa350 · 26fa350
2 parents 01a4fab + 0bab125
commit 26fa350
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/BeMyEyes Tests/DataHelper.swift b/BeMyEyes Tests/DataHelper.swift
@@ -54,9 +54,9 @@ extension BMECommunityStats {
 
  class func idealStats() -> BMECommunityStats {
  var stats = BMECommunityStats()
- stats.sighted = 361
- stats.blind = 121
- stats.helped = 554
+ stats.sighted = 384
+ stats.blind = 125
+ stats.helped = 595
  return stats
  }
 }

diff --git a/BeMyEyes/BeMyEyes-Info.plist b/BeMyEyes/BeMyEyes-Info.plist
@@ -30,7 +30,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>42</string>
+ <string>43</string>
  <key>FacebookAppID</key>
  <string>771890076161460</string>
  <key>FacebookDisplayName</key>

diff --git a/BeMyEyes/Source/Application/BMEAppDelegate.m b/BeMyEyes/Source/Application/BMEAppDelegate.m
@@ -100,6 +100,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didLogIn:) name:BMEDidLogInNotification object:nil];
  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didLogOut:) name:BMEDidLogOutNotification object:nil];
+
+ self.window.tintColor = [UIColor lightBlueColor];
 
  return YES;
 }

diff --git a/BeMyEyes/Source/Library/BMEClient.m b/BeMyEyes/Source/Library/BMEClient.m
@@ -245,7 +245,7 @@ - (void)verifyTokenAuthOnServerWithCompletion:(void (^)(BOOL))completion {
  completion(YES);
  }
  } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
- BOOL validToken = operation.response.statusCode != 401;
+ BOOL validToken = operation.response.statusCode != 401; // Authorization error
  if (completion) {
  completion(validToken);
  }
@@ -484,6 +484,9 @@ - (void)reportAbuseForRequestWithId:(NSString *)identifier reason:(NSString *)re
 #pragma mark Notifications Token
 
 - (void)upsertDeviceWithNewToken:(NSString *)newToken production:(BOOL)isProduction completion:(void (^)(BOOL, NSError *))completion {
+ if (!self.isTokenValid) {
+ return;
+ }
  NSString *alias = [UIDevice currentDevice].name;
  NSString *appVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
  NSString *appBundleVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey];