Revert "Fix a crash on Android"

.gitignore

@@ -55,3 +55,13 @@ Icon?
 ehthumbs.db
 Thumbs.db
 .idea/
+
+# Removed because it has some weird file names that Windows can't handle #
+##########################################################################
+iOS/tests/*
+
+# Android #
+###########
+**/*.approj/configuration.json
+**/*.approj/Headers
+**/*.approj/targets

PubNub/Core/PubNub+Core.m

@@ -16,6 +16,9 @@
 #import "PNNetwork.h"
 #import "PNHelpers.h"
 
+#ifdef PGDROID
+#import <UIKit/UIKit.h>
+#endif
 
 #pragma mark Static
 
@@ -70,6 +73,8 @@ @interface PubNub () <PNObjectEventListener>
  */
 @property (nonatomic, strong) PNNetwork *serviceNetwork;
 
+@property (nonatomic, strong) PNNetwork *historyNetwork;
+
 /**
  @brief  Stores reference on reachability helper.
  @discussion Helper used by client to know about when something happened with network and when it is
@@ -206,7 +211,7 @@ - (instancetype)initWithConfiguration:(PNConfiguration *)configuration
         _heartbeatManager = [PNHeartbeat heartbeatForClient:self];
         [self addListener:self];
         [self prepareReachability];
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || defined(PGDROID)
         NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
         [notificationCenter addObserver:self selector:@selector(handleContextTransition:)
                                    name:UIApplicationWillEnterForegroundNotification object:nil];
@@ -293,7 +298,6 @@ - (void)setRecentClientStatus:(PNStatusCategory)recentClientStatus {
 
     // Check whether previous client state reported unexpected disconnection from remote data
     // objects live feed or not.
-    PNStatusCategory previousState = self.recentClientStatus;
     PNStatusCategory currentState = recentClientStatus;
 
     // In case if client disconnected only from one of it's channels it should keep 'connected'
@@ -308,25 +312,23 @@ - (void)setRecentClientStatus:(PNStatusCategory)recentClientStatus {
     // Check whether client reported unexpected disconnection.
     if (currentState == PNUnexpectedDisconnectCategory) {
 
-        // Check whether client unexpectedly disconnected while tried to subscribe or not.
-        if (previousState != PNDisconnectedCategory) {
-
-            // Dispatching check block with small delay, which will allow to fire reachability
-            // change event.
-            __weak __typeof(self) weakSelf = self;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)),
-                           dispatch_get_main_queue(), ^{
-
-                // Silence static analyzer warnings.
-                // Code is aware about this case and at the end will simply call on 'nil' object
-                // method. In most cases if referenced object become 'nil' it mean what there is no
-                // more need in it and probably whole client instance has been deallocated.
-                #pragma clang diagnostic push
-                #pragma clang diagnostic ignored "-Wreceiver-is-weak"
-                [weakSelf.reachability startServicePing];
-                #pragma clang diagnostic pop
-            });
-        }
+        // Dispatching check block with small delay, which will allow to fire reachability
+        // change event.
+        __weak __typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)),
+                       dispatch_get_main_queue(), ^{
+
+            // Silence static analyzer warnings.
+            // Code is aware about this case and at the end will simply call on 'nil' object
+            // method. In most cases if referenced object become 'nil' it mean what there is no
+            // more need in it and probably whole client instance has been deallocated.
+            #pragma clang diagnostic push
+            #pragma clang diagnostic ignored "-Wreceiver-is-weak"
+            [weakSelf.reachability startServicePing];
+            #pragma clang diagnostic pop
+        });
+    } else {
+        [self.reachability stopServicePing];
     }
 }
 
@@ -348,7 +350,6 @@ - (void)prepareReachability {
             #pragma clang diagnostic push
             #pragma clang diagnostic ignored "-Wreceiver-is-weak"
             #pragma clang diagnostic ignored "-Warc-repeated-use-of-weak"
-            [weakSelf.reachability stopServicePing];
             [weakSelf.subscriberManager restoreSubscriptionCycleIfRequiredWithCompletion:nil];
             #pragma clang diagnostic pop
         }
@@ -362,10 +363,14 @@ - (void)prepareNetworkManagers {
 
     _subscriptionNetwork = [PNNetwork networkForClient:self
                                         requestTimeout:_configuration.subscribeMaximumIdleTime
-                                    maximumConnections:1 longPoll:YES];
+                                    maximumConnections:2 longPoll:YES];
     _serviceNetwork = [PNNetwork networkForClient:self
                                    requestTimeout:_configuration.nonSubscribeRequestTimeout
                                maximumConnections:3 longPoll:NO];
+    _historyNetwork = [PNNetwork networkForClient:self
+                                   requestTimeout:_configuration.historyRequestTimeout
+                               maximumConnections:1
+                                         longPoll:NO];
 }
 
 
@@ -387,6 +392,12 @@ - (void)processOperation:(PNOperationType)operationType
         [self.subscriptionNetwork processOperation:operationType withParameters:parameters
                                               data:data completionBlock:block];
     }
+    else if (operationType == PNHistoryOperation) {
+        [self.historyNetwork processOperation:operationType
+                               withParameters:parameters
+                                         data:data
+                              completionBlock:block];
+    }
     else {
 
         [self.serviceNetwork processOperation:operationType withParameters:parameters
@@ -464,7 +475,7 @@ - (void)callBlock:(id)block status:(BOOL)callingStatusBlock withResult:(PNResult
 - (void)client:(PubNub *)__unused client didReceiveStatus:(PNSubscribeStatus *)status {
 
     if (status.category == PNConnectedCategory || status.category == PNDisconnectedCategory ||
-        status.category == PNUnexpectedDisconnectCategory) {
+        status.category == PNUnexpectedDisconnectCategory || status.category == PNReconnectedCategory) {
 
         self.recentClientStatus = status.category;
     }
@@ -475,7 +486,7 @@ - (void)client:(PubNub *)__unused client didReceiveStatus:(PNSubscribeStatus *)s
 
 - (void)handleContextTransition:(NSNotification *)notification {
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || defined(PGDROID)
     if ([notification.name isEqualToString:UIApplicationDidEnterBackgroundNotification]) {
 
         DDLogClientInfo([[self class] ddLogLevel], @"<PubNub> Did enter background execution context.");
@@ -503,7 +514,7 @@ - (void)handleContextTransition:(NSNotification *)notification {
 
 - (void)dealloc {
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || defined(PGDROID)
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
     [notificationCenter removeObserver:self name:UIApplicationWillEnterForegroundNotification
                                 object:nil];

PubNub/Core/PubNub+Publish.m

@@ -179,8 +179,7 @@ - (void)    publish:(id)message toChannel:(NSString *)channel
         DDLogAPICall([[self class] ddLogLevel], @"<PubNub> Publish%@ message to '%@' channel%@%@",
                      (compressed ? @" compressed" : @""), (channel?: @"<error>"),
                      (!shouldStore ? @" which won't be saved in hisotry" : @""),
-                     (!compressed ? [NSString stringWithFormat:@": %@",
-                                     (messageForPublish?: @"<error>")] : @"."));
+                     ([NSString stringWithFormat:@": %@", (messageForPublish?: @"<error>")]));
 
         [self processOperation:PNPublishOperation withParameters:parameters data:publishData
                completionBlock:^(PNStatus *status) {

PubNub/Data/Managers/PNSubscriber.m

@@ -15,6 +15,10 @@
 #import <objc/runtime.h>
 #import "PNHelpers.h"
 
+#ifdef PGDROID
+#import <UIKit/UIKit.h>
+#endif
+
 
 #pragma mark Static
 
@@ -566,7 +570,7 @@ - (void)updateStateTo:(PNSubscriberState)state withStatus:(PNSubscribeStatus *)s
                                       currentState == PNConnectedSubscriberState);
             category = ((targetState == PNDisconnectedSubscriberState) ? PNDisconnectedCategory :
                         PNUnexpectedDisconnectCategory);
-            self.mayRequireSubscriptionRestore = shouldHandleTransition;
+            self.mayRequireSubscriptionRestore = YES;
         }
         // Check whether transit to 'access denied' state.
         else if (targetState == PNAccessRightsErrorSubscriberState) {
@@ -628,6 +632,10 @@ - (instancetype)initForClient:(PubNub *)client {
         _presenceChannelsSet = [NSMutableSet new];
         _resourceAccessQueue = dispatch_queue_create("com.pubnub.subscriber",
                                                      DISPATCH_QUEUE_CONCURRENT);
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(didEnterBackground)
+                                                     name:UIApplicationDidEnterBackgroundNotification
+                                                   object:nil];
     }
 
     return self;
@@ -718,25 +726,31 @@ - (void)restoreSubscriptionCycleIfRequiredWithCompletion:(PNSubscriberCompletion
 
     __block BOOL shouldRestore;
     __block BOOL ableToRestore;
+    DDLogAPICall([[self class] ddLogLevel], @"Called restore subscription cycle with block: %@", block);
+
+    __weak __typeof(self) weakSelf = self;
     dispatch_sync(self.resourceAccessQueue, ^{
-
+        __strong __typeof(self) self = weakSelf;
+        DDLogAPICall([[self class] ddLogLevel], @"Checking if should and able to restore subscription cycle with block: %@", block);
         shouldRestore = (self.currentState == PNDisconnectedUnexpectedlySubscriberState &&
                          self.mayRequireSubscriptionRestore);
         ableToRestore = ([self.channelsSet count] || [self.channelGroupsSet count] ||
                          [self.presenceChannelsSet count]);
     });
     if (shouldRestore && ableToRestore) {
-
+        DDLogAPICall([[self class] ddLogLevel], @"Restoring subscription cycle with block: %@", block);
         [self subscribe:YES withState:nil completion:block];
-    }
-    else if (block) {
-
-        block(nil);
+    } else {
+        DDLogAPICall([[self class] ddLogLevel], @"Not restoring subscription cycle with block (%d, %d): %@", shouldRestore, ableToRestore, block);
+        if (block) {
+            block(nil);
+        }
     }
 }
 
 - (void)continueSubscriptionCycleIfRequiredWithCompletion:(PNSubscriberCompletionBlock)block {
 
+    DDLogAPICall([[self class] ddLogLevel], @"Continuing subscription cycle with block: %@", block);
     [self subscribe:NO withState:nil completion:block];
 }
 
@@ -894,7 +908,6 @@ - (void)handleSuccessSubscriptionStatus:(PNSubscribeStatus *)status {
 }
 
 - (void)handleFailedSubscriptionStatus:(PNSubscribeStatus *)status {
-
     // Silence static analyzer warnings.
     // Code is aware about this case and at the end will simply call on 'nil' object method.
     // In most cases if referenced object become 'nil' it mean what there is no more need in
@@ -1051,6 +1064,7 @@ - (void)handleLiveFeedEvents:(PNSubscribeStatus *)status {
         // it and probably whole client instance has been deallocated.
         #pragma clang diagnostic push
         #pragma clang diagnostic ignored "-Wreceiver-is-weak"
+        PNSubscribeStatus *copiedStatus = [status copy];
         [self.client.listenersManager notifyWithBlock:^{
 
             // Iterate through array with notifications and report back using callback blocks to the
@@ -1078,7 +1092,7 @@ - (void)handleLiveFeedEvents:(PNSubscribeStatus *)status {
                     }
                 }
 
-                id eventResultObject = [status copyWithMutatedData:event];
+                id eventResultObject = [copiedStatus copyWithMutatedData:event];
                 if (isPresenceEvent) {
 
                     object_setClass(eventResultObject, [PNPresenceEventResult class]);
@@ -1212,7 +1226,11 @@ - (void)appendSubscriberInformation:(PNStatus *)status {
     status.subscribedChannelGroups = [_channelGroupsSet allObjects];
 }
 
-#pragma mark -
+#pragma mark - Internal
+- (void)didEnterBackground {
+    [self.client.heartbeatManager stopHeartbeatIfPossible];
+    [self stopRetryTimer];
+}
 
 
 @end

PubNub/Data/PNAES.m

@@ -356,8 +356,12 @@ + (NSError *)errorFor:(CCCryptorStatus)status {
             errorCode = kPNAESInsufficientMemoryError;
             break;
         case kCCDecodeError:
+#ifdef PGDROID
+#   warning HC SVNT DRACONES! : CommonCrypto is not fully implemented on PGDroid ...
+#else
         case kCCOverflow:
         case kCCRNGFailure:
+#endif
 
             description = @"Provided data can't be processed (data can be not encryped).";
             errorCode = kPNAESDecryptionError;

PubNub/Data/PNConfiguration.h

@@ -111,6 +111,8 @@
  */
 @property (nonatomic, assign) NSTimeInterval nonSubscribeRequestTimeout;
 
