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 to Localytics 5.1.0, refactor & lint module, allow beacon monitoring #6

Open
wants to merge 8 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ android/assets/
android/documentation/
android/example/
android/LICENSE
/Localytics/iphone/metadata.json
/Localytics/iphone/dist
26 changes: 26 additions & 0 deletions Localytics/android/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
Language: Java
AccessModifierOffset: -4
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
# class, constructor, method should be next line
BreakBeforeBraces: Linux
# Keep '=' at end of line when wrapping, but move things like '&&', '||' to beginning of newline
BreakBeforeBinaryOperators: NonAssignment
# FIXME: break for brace after synchronized block, anonymous class declarations
BreakAfterJavaFieldAnnotations: true
ColumnLimit: 120
IndentCaseLabels: true
IndentWidth: 4
MaxEmptyLinesToKeep: 1
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpacesInParentheses: false
TabWidth: 4
UseTab: ForContinuationAndIndentation
SpaceAfterCStyleCast: true
# Spaces inside {} for array literals, i.e. "new Object[] { args }"
Cpp11BracedListStyle: false
ReflowComments: false
Binary file added Localytics/android/dist/Localytics.jar
Binary file not shown.
Binary file not shown.
Binary file removed Localytics/android/dist/localytics.jar
Binary file not shown.
17 changes: 17 additions & 0 deletions Localytics/android/java-sources.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/LocalyticsLog.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/LocalyticsModule.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/PushTrackingActivity.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/Utils.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/gcm/GCMBaseIntentService.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/gcm/GCMBroadcastReceiver.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/gcm/GCMConstants.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/gcm/GCMIntentService.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/src/com/localytics/gcm/GCMRegistrar.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/java/com/localytics/LocalyticsBootstrap.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/android/support/compat/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/android/support/design/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/android/support/v7/appcompat/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/android/support/v7/cardview/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/com/google/android/gms/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/com/localytics/R.java"
"/Users/hknoechel/Documents/appcelerator_modules/localytics-titanium/Localytics/android/build/generated/r/ti/modules/titanium/ui/R.java"
Binary file added Localytics/android/lib/localytics-51.1.jar
Binary file not shown.
Binary file removed Localytics/android/lib/localytics_main.jar
Binary file not shown.
Binary file not shown.
Binary file modified Localytics/android/libs/armeabi-v7a/libcom.localytics.so
Binary file not shown.
Binary file removed Localytics/android/libs/armeabi/libcom.localytics.so
Binary file not shown.
Binary file modified Localytics/android/libs/x86/libcom.localytics.so
Binary file not shown.
31 changes: 5 additions & 26 deletions Localytics/android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,17 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 3.7.0
apiversion: 2
architectures: armeabi armeabi-v7a x86
version: 4.0.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86
description: Localytics is a closed-loop app analytics and marketing platform that helps brands acquire, engage, and retain users.
author: Localytics
license:
Copyright (c) 2015, Char Software, Inc. d/b/a Localytics
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Neither the nametag of Char Software, Inc., Localytics nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY CHAR SOFTWARE, INC. D/B/A LOCALYTICS ''AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL CHAR SOFTWARE, INC. D/B/A LOCALYTICS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
license: Unspecified
copyright: Copyright (c) 2015 Char Software Inc.

# these should not be edited
name: Localytics
moduleid: com.localytics
guid: e774230a-3345-4c23-8f61-98569209cfd8
platform: android
minsdk: 3.5.0.GA
minsdk: 7.0.0
161 changes: 87 additions & 74 deletions Localytics/android/src/com/localytics/LocalyticsLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,89 +2,102 @@

import com.localytics.android.Localytics;

public final class LocalyticsLog {

public final class LocalyticsLog
{

private static final String TAG = "LocalyticsModule";

private LocalyticsLog() {}

public static int d(final String msg) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.d(TAG, msg);
} else {
return -1;
}
}
private LocalyticsLog()
{
}

public static int d(final String msg)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.d(TAG, msg);
} else {
return -1;
}
}

public static int d(final String msg, final Throwable tr) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.d(TAG, msg, tr);
} else {
return -1;
}
}
public static int d(final String msg, final Throwable tr)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.d(TAG, msg, tr);
} else {
return -1;
}
}

public static int e(final String msg) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.e(TAG, msg);
} else {
return -1;
}
}
public static int e(final String msg)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.e(TAG, msg);
} else {
return -1;
}
}

public static int e(final String msg, final Throwable tr) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.e(TAG, msg, tr);
} else {
return -1;
}
}
public static int e(final String msg, final Throwable tr)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.e(TAG, msg, tr);
} else {
return -1;
}
}

public static int i(final String msg) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.i(TAG, msg);
} else {
return -1;
}
}
public static int i(final String msg)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.i(TAG, msg);
} else {
return -1;
}
}

public static int i(final String msg, final Throwable tr) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.i(TAG, msg, tr);
} else {
return -1;
}
}
public static int i(final String msg, final Throwable tr)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.i(TAG, msg, tr);
} else {
return -1;
}
}

public static int v(final String msg, final Throwable tr) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.v(TAG, msg, tr);
} else {
return -1;
}
}
public static int v(final String msg, final Throwable tr)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.v(TAG, msg, tr);
} else {
return -1;
}
}

public static int v(final String msg) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.v(TAG, msg);
} else {
return -1;
}
}
public static int v(final String msg)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.v(TAG, msg);
} else {
return -1;
}
}

public static int w(final String msg, final Throwable tr) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.w(TAG, msg, tr);
} else {
return -1;
}
}
public static int w(final String msg, final Throwable tr)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.w(TAG, msg, tr);
} else {
return -1;
}
}

public static int w(final String msg) {
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.w(TAG, msg);
} else {
return -1;
}
}
public static int w(final String msg)
{
if (Localytics.isLoggingEnabled()) {
return org.appcelerator.kroll.common.Log.w(TAG, msg);
} else {
return -1;
}
}
}
Loading