v13.0.0

GleapSDK · Nov 29, 2023 · 262cc88 · 262cc88
1 parent 1c59d7d
commit 262cc88
Show file tree

Hide file tree

Showing 15 changed files with 173 additions and 272 deletions.
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/...oj/project.xcworkspace/xcuserdata/lukasboehler.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/lukasboehler.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...xample.xcodeproj/xcuserdata/lukasboehler.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...xample.xcodeproj/xcuserdata/lukasboehler.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
@@ -29,22 +29,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GleapDelegate {
 
         Gleap.showFeedbackButton(true)
 
-        /*Gleap.handlePushNotification([
-            "type": "news",
-            "id": "12"
-        ])*/
-        Gleap.clearIdentity()
-
-        /*let userProperty = GleapUserProperty()
+        let userProperty = GleapUserProperty()
         userProperty.name = "Franz"
         userProperty.email = "[email protected]"
         userProperty.phone = "+1 (902) 123123"
         userProperty.value = 199.95
+        userProperty.companyId = "Gleap #123"
+        userProperty.companyName = "Gleap GmbH"
+        userProperty.plan = "Pro plan"
         userProperty.customData = [
-            "plan": "Pro plan",
             "company": "ACME inc."
         ]
-        Gleap.identifyUser(with: "129833", andData: userProperty)*/
+        Gleap.identifyUser(with: "129833", andData: userProperty)
 
         // Testing file attachments.
         if let data = "Dies ist ein test.".data(using: String.Encoding.utf8) {
@@ -70,6 +66,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GleapDelegate {
 
     }
 
+    func notificationCountUpdated(_ count: Int32) {
+        NSLog("Count updated. %i", count);
+    }
+
     func widgetClosed() {
         NSLog("Closed widget.")
     }

diff --git a/Gleap.podspec b/Gleap.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "Gleap"
-  s.version      = "12.1.0"
+  s.version      = "13.0.0"
   s.summary      = "In-App Bug Reporting and Testing for Apps. Learn more at https://gleap.io"
   s.homepage     = "https://gleap.io"
   s.license      = { :type => 'Commercial', :file => 'LICENSE.md' }

diff --git a/Sources/ObjCSources/GleapBanner.m b/Sources/ObjCSources/GleapBanner.m
@@ -81,21 +81,24 @@ - (void)createWebView {
 }
 
 - (void)sendMessageWithData:(NSDictionary *)data {
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject: data
-                                                       options: 0
-                                                         error:&error];
-    if (!jsonData) {
-        NSLog(@"[GLEAP_SDK] Error sending message: %@", error);
-    } else {
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            @try {
-                [self.webView evaluateJavaScript: [NSString stringWithFormat: @"appMessage(%@)", jsonString] completionHandler: nil];
-            }
-            @catch(id exception) {}
-        });
+    @try {
+        NSError *error;
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject: data
+                                                           options: 0
+                                                             error:&error];
+        if (!jsonData) {
+            NSLog(@"[GLEAP_SDK] Error sending message: %@", error);
+        } else {
+            NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                @try {
+                    [self.webView evaluateJavaScript: [NSString stringWithFormat: @"appMessage(%@)", jsonString] completionHandler: nil];
+                }
+                @catch(id exception) {}
+            });
+        }
     }
+    @catch(id exception) {}
 }
 
 - (void)userContentController:(WKUserContentController*)userContentController didReceiveScriptMessage:(WKScriptMessage*)message

diff --git a/Sources/ObjCSources/GleapCore.h b/Sources/ObjCSources/GleapCore.h
@@ -27,6 +27,7 @@ typedef enum surveyFormat { SURVEY, SURVEY_FULL } GleapSurveyFormat;
 - (void) initialized;
 - (void) customActionCalled: (NSString *)customAction;
 - (void) configLoaded: (NSDictionary *)config;
+- (void) notificationCountUpdated: (int)count;
 - (void) widgetOpened;
 - (void) widgetClosed;
 - (void) registerPushMessageGroup: (NSString *)pushMessageGroup;

diff --git a/Sources/ObjCSources/GleapFeedbackButton.m b/Sources/ObjCSources/GleapFeedbackButton.m
@@ -389,6 +389,38 @@ - (void)updateConstraintsForOrientation {
     }
 }
 