+@property (nonatomic, assign) NSTimeInterval historyRequestTimeout;
+
 /**
  @brief      Reference on number of seconds which is used by server to track whether client still
              subscribed on remote data objects live feed or not.

PubNub/Data/PNConfiguration.m

@@ -3,7 +3,7 @@
  @since 4.0
  @copyright © 2009-2015 PubNub, Inc.
  */
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || defined(PGDROID)
 #import <UIKit/UIKit.h>
 #elif __MAC_OS_X_VERSION_MIN_REQUIRED
 #import <IOKit/IOKitLib.h>
@@ -112,6 +112,7 @@ - (instancetype)initWithPublishKey:(NSString *)publishKey subscribeKey:(NSString
         _uuid = [[[NSUUID UUID] UUIDString] copy];
         _subscribeMaximumIdleTime = kPNDefaultSubscribeMaximumIdleTime;
         _nonSubscribeRequestTimeout = kPNDefaultNonSubscribeRequestTimeout;
+        _historyRequestTimeout = kPNDefaultNonSubscribeRequestTimeout;
         _TLSEnabled = kPNDefaultIsTLSEnabled;
         _keepTimeTokenOnListChange = kPNDefaultShouldKeepTimeTokenOnListChange;
         _restoreSubscription = kPNDefaultShouldRestoreSubscription;
@@ -133,6 +134,7 @@ - (id)copyWithZone:(NSZone *)zone {
     configuration.cipherKey = self.cipherKey;
     configuration.subscribeMaximumIdleTime = self.subscribeMaximumIdleTime;
     configuration.nonSubscribeRequestTimeout = self.nonSubscribeRequestTimeout;
+    configuration.historyRequestTimeout = self.historyRequestTimeout;
     configuration.presenceHeartbeatValue = self.presenceHeartbeatValue;
     configuration.presenceHeartbeatInterval = self.presenceHeartbeatInterval;
     configuration.TLSEnabled = self.isTLSEnabled;
@@ -147,7 +149,7 @@ - (id)copyWithZone:(NSZone *)zone {
 #pragma mark - Misc
 
 - (NSString *)uniqueDeviceIdentifier {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || defined(PGDROID)
     return [[[UIDevice currentDevice] identifierForVendor] UUIDString];
 #elif __MAC_OS_X_VERSION_MIN_REQUIRED
     return ([self serialNumber]?: [self macAddress]);

PubNub/Data/Service Objects/PNErrorStatus.m

@@ -23,8 +23,14 @@ - (NSArray *)channelGroups {
 }
 
 - (NSString *)information {
-
-    return self.serviceData[@"information"];
+
+    if ([self.serviceData isKindOfClass:[NSDictionary class]]) {
+        return self.serviceData[@"information"];
+    } else if ([self.serviceData isKindOfClass:[NSString class]]) {
+        return (NSString *)self.serviceData;
+    } else {
+        return [self.serviceData description];
+    }
 }
 
 - (id)data {