Merge branch 'develop'

exponea · Feb 28, 2024 · 168d6f1 · 168d6f1
2 parents 9f8a7d5 + 5bea9c7
commit 168d6f1
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 47 deletions.
diff --git a/android/ExponeaSDK.Android.csproj b/android/ExponeaSDK.Android.csproj
@@ -20,13 +20,13 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackOnBuild>true</PackOnBuild>
     <PackageId>ExponeaSDK.Android</PackageId>
-    <PackageVersion>3.6.2.3</PackageVersion>
+    <PackageVersion>3.6.2.4</PackageVersion>
     <Authors>Exponea</Authors>
     <Copyright>Exponea</Copyright>
     <Owners>Exponea</Owners>
     <Title>ExponeaSDK.Android</Title>
     <Description>Binding library for Exponea Android SDK</Description>
-    <ReleaseVersion>3.6.2.3</ReleaseVersion>
+    <ReleaseVersion>3.6.2.4</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <Summary>Binding library for Exponea Android SDK</Summary>
     <PackageLicenseUrl>https://spdx.org/licenses/MIT</PackageLicenseUrl>

diff --git a/android/ExponeaSDK.Android.sln b/android/ExponeaSDK.Android.sln
@@ -23,7 +23,7 @@ Global
 		SolutionGuid = {6ECD14D6-DFA1-4871-9CF4-2FB0A892952E}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 3.6.2.3
+		version = 3.6.2.4
 		Policies = $0
 		$0.VersionControlPolicy = $1
 		$0.DotNetNamingPolicy = $2

diff --git a/android/Properties/AssemblyInfo.cs b/android/Properties/AssemblyInfo.cs
@@ -21,8 +21,8 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("1.2.3.0")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyVersion("1.2.5.0")]
+[assembly: AssemblyFileVersion("1.2.5.0")]
 [assembly: MetaData("ExponeaXamarinSDK", Value = "true")]
-[assembly: MetaData("ExponeaXamarinVersion", Value = "1.2.3")]
+[assembly: MetaData("ExponeaXamarinVersion", Value = "1.2.5")]
 
diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
@@ -1,12 +1,17 @@
 ## :arrow_double_up: [SDK version update guide](./VERSION_UPDATE.md)
 
 ## Release Notes
+Release Notes for 1.2.5
+#### February 28, 2024
+* Fixes
+  * Fixed: App Inbox Data API wrong casting causing crashes for empty Inbox
+  * Fixed: App Inbox markAsRead not working on Android
+
 Release Notes for 1.2.4
 #### January 17, 2024
 * Fixes
   * Fixed: iOS SDK part contains embed frameworks that are denied by AppStore upload process
 
-## Release Notes
 Release Notes for 1.2.3
 #### November 3, 2023
 * Fixes

diff --git a/example/ExamplePushContentExtension/ExamplePushContentExtension.csproj b/example/ExamplePushContentExtension/ExamplePushContentExtension.csproj
@@ -10,7 +10,7 @@
     <RootNamespace>ExamplePushContentExtension</RootNamespace>
     <AssemblyName>ExamplePushContentExtension</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,8 +88,8 @@
     <CodesignProvision>Automatic</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NativeLibrary">
-      <HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.3\lib\xamarinios10\NativeLibrary.dll</HintPath>
+    <Reference Include="NativeLibrary, Version=1.0.8823.30624, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.4\lib\xamarinios10\NativeLibrary.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

diff --git a/example/ExamplePushContentExtension/Info.plist b/example/ExamplePushContentExtension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
@@ -37,6 +37,6 @@
 	<key>MinimumOSVersion</key>
 	<string>15.4</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 </dict>
 </plist>
