Fault tolerance and Firebase instance id support. (#89)

* Fault tolerance and Firebase instance id support. * Comment fix * CR fixes
qonversion · Aug 26, 2022 · 6e3bcce · 6e3bcce
1 parent 34175b4
commit 6e3bcce
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 4 deletions.
diff --git a/Editor/QonversionDependencies.xml b/Editor/QonversionDependencies.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dependencies>
     <androidPackages>
-        <androidPackage spec="io.qonversion.android.sdk:sdk:3.2.4" />
+        <androidPackage spec="io.qonversion.android.sdk:sdk:3.3.0" />
         <androidPackage spec="com.fasterxml.jackson.core:jackson-databind:2.11.1" />
         <androidPackage spec="org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61" /> 
     </androidPackages>
     <iosPods>
-      <iosPod name="Qonversion" version="2.18.3" />
+      <iosPod name="Qonversion" version="2.20.0" />
     </iosPods>
 </dependencies>
diff --git a/Runtime/Android/Plugins/com/qonversion/unitywrapper/QonversionWrapper.java b/Runtime/Android/Plugins/com/qonversion/unitywrapper/QonversionWrapper.java
@@ -36,6 +36,7 @@
 import com.qonversion.android.sdk.QonversionPermissionsCallback;
 import com.qonversion.android.sdk.dto.QLaunchResult;
 import com.qonversion.android.sdk.dto.QPermission;
+import com.qonversion.android.sdk.dto.QPermissionsCacheLifetime;
 
 import android.preference.PreferenceManager;
 
@@ -289,6 +290,15 @@ public static synchronized void removeUpdatedPurchasesDelegate() {
         updatedPurchasesListener = null;
     }
 
+    public static synchronized void setPermissionsCacheLifetime(String lifetimeKey) {
+        try {
+            QPermissionsCacheLifetime lifetime = QPermissionsCacheLifetime.valueOf(lifetimeKey);
+            Qonversion.setPermissionsCacheLifetime(lifetime);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Failed to map QPermissionsCacheLifetime. " + e.getLocalizedMessage());
+        }
+    }
+
     public static synchronized void setNotificationsToken(String token) {
         Qonversion.setNotificationsToken(token);
     }

diff --git a/Runtime/Android/QonversionWrapperAndroid.cs b/Runtime/Android/QonversionWrapperAndroid.cs
@@ -193,5 +193,11 @@ public void AddPromoPurchasesDelegate()
         public void RemovePromoPurchasesDelegate()
         {
         }
+
+        public void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime)
+        {
+            string lifetimeName = Enum.GetName(typeof(PermissionsCacheLifetime), lifetime);
+            CallQonversion("setPermissionsCacheLifetime", lifetimeName);
+        }
     }
 }
diff --git a/Runtime/Scripts/IQonversionWrapper.cs b/Runtime/Scripts/IQonversionWrapper.cs
@@ -31,5 +31,6 @@ internal interface IQonversionWrapper
         bool HandleNotification(string notification);
         void AddAutomationsDelegate();
         void PresentCodeRedemptionSheet();
+        void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime);
     }
 }
diff --git a/Runtime/Scripts/Models/PermissionsCacheLifetime.cs b/Runtime/Scripts/Models/PermissionsCacheLifetime.cs
@@ -0,0 +1,14 @@
+namespace QonversionUnity
+{
+    public enum PermissionsCacheLifetime
+    {
+        WEEK,
+        TWO_WEEKS,
+        MONTH,
+        TWO_MONTHS,
+        THREE_MONTHS,
+        SIX_MONTHS,
+        YEAR,
+        UNLIMITED
+    }
+}
diff --git a/Runtime/Scripts/Models/PermissionsCacheLifetime.cs.meta b/Runtime/Scripts/Models/PermissionsCacheLifetime.cs.meta
diff --git a/Runtime/Scripts/Models/UserProperty.cs b/Runtime/Scripts/Models/UserProperty.cs
@@ -8,6 +8,7 @@ public enum UserProperty
         AdjustAdId,
         KochavaDeviceId,
         CustomUserId,
-        FacebookAttribution
+        FacebookAttribution,
+        FirebaseAppInstanceId
     }
 }
diff --git a/Runtime/Scripts/Qonversion.cs b/Runtime/Scripts/Qonversion.cs
@@ -527,6 +527,19 @@ public static void CheckTrialIntroEligibilityForProductIds(IList<string> product
             IQonversionWrapper instance = getFinalInstance();
             instance.CheckTrialIntroEligibilityForProductIds(productIdsJson, OnEligibilitiesMethodName);
         }
+
+        /// <summary>
+        /// Permissions cache is used when there are problems with the Qonversion API
+        /// or internet connection. If so, Qonversion will return the last successfully loaded
+        /// permissions. The current method allows you to configure how long that cache may be used.
+        /// The default value is <see cref="PermissionsCacheLifetime.MONTH>.
+        /// </summary>
+        /// <param name="lifetime">Desired permissions cache lifetime duration.</param>
+        public static void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime)
+        {
+            IQonversionWrapper instance = getFinalInstance();
+            instance.SetPermissionsCacheLifetime(lifetime);
+        }
 
         /// <summary>
         /// Set push token to Qonversion to enable Qonversion push notifications

