diff --git a/clients/ios/Classes/NewsBlurAppDelegate.h b/clients/ios/Classes/NewsBlurAppDelegate.h
index 9a783950b..1684ab91e 100644
--- a/clients/ios/Classes/NewsBlurAppDelegate.h
+++ b/clients/ios/Classes/NewsBlurAppDelegate.h
@@ -228,7 +228,6 @@
@property (nonatomic, strong) void (^backgroundCompletionHandler)(UIBackgroundFetchResult);
+ (NewsBlurAppDelegate*) sharedAppDelegate;
-- (void)startupAnimationDone:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context;
- (void)registerDefaultsFromSettingsBundle;
- (void)finishBackground;
diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m
index 6036b7993..cc6d3d9ea 100644
--- a/clients/ios/Classes/NewsBlurAppDelegate.m
+++ b/clients/ios/Classes/NewsBlurAppDelegate.m
@@ -57,7 +57,6 @@
@implementation NewsBlurAppDelegate
#define CURRENT_DB_VERSION 31
-#define IS_IPHONE_5 ( fabs( ( double )[ [ UIScreen mainScreen ] bounds ].size.height - ( double )568 ) < DBL_EPSILON )
@synthesize window;
@@ -181,7 +180,6 @@
[window makeKeyAndVisible];
-// [self performSelectorOnMainThread:@selector(showSplashView) withObject:nil waitUntilDone:NO];
[[UINavigationBar appearance] setBarTintColor:UIColorFromRGB(0xE3E6E0)];
[[UIToolbar appearance] setBarTintColor: UIColorFromRGB(0xE3E6E0)];
@@ -193,6 +191,7 @@
(unsigned long)NULL), ^(void) {
[[TMCache sharedCache] removeAllObjects:^(TMCache *cache) {}];
[self.feedsViewController loadOfflineFeeds:NO];
+ [self setupReachability];
cacheImagesOperationQueue = [NSOperationQueue new];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
cacheImagesOperationQueue.maxConcurrentOperationCount = 2;
@@ -249,60 +248,6 @@
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister];
}
-- (void)showSplashView {
- UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
- splashView = [[UIImageView alloc] init];
-// int rotate = 0;
-// if (orientation == UIInterfaceOrientationPortraitUpsideDown) {
-// NSLog(@"UPSIDE DOWN");
-// rotate = -2;
-// } else if (orientation == UIInterfaceOrientationLandscapeLeft) {
-// rotate = -1;
-// } else if (orientation == UIInterfaceOrientationLandscapeRight) {
-// rotate = 1;
-// }
-// splashView.transform = CGAffineTransformMakeRotation(M_PI * rotate * 90.0 / 180);
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad &&
- UIInterfaceOrientationIsLandscape(orientation)) {
- splashView.frame = CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width);
- splashView.image = [UIImage imageNamed:@"Default-Landscape.png"];
- } else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- splashView.frame = self.view.frame;
- splashView.image = [UIImage imageNamed:@"Default-Portrait.png"];
- } else if (IS_IPHONE_5) {
- splashView.frame = CGRectMake(0, 0, self.window.frame.size.width, 568);
- splashView.image = [UIImage imageNamed:@"Default-568h.png"];
- } else {
- splashView.frame = self.window.frame;
- splashView.image = [UIImage imageNamed:@"Default.png"];
- }
-
- // [splashView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
- splashView.alpha = 1.0;
- [window.rootViewController.view addSubview:splashView];
- [UIView beginAnimations:nil context:nil];
- [UIView setAnimationDuration:.6];
- [UIView setAnimationTransition:UIViewAnimationTransitionNone forView:window cache:YES];
- [UIView setAnimationDelegate:self];
- [UIView setAnimationDidStopSelector:@selector(startupAnimationDone:finished:context:)];
-// splashView.alpha = 0;
- splashView.frame = CGRectMake(0, -1 * splashView.frame.size.height, splashView.frame.size.width, splashView.frame.size.height);
- // splashView.frame = CGRectMake(-60, -80, 440, 728);
- [UIView commitAnimations];
- [self setupReachability];
-}
-
-- (void)startupAnimationDone:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context {
- [splashView removeFromSuperview];
-}
-
-//- (void)applicationDidBecomeActive:(UIApplication *)application {
-// [[NSNotificationCenter defaultCenter] postNotificationName:AppDidBecomeActiveNotificationName object:nil];
-//}
-//
-//- (void)applicationWillTerminate:(UIApplication *)application {
-// [[NSNotificationCenter defaultCenter] postNotificationName:AppWillTerminateNotificationName object:nil];
-//}
- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
@@ -339,6 +284,11 @@
- (void)reachabilityChanged:(id)something {
NSLog(@"Reachability changed: %@", something);
+ Reachability* reach = [Reachability reachabilityWithHostname:NEWSBLUR_HOST];
+
+ if (reach.isReachable && feedsViewController.isOffline) {
+ [feedsViewController fetchFeedList:NO];
+ }
}
#pragma mark -
diff --git a/clients/ios/NewsBlur-iPhone-Info.plist b/clients/ios/NewsBlur-iPhone-Info.plist
index 714819d90..ea4dfb062 100644
--- a/clients/ios/NewsBlur-iPhone-Info.plist
+++ b/clients/ios/NewsBlur-iPhone-Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 3.6
+ 4.0b1
CFBundleSignature
????
CFBundleURLTypes
@@ -56,7 +56,7 @@
CFBundleVersion
- 3.6
+ 4.0b1
FacebookAppID
230426707030569
LSRequiresIPhoneOS
diff --git a/clients/ios/NewsBlur.ipa b/clients/ios/NewsBlur.ipa
index 903c9bcbf..a53f4f147 100644
Binary files a/clients/ios/NewsBlur.ipa and b/clients/ios/NewsBlur.ipa differ
diff --git a/clients/ios/NewsBlur.plist b/clients/ios/NewsBlur.plist
index f66e79fca..118cbdc33 100644
--- a/clients/ios/NewsBlur.plist
+++ b/clients/ios/NewsBlur.plist
@@ -35,7 +35,7 @@
bundle-identifier
com.newsblur.NewsBlur
bundle-version
- 3.0.4
+ 4.0
kind
software
title
diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
index e63cb7b4e..bcf1069e0 100755
--- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj
+++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
@@ -3393,19 +3393,17 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (3PN8E5365D)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (3PN8E5365D)";
+ CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc.";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
- PROVISIONING_PROFILE = "EB97D956-BB90-4F2F-9919-F71949B04B3F";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "EB97D956-BB90-4F2F-9919-F71949B04B3F";
+ PROVISIONING_PROFILE = "A0156932-124B-4F8E-8B93-EE6598D778F0";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos7.0;
STRIP_INSTALLED_PRODUCT = YES;
@@ -3417,20 +3415,18 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
- CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (3PN8E5365D)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (3PN8E5365D)";
+ CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc.";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
- PROVISIONING_PROFILE = "EB97D956-BB90-4F2F-9919-F71949B04B3F";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "EB97D956-BB90-4F2F-9919-F71949B04B3F";
+ PROVISIONING_PROFILE = "A0156932-124B-4F8E-8B93-EE6598D778F0";
SDKROOT = iphoneos7.0;
STRIP_INSTALLED_PRODUCT = YES;
VALID_ARCHS = "armv7s armv7 arm64";