Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: Titanium 8.x, Mixpanel 5.6.5 #34

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added android/dist/TiMixpanel.jar
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.1.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.2.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.3.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.4.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.5.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.6.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.7.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.8.zip
Binary file not shown.
Binary file removed android/dist/se.hyperlab.mixpanel-android-0.9.zip
Binary file not shown.
Binary file not shown.
Binary file removed android/dist/timixpanel.jar
Binary file not shown.
Binary file removed android/lib/mixpanel-android-4.4.1.jar
Binary file not shown.
Binary file added android/lib/mixpanel-android-5.6.5.aar
Binary file not shown.
11 changes: 4 additions & 7 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 0.9
apiversion: 2
version: 2.1.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86
description: Mixpanel integration for Titanium Mobile
author: Jonatan Lundin
license: MIT
copyright: Copyright (C) 2014-2015 Hyperlab AB
architectures: armeabi;armeabi-v7a;x86

# these should not be edited
name: TiMixpanel
moduleid: se.hyperlab.mixpanel
guid: 7031f78e-4cf3-4b12-98f0-99325bd1987e
platform: android
minsdk: 3.2.2.GA

# Build Mixpanel SDK, to not conflict with Titanium's R.java
respackage: com.mixpanel.android
minsdk: 8.0.0
15 changes: 5 additions & 10 deletions android/src/se/hyperlab/mixpanel/TimixpanelModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,21 +174,11 @@ public void addPushDeviceToken(String token) {
Log.d(TAG, "This function is not needed on Android");
}

@Kroll.method
public void showSurveyIfAvailable() {
mixpanel.getPeople().showSurveyIfAvailable(TiApplication.getAppCurrentActivity());
}

@Kroll.method
public void showNotificationIfAvailable() {
mixpanel.getPeople().showNotificationIfAvailable(TiApplication.getAppCurrentActivity());
}

@Kroll.method
public void showSurveyById(@Kroll.argument int id) {
mixpanel.getPeople().showSurveyById(id, TiApplication.getAppCurrentActivity());
}

@Kroll.method
public void showNotificationById(@Kroll.argument int id) {
mixpanel.getPeople().showNotificationById(id, TiApplication.getAppCurrentActivity());
Expand All @@ -199,6 +189,11 @@ public void flush() {
mixpanel.flush();
}

@Kroll.method
public void reset() {
mixpanel.reset();
}

// Properties
@Kroll.getProperty
public String distinctId()
Expand Down