Skip to content

Commit

Permalink
Update used Infinario Android SDK to v1.0.7
Browse files Browse the repository at this point in the history
Changes from the underlying Android SDK:
-Fix identification events tracked without registered ID
-Fix SQLiteDatabaseLockedException
  • Loading branch information
infinarioroland committed Jun 20, 2015
1 parent 1cc7f9f commit 6f52d29
Show file tree
Hide file tree
Showing 20 changed files with 172 additions and 120 deletions.
Binary file modified InfinarioAndroidSDK/Jars/InfinarioAndroidSDK.jar
Binary file not shown.
Binary file modified InfinarioAndroidSDK/bin/Debug/InfinarioAndroidSDK.dll
Binary file not shown.
Binary file modified InfinarioAndroidSDK/bin/Debug/InfinarioAndroidSDK.dll.mdb
Binary file not shown.
Binary file modified InfinarioAndroidSDK/bin/Release/InfinarioAndroidSDK.dll
Binary file not shown.
Binary file modified InfinarioAndroidSDK/bin/Release/InfinarioAndroidSDK.dll.mdb
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/obj/Debug/MonoAndroid,Version=v4.0.3.AssemblyAttribute.cs
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.Jars.InfinarioAndroidSDK.jar
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/bin/Debug/InfinarioAndroidSDK.dll.mdb
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/bin/Debug/InfinarioAndroidSDK.dll
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.dll
/Users/rolandrogansky/Projects/InfinarioAndroidSDK/InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.dll.mdb
/Users/rolandrogansky/GIT/XAMARIN_SDK/InfinarioAndroidSDK/obj/Debug/MonoAndroid,Version=v4.0.3.AssemblyAttribute.cs
/Users/rolandrogansky/GIT/XAMARIN_SDK/InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.Jars.InfinarioAndroidSDK.jar
/Users/rolandrogansky/GIT/XAMARIN_SDK/InfinarioAndroidSDK/bin/Debug/InfinarioAndroidSDK.dll.mdb
Expand Down
Binary file modified InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.dll
Binary file not shown.
Binary file modified InfinarioAndroidSDK/obj/Debug/InfinarioAndroidSDK.dll.mdb
Binary file not shown.
30 changes: 11 additions & 19 deletions InfinarioAndroidSDK/obj/Debug/api.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@
</field>
<field deprecated="not deprecated" final="true" name="PROPERTY_AUTO_FLUSH" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;auto_flush&quot;" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="PROPERTY_GOOGLE_ADV_ID" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;google_adv_id&quot;" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="PROPERTY_ICON" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;icon&quot;" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="PROPERTY_PUSH_NOTIFICATIONS" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;push_notifications&quot;" visibility="public" volatile="false">
Expand Down Expand Up @@ -178,7 +180,7 @@
</field>
<field deprecated="not deprecated" final="true" name="UPDATE_INTERVAL" static="true" transient="false" type="long" type-generic-aware="long" value="21600000L" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="VERSION" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;1.0.6&quot;" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="VERSION" static="true" transient="false" type="java.lang.String" type-generic-aware="java.lang.String" value="&quot;1.0.7&quot;" visibility="public" volatile="false">
</field>
</class>
<class abstract="false" deprecated="not deprecated" extends="com.infinario.android.infinariosdk.Command" extends-generic-aware="com.infinario.android.infinariosdk.Command" final="false" name="Customer" static="false" visibility="public">
Expand Down Expand Up @@ -492,18 +494,12 @@
<parameter name="p2" type="java.lang.Long">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="trackPurchases" native="false" return="void" static="false" synchronized="false" visibility="public">
<parameter name="p0" type="int">
</parameter>
<parameter name="p1" type="android.content.Intent">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="update" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="p0" type="java.util.Map&lt;java.lang.String, java.lang.Object&gt;">
</parameter>
</method>
</class>
<class abstract="false" deprecated="not deprecated" extends="android.os.AsyncTask" extends-generic-aware="android.os.AsyncTask&lt;java.lang.Void, java.lang.Void, java.lang.Void&gt;" final="false" name="Infinario.1" static="false" visibility="">
<class abstract="false" deprecated="not deprecated" extends="android.os.AsyncTask" extends-generic-aware="android.os.AsyncTask&lt;java.lang.Void, java.lang.Void, java.lang.Void&gt;" final="false" name="Infinario.1" static="true" visibility="">
<method abstract="false" deprecated="not deprecated" final="false" name="doInBackground" native="false" return="java.lang.Object" static="false" synchronized="false" visibility="protected">
<parameter name="p0" type="java.lang.Object[]">
</parameter>
Expand All @@ -513,17 +509,7 @@
</parameter>
</method>
</class>
<class abstract="false" deprecated="not deprecated" extends="android.os.AsyncTask" extends-generic-aware="android.os.AsyncTask&lt;java.lang.Void, java.lang.Void, java.lang.Void&gt;" final="false" name="Infinario.2" static="true" visibility="">
<method abstract="false" deprecated="not deprecated" final="false" name="doInBackground" native="false" return="java.lang.Object" static="false" synchronized="false" visibility="protected">
<parameter name="p0" type="java.lang.Object[]">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="doInBackground" native="false" return="java.lang.Void" static="false" synchronized="false" visibility="protected">
<parameter name="p0" type="java.lang.Void...">
</parameter>
</method>
</class>
<class abstract="false" deprecated="not deprecated" extends="com.infinario.android.infinariosdk.SessionListener" extends-generic-aware="com.infinario.android.infinariosdk.SessionListener" final="false" name="Infinario.3" static="false" visibility=""/>
<class abstract="false" deprecated="not deprecated" extends="com.infinario.android.infinariosdk.SessionListener" extends-generic-aware="com.infinario.android.infinariosdk.SessionListener" final="false" name="Infinario.2" static="false" visibility=""/>
<class abstract="false" deprecated="not deprecated" extends="java.lang.Object" extends-generic-aware="java.lang.Object" final="true" name="Manifest" static="false" visibility="public">
<constructor deprecated="not deprecated" final="false" name="Manifest" static="false" type="com.infinario.android.infinariosdk.Manifest" visibility="public">
</constructor>
Expand All @@ -549,6 +535,8 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="getCookieId" native="false" return="java.lang.String" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="getGoogleAdvertisingId" native="false" return="java.lang.String" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="getIcon" native="false" return="int" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="getPushNotifications" native="false" return="boolean" static="false" synchronized="false" visibility="public">
Expand Down Expand Up @@ -579,6 +567,10 @@
<parameter name="p0" type="java.lang.String">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="setGoogleAdvertisingId" native="false" return="void" static="false" synchronized="false" visibility="public">
<parameter name="p0" type="java.lang.String">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="setIcon" native="false" return="void" static="false" synchronized="false" visibility="public">
<parameter name="p0" type="int">
</parameter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ public partial class Contract : global::Java.Lang.Object {
[Register ("PROPERTY_AUTO_FLUSH")]
public const string PropertyAutoFlush = (string) "auto_flush";

// Metadata.xml XPath field reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Contract']/field[@name='PROPERTY_GOOGLE_ADV_ID']"
[Register ("PROPERTY_GOOGLE_ADV_ID")]
public const string PropertyGoogleAdvId = (string) "google_adv_id";

// Metadata.xml XPath field reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Contract']/field[@name='PROPERTY_ICON']"
[Register ("PROPERTY_ICON")]
public const string PropertyIcon = (string) "icon";
Expand Down Expand Up @@ -195,7 +199,7 @@ public partial class Contract : global::Java.Lang.Object {

// Metadata.xml XPath field reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Contract']/field[@name='VERSION']"
[Register ("VERSION")]
public const string Version = (string) "1.0.6";
public const string Version = (string) "1.0.7";
internal static IntPtr java_class_handle;
internal static IntPtr class_ref {
get {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -689,43 +689,6 @@ public virtual unsafe bool Track (string p0, global::System.Collections.Generic.
}
}

static Delegate cb_trackPurchases_ILandroid_content_Intent_;
#pragma warning disable 0169
static Delegate GetTrackPurchases_ILandroid_content_Intent_Handler ()
{
if (cb_trackPurchases_ILandroid_content_Intent_ == null)
cb_trackPurchases_ILandroid_content_Intent_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int, IntPtr>) n_TrackPurchases_ILandroid_content_Intent_);
return cb_trackPurchases_ILandroid_content_Intent_;
}

static void n_TrackPurchases_ILandroid_content_Intent_ (IntPtr jnienv, IntPtr native__this, int p0, IntPtr native_p1)
{
global::Com.Infinario.Android.Infinariosdk.Infinario __this = global::Java.Lang.Object.GetObject<global::Com.Infinario.Android.Infinariosdk.Infinario> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
global::Android.Content.Intent p1 = global::Java.Lang.Object.GetObject<global::Android.Content.Intent> (native_p1, JniHandleOwnership.DoNotTransfer);
__this.TrackPurchases (p0, p1);
}
#pragma warning restore 0169

static IntPtr id_trackPurchases_ILandroid_content_Intent_;
// Metadata.xml XPath method reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Infinario']/method[@name='trackPurchases' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='android.content.Intent']]"
[Register ("trackPurchases", "(ILandroid/content/Intent;)V", "GetTrackPurchases_ILandroid_content_Intent_Handler")]
public virtual unsafe void TrackPurchases (int p0, global::Android.Content.Intent p1)
{
if (id_trackPurchases_ILandroid_content_Intent_ == IntPtr.Zero)
id_trackPurchases_ILandroid_content_Intent_ = JNIEnv.GetMethodID (class_ref, "trackPurchases", "(ILandroid/content/Intent;)V");
try {
JValue* __args = stackalloc JValue [2];
__args [0] = new JValue (p0);
__args [1] = new JValue (p1);

if (GetType () == ThresholdType)
JNIEnv.CallVoidMethod (Handle, id_trackPurchases_ILandroid_content_Intent_, __args);
else
JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "trackPurchases", "(ILandroid/content/Intent;)V"), __args);
} finally {
}
}