+- (void)safelyActivateConstraints:(NSArray<NSLayoutConstraint *> *)constraints {
+    for (NSLayoutConstraint *constraint in constraints) {
+        if (constraint == nil) {
+            NSLog(@"Gleap: Attempted to activate a nil constraint.");
+            continue;
+        }
+
+        if (constraint.firstItem == nil || constraint.secondItem == nil) {
+            NSLog(@"Gleap: Constraint has nil items: %@", constraint);
+            continue;
+        }
+
+        UIView *firstView = [constraint.firstItem isKindOfClass:[UIView class]] ? (UIView *)constraint.firstItem : nil;
+        if (firstView && ![firstView isDescendantOfView: self]) {
+            NSLog(@"Gleap: First item of constraint is not in the view hierarchy: %@", constraint);
+            continue;
+        }
+
+        UIView *secondView = [constraint.secondItem isKindOfClass:[UIView class]] ? (UIView *)constraint.secondItem : nil;
+        if (secondView && ![secondView isDescendantOfView: self]) {
+            NSLog(@"Gleap: Second item of constraint is not in the view hierarchy: %@", constraint);
+            continue;
+        }
+
+        @try {
+            [NSLayoutConstraint activateConstraints:@[constraint]];
+        } @catch (NSException *exception) {
+            NSLog(@"Gleap: Exception activating constraint: %@, Exception: %@", constraint, exception);
+        }
+    }
+}
+
 - (void)setupModernButton {
     NSDictionary *config = GleapConfigHelper.sharedInstance.config;
     if (config == nil) {

diff --git a/Sources/ObjCSources/GleapFrameManagerViewController.m b/Sources/ObjCSources/GleapFrameManagerViewController.m
@@ -203,21 +203,24 @@ - (void)sendPreFillData {
 }
 
 - (void)sendMessageWithData:(NSDictionary *)data {
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject: data
-                                                       options: 0
-                                                         error:&error];
-    if (!jsonData) {
-        NSLog(@"[GLEAP_SDK] Error sending message: %@", error);
-    } else {
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            @try {
-                [self.webView evaluateJavaScript: [NSString stringWithFormat: @"sendMessage(%@)", jsonString] completionHandler: nil];
-            }
-            @catch(id exception) {}
-        });
+    @try {
+        NSError *error;
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject: data
+                                                           options: 0
+                                                             error:&error];
+        if (!jsonData) {
+            NSLog(@"[GLEAP_SDK] Error sending message: %@", error);
+        } else {
+            NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                @try {
+                    [self.webView evaluateJavaScript: [NSString stringWithFormat: @"sendMessage(%@)", jsonString] completionHandler: nil];
+                }
+                @catch(id exception) {}
+            });
+        }
     }
+    @catch(id exception) {}
 }
 
 - (void)stopLoading {

diff --git a/Sources/ObjCSources/GleapMetaDataHelper.h b/Sources/ObjCSources/GleapMetaDataHelper.h
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#define SDK_VERSION @"12.1.0"
+#define SDK_VERSION @"13.0.0"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Sources/ObjCSources/GleapSession.h b/Sources/ObjCSources/GleapSession.h
@@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, retain, nullable) NSString* email;
 @property (nonatomic, retain, nullable) NSString* phone;
 @property (nonatomic, retain, nullable) NSString* lang;
+@property (nonatomic, retain, nullable) NSString* plan;
+@property (nonatomic, retain, nullable) NSString* companyId;
+@property (nonatomic, retain, nullable) NSString* companyName;
 @property (nonatomic, retain, nullable) NSDictionary* customData;
 @property (nonatomic, retain, nullable) NSNumber* value;
 

diff --git a/Sources/ObjCSources/GleapSession.m b/Sources/ObjCSources/GleapSession.m
@@ -24,6 +24,9 @@ - (NSDictionary *)toDictionary {
         @"email": ObjectOrNull(self.email),
         @"value": ObjectOrNull(self.value),
         @"phone": ObjectOrNull(self.phone),
+        @"companyId": ObjectOrNull(self.companyId),
+        @"companyName": ObjectOrNull(self.companyName),
+        @"plan": ObjectOrNull(self.plan),
         @"customData": ObjectOrNull(self.customData)
     };
 }