diff --git a/example/ExamplePushContentExtension/packages.config b/example/ExamplePushContentExtension/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExponeaSDK.iOS.Notifications" version="2.16.3.3" targetFramework="xamarinios10" />
+  <package id="ExponeaSDK.iOS.Notifications" version="2.16.3.4" targetFramework="xamarinios10" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="xamarinios10" />
   <package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
   <package id="System.Memory" version="4.5.5" targetFramework="xamarinios10" />

diff --git a/example/ExamplePushServiceExtension/ExamplePushServiceExtension.csproj b/example/ExamplePushServiceExtension/ExamplePushServiceExtension.csproj
@@ -10,7 +10,7 @@
     <RootNamespace>ExamplePushServiceExtension</RootNamespace>
     <AssemblyName>ExamplePushServiceExtension</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,8 +88,8 @@
     <CodesignProvision>Automatic</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NativeLibrary">
-      <HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.3\lib\xamarinios10\NativeLibrary.dll</HintPath>
+    <Reference Include="NativeLibrary, Version=1.0.8823.30624, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.4\lib\xamarinios10\NativeLibrary.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

diff --git a/example/ExamplePushServiceExtension/Info.plist b/example/ExamplePushServiceExtension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
@@ -26,6 +26,6 @@
 	<key>MinimumOSVersion</key>
 	<string>15.4</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 </dict>
 </plist>
diff --git a/example/ExamplePushServiceExtension/packages.config b/example/ExamplePushServiceExtension/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExponeaSDK.iOS.Notifications" version="2.16.3.3" targetFramework="xamarinios10" />
+  <package id="ExponeaSDK.iOS.Notifications" version="2.16.3.4" targetFramework="xamarinios10" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="xamarinios10" />
   <package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
   <package id="System.Memory" version="4.5.5" targetFramework="xamarinios10" />

diff --git a/example/XamarinExample.Android/Properties/AndroidManifest.xml b/example/XamarinExample.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.2.4" package="com.exponea.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.2.5" package="com.exponea.example">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:label="XamarinExample.Android" android:theme="@style/MainTheme" android:icon="@drawable/icon"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/example/XamarinExample.Android/XamarinExample.Android.csproj b/example/XamarinExample.Android/XamarinExample.Android.csproj
@@ -22,7 +22,7 @@
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,7 +71,7 @@
       <Version>123.1.1.1</Version>
     </PackageReference>
     <PackageReference Include="ExponeaSDK">
-      <Version>1.2.4</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/example/XamarinExample.Huawei/Properties/AndroidManifest.xml b/example/XamarinExample.Huawei/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.2.4" package="com.exponea.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.2.5" package="com.exponea.example">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:label="XamarinExample.Android" android:theme="@style/MainTheme" android:icon="@drawable/icon"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/example/XamarinExample.Huawei/XamarinExample.Huawei.csproj b/example/XamarinExample.Huawei/XamarinExample.Huawei.csproj
@@ -23,7 +23,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,7 +77,7 @@
       <Version>6.3.0.402</Version>
     </PackageReference>
     <PackageReference Include="ExponeaSDK">
-      <Version>1.2.4</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/example/XamarinExample.iOS/Info.plist b/example/XamarinExample.iOS/Info.plist
@@ -37,8 +37,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.exponea.ExponeaSDK-Example2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>8</string>
 </dict>
 </plist>
diff --git a/example/XamarinExample.iOS/XamarinExample.iOS.csproj b/example/XamarinExample.iOS/XamarinExample.iOS.csproj
@@ -15,7 +15,7 @@
     <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <ProvisioningType>automatic</ProvisioningType>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -147,7 +147,7 @@
       <Version>1.0.11</Version>
     </PackageReference>
     <PackageReference Include="ExponeaSDK">
-      <Version>1.2.4</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

diff --git a/example/XamarinExample.sln b/example/XamarinExample.sln
@@ -97,6 +97,6 @@ Global
 		SolutionGuid = {D83EFFAD-9B91-420E-AE4D-39F7238550CF}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 1.2.4
+		version = 1.2.5
 	EndGlobalSection
 EndGlobal