static Delegate cb_update_Ljava_util_Map_;
#pragma warning disable 0169
static Delegate GetUpdate_Ljava_util_Map_Handler ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,76 @@ public virtual unsafe string CookieId {
}
}

static Delegate cb_getGoogleAdvertisingId;
#pragma warning disable 0169
static Delegate GetGetGoogleAdvertisingIdHandler ()
{
if (cb_getGoogleAdvertisingId == null)
cb_getGoogleAdvertisingId = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_GetGoogleAdvertisingId);
return cb_getGoogleAdvertisingId;
}

static IntPtr n_GetGoogleAdvertisingId (IntPtr jnienv, IntPtr native__this)
{
global::Com.Infinario.Android.Infinariosdk.Preferences __this = global::Java.Lang.Object.GetObject<global::Com.Infinario.Android.Infinariosdk.Preferences> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
return JNIEnv.NewString (__this.GoogleAdvertisingId);
}
#pragma warning restore 0169

static Delegate cb_setGoogleAdvertisingId_Ljava_lang_String_;
#pragma warning disable 0169
static Delegate GetSetGoogleAdvertisingId_Ljava_lang_String_Handler ()
{
if (cb_setGoogleAdvertisingId_Ljava_lang_String_ == null)
cb_setGoogleAdvertisingId_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetGoogleAdvertisingId_Ljava_lang_String_);
return cb_setGoogleAdvertisingId_Ljava_lang_String_;
}

