Merge branch 'develop' into 'master'

update sharing url logic

See merge request frontend/ios-sdk!4

Author: Николай Капустин

GPBonusSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "GPBonusSDK"
-  spec.version      = ENV['LIB_VERSION'] || "2.0.1"
+  spec.version      = ENV['LIB_VERSION'] || "2.1.0"
   spec.summary      = "GazpromBonus widget integration lib"
   spec.homepage     = "https://github.com/SetPartnerstv/ios-sdk"
   spec.license      = { :type => "MIT", :file => "LICENSE" }

Podfile.lock

@@ -11,6 +11,6 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   SwiftProtobuf: ed465ed18402f998fd117f631da27e0168e6b59c
 
-PODFILE CHECKSUM: 83673be9a8bf482e1b93951c70e677a0e1acfb8e
+PODFILE CHECKSUM: b5f04a3e92c7b3b8274eae3bf26717ba045a7710
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.2

sdk/SDKViewController.swift

@@ -35,19 +35,19 @@ open class SDKViewController: UIViewController, WKScriptMessageHandler, PaymentH
         let preferences = WKPreferences()
         preferences.javaScriptEnabled = true
         preferences.javaScriptCanOpenWindowsAutomatically = true
-        
-        let bundle = Bundle(for: SDKViewController.self)
-        let version = bundle.infoDictionary!["CFBundleShortVersionString"] as! String
-        let build = bundle.infoDictionary!["CFBundleVersion"] as! String
-        
+
+        let version = "2.1.0"
+        let build = "22"
+
         let userScript = WKUserScript(
             source: """
                 (function(){
                     window.PNWidget = window.PNWidget || {};
                     window.PNWidget._listeners = new Set();
-                    window.PNWidget.version = "\(version) (\(build))";
+                    window.PNWidget.version = "\(version)";
+                    window.PNWidget.build = "\(build)";
                     window.PNWidget.platform = "iOS";
-                    window.PNWidget.features = { auth: false };
+                    window.PNWidget.features = { auth: false, share_text: true };
                         
                     window.PNWidget.sendMobileEvent = function sendMobileEvent(event) {
                         window.webkit.messageHandlers.PNWidget.postMessage(JSON.stringify(event));
@@ -307,10 +307,17 @@ open class SDKViewController: UIViewController, WKScriptMessageHandler, PaymentH
     }
 
     private func shareURL(url: String) {
-        if let link = URL(string: url.encodedURL) {
-            let activityViewController = UIActivityViewController(activityItems: [link], applicationActivities: nil)
-            activityViewController.excludedActivityTypes = [.airDrop, .mail]
-            
+        var items:[Any] = [Any]()
+        if let link = URL(string: url) {
+            items.append(link)
+        }
+        else {
+            items.append(url)
+        }
+        if items.count > 0 {
+            let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
+            activityViewController.excludedActivityTypes = [.airDrop]
+
             present(activityViewController, animated: true)
         }
     }

sdk/bld

@@ -0,0 +1 @@
+22

sdk/version

@@ -0,0 +1 @@
+2.1.0

sdk_demo/GazpromBonusSDK.xcodeproj/project.pbxproj

@@ -363,7 +363,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = 3V7NW97R8C;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -385,7 +385,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.pnhub.partnerapplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -401,7 +401,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = 3V7NW97R8C;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -423,7 +423,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.pnhub.partnerapplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

sdk_demo/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - GPBonusSDK (2.0.1):
+  - GPBonusSDK (2.0.2):
     - SwiftProtobuf (~> 1.14.0)
   - SwiftProtobuf (1.14.0)
 
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  GPBonusSDK: 056e491789c5c965a834cbd460c47205b7d5d7bd
+  GPBonusSDK: 8ebdc32789a29a3e98724e683b655547f13b9fe0
   SwiftProtobuf: ed465ed18402f998fd117f631da27e0168e6b59c
 
 PODFILE CHECKSUM: 3c73ac9aac1f862646b280aa7f07de7eace745dc
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.2