diff --git a/example/XamarinExample/LoginPage.xaml.cs b/example/XamarinExample/LoginPage.xaml.cs
@@ -14,10 +14,10 @@ public LoginPage()
         {
             InitializeComponent();
 
-            projectToken.Text = Preferences.Get("projectToken", "b556af1a-bf4e-11ed-ac28-de4945357d1a");
-            authorization.Text = Preferences.Get("authorization", "urncrotvrtuomaircpsettnbz2wgpey1uj0zozwlylqp1ftfvw46dnvvq7rnivd8");
+            projectToken.Text = Preferences.Get("projectToken", "");
+            authorization.Text = Preferences.Get("authorization", "");
             advancedPrivKey.Text = Preferences.Get("advancedPrivKey", "");
-            url.Text = Preferences.Get("baseURL", "https://demoapp-api.bloomreach.com");
+            url.Text = Preferences.Get("baseURL", "");
             flushMode.SelectedIndex = 0;
 
             if (_exponea.IsConfigured)

diff --git a/example/XamarinExample/XamarinExample.csproj b/example/XamarinExample/XamarinExample.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
     <BuildWithMSBuildOnMono>true</BuildWithMSBuildOnMono>
   </PropertyGroup>
 
@@ -16,7 +16,7 @@
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
     <PackageReference Include="System.Text.Json" Version="7.0.2" />
-    <PackageReference Include="ExponeaSDK" Version="1.2.4" />
+    <PackageReference Include="ExponeaSDK" Version="1.2.5" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="System.Numerics.Vectors" />

diff --git a/ios/ExponeaSDK.iOS.Notifications/ExponeaSDK.iOS.Notifications.csproj b/ios/ExponeaSDK.iOS.Notifications/ExponeaSDK.iOS.Notifications.csproj
@@ -13,14 +13,14 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackOnBuild>true</PackOnBuild>
     <PackageId>ExponeaSDK.iOS.Notifications</PackageId>
-    <PackageVersion>2.16.3.3</PackageVersion>
+    <PackageVersion>2.16.3.4</PackageVersion>
     <Authors>Exponea</Authors>
     <Description>Binding library for ExponeaSDKNotifications</Description>
     <Owners>Exponea</Owners>
     <Summary>Binding library for native iOS ExponeaSDKNotifications</Summary>
     <PackageLicenseUrl>https://spdx.org/licenses/MIT</PackageLicenseUrl>
     <PackageIconUrl>https://media-exp1.licdn.com/dms/image/C560BAQG46ev9qjCTbQ/company-logo_200_200/0/1631723320052?e=2159024400&amp;v=beta&amp;t=ZgeKC90wtfA47irF7Ds8Bs59WPIjMvi1VH1HWsJNqUQ</PackageIconUrl>
-    <ReleaseVersion>2.16.3.3</ReleaseVersion>
+    <ReleaseVersion>2.16.3.4</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/ios/ExponeaSDK.iOS.Notifications/ExponeaSDK.iOS.Notifications.sln b/ios/ExponeaSDK.iOS.Notifications/ExponeaSDK.iOS.Notifications.sln
@@ -23,7 +23,7 @@ Global
 		SolutionGuid = {A436DC9A-0AA5-438A-BAE7-4FC18C804E86}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 2.16.3.3
+		version = 2.16.3.4
 		Policies = $0
 		$0.VersionControlPolicy = $1
 	EndGlobalSection

diff --git a/ios/ExponeaSDK.iOS/ExponeaSDK.iOS.csproj b/ios/ExponeaSDK.iOS/ExponeaSDK.iOS.csproj
@@ -12,10 +12,10 @@
     <AssemblyName>ExponeaSDK.iOS</AssemblyName>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackageId>ExponeaSDK.iOS</PackageId>
-    <PackageVersion>2.16.3.3</PackageVersion>
+    <PackageVersion>2.16.3.4</PackageVersion>
     <Authors>Exponea</Authors>
     <Description>Binding library for native iOS ExponeaSDK</Description>
-    <ReleaseVersion>2.16.3.3</ReleaseVersion>
+    <ReleaseVersion>2.16.3.4</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <PackOnBuild>true</PackOnBuild>
     <Owners>Exponea</Owners>

diff --git a/ios/ExponeaSDK.iOS/ExponeaSDK.iOS.sln b/ios/ExponeaSDK.iOS/ExponeaSDK.iOS.sln
@@ -26,6 +26,6 @@ Global
 		Policies = $0
 		$0.VersionControlPolicy = $1
 		$0.StandardHeader = $2
-		version = 2.16.3.3
+		version = 2.16.3.4
 	EndGlobalSection
 EndGlobal
diff --git a/...roj/project.xcworkspace/xcuserdata/adammihalik.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/adammihalik.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/native SDK wrapper/ExponeaSDKProxy/ExponeaSDKProxy/Exponea.swift b/ios/native SDK wrapper/ExponeaSDKProxy/ExponeaSDKProxy/Exponea.swift
@@ -17,7 +17,7 @@ protocol IsExponeaXamarinSDK {
 public class ExponeaXamarinVersion: NSObject, ExponeaVersionProvider {
     required public override init() { }
     public func getVersion() -> String {
-        "1.2.3"
+        "1.2.5"
     }
 }
 

diff --git a/pcl/ExponeaSDK.csproj b/pcl/ExponeaSDK.csproj
@@ -4,7 +4,7 @@
     <Target_iOS>xamarinios10</Target_iOS>
     <Target_Android>monoandroid13.0</Target_Android>
     <TargetFrameworks>netstandard2.0;$(Target_iOS);$(Target_Android)</TargetFrameworks>
-    <PackageVersion>1.2.4</PackageVersion>
+    <PackageVersion>1.2.5</PackageVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AssemblyName>ExponeaSdk</AssemblyName>
     <RootNamespace>Exponea</RootNamespace>
@@ -16,7 +16,7 @@
     <PackageLicenseUrl>https://spdx.org/licenses/MIT</PackageLicenseUrl>
     <Owners>Exponea</Owners>
     <Description>Exponea SDK allows your application to interact with the Exponea Customer Data &amp; Experience Platform. Exponea empowers B2C marketers to raise conversion rates, improve acquisition ROI, and maximize customer lifetime value.</Description>
-    <ReleaseVersion>1.2.4</ReleaseVersion>
+    <ReleaseVersion>1.2.5</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <Title>ExponeaSDK</Title>
     <PackageIconUrl>https://media-exp1.licdn.com/dms/image/C560BAQG46ev9qjCTbQ/company-logo_200_200/0/1631723320052?e=2159024400&amp;v=beta&amp;t=ZgeKC90wtfA47irF7Ds8Bs59WPIjMvi1VH1HWsJNqUQ</PackageIconUrl>
@@ -49,11 +49,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'monoandroid13.0'">
-    <PackageReference Include="ExponeaSDK.Android" Version="3.6.2.3" />
+    <PackageReference Include="ExponeaSDK.Android" Version="3.6.2.4" />
     <PackageReference Include="Xamarin.Android.Google.Code.Gson" Version="2.8.8" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10'">
-    <PackageReference Include="ExponeaSDK.iOS" Version="2.16.3.3" />
+    <PackageReference Include="ExponeaSDK.iOS" Version="2.16.3.4" />
     <PackageReference Include="System.Text.Json" Version="6.0.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/pcl/ExponeaSDK.sln b/pcl/ExponeaSDK.sln
@@ -31,6 +31,6 @@ Global
 		{93E1B943-4034-444D-9CDD-DC9548601638}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 1.2.4
+		version = 1.2.5
 	EndGlobalSection
 EndGlobal