diff --git a/Runtime/Scripts/QonversionWrapperNoop.cs b/Runtime/Scripts/QonversionWrapperNoop.cs
@@ -119,5 +119,10 @@ public void PresentCodeRedemptionSheet()
         {
 
         }
+
+        public void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime)
+        {
+
+        }
     }
   }
diff --git a/Runtime/iOS/Plugins/Common/UtilityBridge.h b/Runtime/iOS/Plugins/Common/UtilityBridge.h
@@ -37,5 +37,6 @@
 + (NSDictionary *)convertActionResult:(QONActionResult *)actionResult;
 + (NSDictionary *)convertError:(NSError *)error;
 + (NSDictionary *)convertAutomationsEvent:(QONAutomationsEvent *)event;
++ (NSNumber *)convertPermissionsCacheLifetime:(NSString *)lifetimeKey;
 
 @end
diff --git a/Runtime/iOS/Plugins/Common/UtilityBridge.m b/Runtime/iOS/Plugins/Common/UtilityBridge.m
@@ -56,6 +56,7 @@ + (NSNumber *)convertProperty:(NSString *)propertyStr {
         @"AdjustAdId": @(QNPropertyAdjustUserID),
         @"KochavaDeviceId": @(QNPropertyKochavaDeviceID),
         @"CustomUserId": @(QNPropertyUserID),
+        @"FirebaseAppInstanceId": @(QNPropertyFirebaseAppInstanceId),
     };
 
     NSNumber *propertyIndex = propertiesDict[propertyStr];
@@ -397,4 +398,20 @@ + (NSDictionary *)convertAutomationsEvent:(QONAutomationsEvent *)event {
      return [result copy];
  }
 
++ (NSNumber *)convertPermissionsCacheLifetime:(NSString *)lifetimeKey {
+    NSDictionary *lifetimesDict = @{
+        @"WEEK": @(QNPermissionsCacheLifetimeWeek),
+        @"TWO_WEEKS": @(QNPermissionsCacheLifetimeTwoWeeks),
+        @"MONTH": @(QNPermissionsCacheLifetimeMonth),
+        @"TWO_MONTHS": @(QNPermissionsCacheLifetimeTwoMonth),
+        @"THREE_MONTHS": @(QNPermissionsCacheLifetimeThreeMonth),
+        @"SIX_MONTHS": @(QNPermissionsCacheLifetimeSixMonth),
+        @"YEAR": @(QNPermissionsCacheLifetimeYear),
+        @"UNLIMITED": @(QNPermissionsCacheLifetimeUnlimited),
+    }; 
+
+    NSNumber *lifetimeIndex = lifetimesDict[lifetimeKey];
+    return lifetimeIndex;
+}
+
 @end
diff --git a/Runtime/iOS/Plugins/QonversionBridge.m b/Runtime/iOS/Plugins/QonversionBridge.m
@@ -232,6 +232,15 @@ void _removeUpdatedPurchasesDelegate() {
     purchasesDelegate = nil;
 }
 
+void _setPermissionsCacheLifetime(const char* lifetimeName) {
+    NSString *lifetimeNameStr = [UtilityBridge сonvertCStringToNSString:lifetimeName];
+    NSNumber *lifetimeIndex = [UtilityBridge convertPermissionsCacheLifetime:lifetimeNameStr];
+
+    if (lifetimeIndex) {
+        [Qonversion setPermissionsCacheLifetime:lifetimeIndex.integerValue];
+    }
+}
+
 void _setNotificationsToken(const char* token) {
     NSString *hexString = [UtilityBridge сonvertCStringToNSString:token];
     NSData *tokenData = [UtilityBridge convertHexToData:hexString];

diff --git a/Runtime/iOS/QonversionWrapperIOS.cs b/Runtime/iOS/QonversionWrapperIOS.cs
@@ -88,6 +88,9 @@ internal class QonversionWrapperIOS : IQonversionWrapper
 
         [DllImport("__Internal")]
         private static extern void _presentCodeRedemptionSheet();
+
+        [DllImport("__Internal")]
+        private static extern void _setPermissionsCacheLifetime(string lifetimeKey);
 #endif
 
         public void StoreSdkInfo(string version, string versionKey, string source, string sourceKey)
@@ -131,8 +134,8 @@ public void SetUserProperty(string key, string value)
 
         public void SetProperty(UserProperty key, string value)
         {
-            string propertyName = Enum.GetName(typeof(UserProperty), key);
 #if UNITY_IOS
+            string propertyName = Enum.GetName(typeof(UserProperty), key);
             _setProperty(propertyName, value);
 #endif
         }
@@ -284,6 +287,14 @@ public void AddAutomationsDelegate()
         {
 #if UNITY_IOS
             _subscribeAutomationsDelegate();
+#endif
+        }
+
+        public void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime)
+        {
+#if UNITY_IOS
+            string lifetimeName = Enum.GetName(typeof(PermissionsCacheLifetime), lifetime);
+            _setPermissionsCacheLifetime(lifetimeName);
 #endif
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,5 +119,10 @@ public void PresentCodeRedemptionSheet() @@
             {
             }
+            public void SetPermissionsCacheLifetime(PermissionsCacheLifetime lifetime)
+            {
+            }
         }
       }