diff --git a/Sources/ObjCSources/GleapSessionHelper.m b/Sources/ObjCSources/GleapSessionHelper.m
@@ -166,6 +166,15 @@ - (void)processOpenIdentityAction {
     if (data != nil && data.phone != nil) {
         [sessionRequestData setValue: data.phone forKey: @"phone"];
     }
+    if (data != nil && data.plan != nil) {
+        [sessionRequestData setValue: data.plan forKey: @"plan"];
+    }
+    if (data != nil && data.companyId != nil) {
+        [sessionRequestData setValue: data.companyId forKey: @"companyId"];
+    }
+    if (data != nil && data.companyName != nil) {
+        [sessionRequestData setValue: data.companyName forKey: @"companyName"];
+    }
     if (data != nil && data.value != nil) {
         [sessionRequestData setValue: data.value forKey: @"value"];
     }
@@ -290,6 +299,18 @@ - (BOOL)sessionUpgradeWithDataNeeded:(NSDictionary *)newData {
         return YES;
     }
 
+    if ([self sessionDataItemNeedsUpgrade: self.currentSession.plan compareTo: [newData objectForKey: @"plan"]]) {
+        return YES;
+    }
+
+    if ([self sessionDataItemNeedsUpgrade: self.currentSession.companyName compareTo: [newData objectForKey: @"companyName"]]) {
+        return YES;
+    }
+
+    if ([self sessionDataItemNeedsUpgrade: self.currentSession.companyId compareTo: [newData objectForKey: @"companyId"]]) {
+        return YES;
+    }
+
     if ([self sessionDataItemNeedsUpgrade: self.currentSession.userId compareTo: [newData objectForKey: @"userId"]]) {
         return YES;
     }
@@ -331,6 +352,9 @@ - (void)updateLocalSessionWith:(NSDictionary *)data andCompletion:(void (^)(bool
         gleapSession.name = [data objectForKey: @"name"];
         gleapSession.value = [data objectForKey: @"value"];
         gleapSession.lang = [data objectForKey: @"lang"];
+        gleapSession.companyId = [data objectForKey: @"companyId"];
+        gleapSession.companyName = [data objectForKey: @"companyName"];
+        gleapSession.plan = [data objectForKey: @"plan"];
     } @catch (id exp) {
 
     }
@@ -435,7 +459,7 @@ - (BOOL)sessionDataNumberItemNeedsUpgrade:(NSNumber *)data compareTo:(NSNumber *
         return YES;
     }
 
-    return !(data == newData);
+    return ![data isEqualToNumber: newData];
 }
 
 - (NSString *)getSessionName {

diff --git a/Sources/ObjCSources/GleapUIOverlayHelper.m b/Sources/ObjCSources/GleapUIOverlayHelper.m
@@ -40,8 +40,8 @@ + (void)clear {
 
         if (instance.uiOverlayViewController != nil) {
             [instance.uiOverlayViewController setNotifications: instance.notifications];
-            [instance.uiOverlayViewController updateNotificationCount: 0];
             [instance.uiOverlayViewController updateUI];
+            [GleapUIOverlayHelper updateNotificationCount: 0];
         }
     });
 }
@@ -75,6 +75,10 @@ + (void)updateNotificationCount:(int)notificationCount {
         if ([GleapUIOverlayHelper sharedInstance].uiOverlayViewController != nil) {
             [[GleapUIOverlayHelper sharedInstance].uiOverlayViewController updateNotificationCount: notificationCount];
         }
+
+        if (Gleap.sharedInstance.delegate && [Gleap.sharedInstance.delegate respondsToSelector: @selector(notificationCountUpdated:)]) {
+            [Gleap.sharedInstance.delegate notificationCountUpdated: notificationCount];
+        }
     });
 }
 

diff --git a/Sources/ObjCSources/GleapUserProperty.h b/Sources/ObjCSources/GleapUserProperty.h
@@ -16,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, retain) NSString* email;
 @property (nonatomic, retain) NSString* phone;
 @property (nonatomic, retain) NSNumber* value;
+@property (nonatomic, retain) NSString* plan;
+@property (nonatomic, retain) NSString* companyName;
+@property (nonatomic, retain) NSString* companyId;
 @property (nonatomic, retain) NSDictionary* customData;
 
 @end