static void n_SetGoogleAdvertisingId_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0)
{
global::Com.Infinario.Android.Infinariosdk.Preferences __this = global::Java.Lang.Object.GetObject<global::Com.Infinario.Android.Infinariosdk.Preferences> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
string p0 = JNIEnv.GetString (native_p0, JniHandleOwnership.DoNotTransfer);
__this.GoogleAdvertisingId = p0;
}
#pragma warning restore 0169

static IntPtr id_getGoogleAdvertisingId;
static IntPtr id_setGoogleAdvertisingId_Ljava_lang_String_;
public virtual unsafe string GoogleAdvertisingId {
// Metadata.xml XPath method reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Preferences']/method[@name='getGoogleAdvertisingId' and count(parameter)=0]"
[Register ("getGoogleAdvertisingId", "()Ljava/lang/String;", "GetGetGoogleAdvertisingIdHandler")]
get {
if (id_getGoogleAdvertisingId == IntPtr.Zero)
id_getGoogleAdvertisingId = JNIEnv.GetMethodID (class_ref, "getGoogleAdvertisingId", "()Ljava/lang/String;");
try {

if (GetType () == ThresholdType)
return JNIEnv.GetString (JNIEnv.CallObjectMethod (Handle, id_getGoogleAdvertisingId), JniHandleOwnership.TransferLocalRef);
else
return JNIEnv.GetString (JNIEnv.CallNonvirtualObjectMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "getGoogleAdvertisingId", "()Ljava/lang/String;")), JniHandleOwnership.TransferLocalRef);
} finally {
}
}
// Metadata.xml XPath method reference: path="/api/package[@name='com.infinario.android.infinariosdk']/class[@name='Preferences']/method[@name='setGoogleAdvertisingId' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
[Register ("setGoogleAdvertisingId", "(Ljava/lang/String;)V", "GetSetGoogleAdvertisingId_Ljava_lang_String_Handler")]
set {
if (id_setGoogleAdvertisingId_Ljava_lang_String_ == IntPtr.Zero)
id_setGoogleAdvertisingId_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "setGoogleAdvertisingId", "(Ljava/lang/String;)V");
IntPtr native_value = JNIEnv.NewString (value);
try {
JValue* __args = stackalloc JValue [1];
__args [0] = new JValue (native_value);

if (GetType () == ThresholdType)
JNIEnv.CallVoidMethod (Handle, id_setGoogleAdvertisingId_Ljava_lang_String_, __args);
else
JNIEnv.CallNonvirtualVoidMethod (Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setGoogleAdvertisingId", "(Ljava/lang/String;)V"), __args);
} finally {
JNIEnv.DeleteLocalRef (native_value);
}
}
}

static Delegate cb_getIcon;
#pragma warning disable 0169
static Delegate GetGetIconHandler ()
Expand Down
Binary file not shown.
Binary file modified InfinarioAndroidSDK/obj/Release/InfinarioAndroidSDK.dll
Binary file not shown.
Binary file modified InfinarioAndroidSDK/obj/Release/InfinarioAndroidSDK.dll.mdb
Binary file not shown.
Loading

0 comments on commit 6f52d29

Please sign in to comment.