Skip to content

Commit ce5ad7d

Browse files
jkasten2jkasten2
committed
OneSignal Android Native SDK 2.0!
* Network optimizations and offline support for tags, subscription setting, and getTags. * Added geo tagging. * Removed loopj library - Now uses the HttpURLConnection class which is built into the Android OS. * Smaller SDK size * Fixed Activity leak. * Simpler setup, no longer need to add OneSignal.onResumed() and OneSignal.onPaused() to each activity. - The SDK now handles this for you automatically. * New builder init pattern. * OneSignal app id and Google project number now pulled from the AndroidManifest.xml. - Android Studio user can set these in the gradle file. * Now support Android market:// links. - Now directly opens all links instead of opening your app first. - Updating from 1.x.x * Add the following to your gradle file: compile "com.google.android.gms:play-services-location:8.3.0" compile 'com.android.support:appcompat-v7:23.1.1' * Update any calls to GameThrive with OneSignal.
1 parent 8ebf4a2 commit ce5ad7d

File tree

58 files changed

+4823
-986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4823
-986
lines changed

‎OneSignalSDK.jar

-73.2 KB
Binary file not shown.

‎OneSignalSDK/app/app.iml

Lines changed: 26 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1717
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
1819
<task>generateDebugSources</task>
19-
<task>mockableAndroidJar</task>
20-
<task>prepareDebugUnitTestDependencies</task>
2120
</afterSyncTasks>
2221
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2322
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -29,7 +28,7 @@
2928
</component>
3029
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3130
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3332
<exclude-output />
3433
<content url="file://$MODULE_DIR$">
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -38,86 +37,55 @@
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4146
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4247
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4348
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4449
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4550
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4651
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4752
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5553
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5654
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5755
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5856
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5957
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6058
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6159
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6967
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7169
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7370
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7873
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8375
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8777
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9081
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9382
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9483
</content>
9584
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9685
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
99-
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
100-
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
101-
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
102-
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
103-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
104-
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
105-
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
106-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
107-
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
108-
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
109-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
110-
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
111-
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
112-
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
113-
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
114-
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
115-
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
116-
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
117-
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
118-
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
119-
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
86+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
87+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
88+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
12089
<orderEntry type="module" module-name="onesignal" exported="" />
121-
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
12290
</component>
12391
</module>

‎OneSignalSDK/app/build.gradle

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
6-
7-
useLibrary 'org.apache.http.legacy'
5+
buildToolsVersion "23.0.2"
86

97
defaultConfig {
108
applicationId "com.onesignal.example"
11-
manifestPlaceholders = [manifestApplicationId: "${applicationId}"]
9+
manifestPlaceholders = [manifestApplicationId: "${applicationId}",
10+
// onesignal_app_id: "5eb5a37e-b458-11e3-ac11-000c2940e62c",
11+
onesignal_app_id: "b2f7f966-d8cc-11e4-bed1-df8f05be55ba",
12+
onesignal_google_project_number: "703322744261"]
1213
minSdkVersion 10
1314
targetSdkVersion 23
1415
versionCode 1
@@ -22,12 +23,16 @@ android {
2223
}
2324
testOptions {
2425
unitTests.all {
25-
maxParallelForks 4
26+
maxParallelForks 1
2627
maxHeapSize "2048m"
2728
}
2829
}
2930
}
3031

32+
repositories {
33+
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
34+
}
35+
3136
dependencies {
3237
compile fileTree(dir: 'libs', include: ['*.jar'])
3338
compile 'com.android.support:appcompat-v7:+'
@@ -36,14 +41,20 @@ dependencies {
3641
compile project(':onesignal')
3742

3843
// Use for released SDK
39-
//compile 'com.onesignal:OneSignal:1.10.+@aar'
40-
//compile 'com.google.android.gms:play-services-gcm:7.3.+'
41-
//compile 'com.google.android.gms:play-services-analytics:7.3.+'
42-
43-
testCompile 'junit:junit:4.12'
44-
// testCompile 'org.robolectric:shadows-support-v4:3.0'
45-
testCompile('org.robolectric:robolectric:3.0') {
46-
exclude group: 'commons-logging', module: 'commons-logging'
44+
//compile 'com.onesignal:OneSignal:2.+@aar'
45+
//compile "com.google.android.gms:play-services-gcm:8.3.0"
46+
//compile "com.google.android.gms:play-services-analytics:8.3.0"
47+
//compile "com.google.android.gms:play-services-location:8.3.0"
48+
//compile 'com.android.support:appcompat-v7:23.1.1'
49+
50+
// testCompile 'junit:junit:4.12'
51+
// testCompile 'org.robolectric:shadows-support-v4:3.0'
52+
// testCompile('org.robolectric:robolectric:3.0') {
53+
// exclude group: 'commons-logging', module: 'commons-logging'
54+
// exclude group: 'org.apache.httpcomponents', module: 'httpclient'
55+
// }
56+
57+
testCompile("org.robolectric:robolectric:3.1-SNAPSHOT") {
4758
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
4859
}
4960
}

‎OneSignalSDK/app/src/main/AndroidManifest.xml

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:amazon="http://schemas.amazon.com/apk/res/android"
43
package="com.onesignal.example" >
54

6-
<uses-permission android:name="com.amazon.device.messaging.permission.RECEIVE" />
7-
<permission android:name="com.onesignal.example.permission.RECEIVE_ADM_MESSAGE" android:protectionLevel="signature" />
8-
<uses-permission android:name="com.onesignal.example.permission.RECEIVE_ADM_MESSAGE" />
5+
<uses-permission android:name="com.android.vending.BILLING" />
6+
7+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
8+
<!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>-->
9+
910

1011
<application
1112
android:allowBackup="true"
@@ -28,14 +29,51 @@
2829
2930
-->
3031

32+
33+
34+
35+
36+
37+
<!--
38+
39+
<activity
40+
android:name=".MainActivity"
41+
android:label="@string/app_name"
42+
android:launchMode="singleTask"
43+
android:taskAffinity="">
44+
</activity>
45+
46+
<activity
47+
android:name=".BlankActivity"
48+
android:label="@string/app_name"
49+
android:launchMode="singleTask"
50+
android:taskAffinity=""
51+
>
52+
<intent-filter>
53+
<action android:name="android.intent.action.MAIN" />
54+
<category android:name="android.intent.category.LAUNCHER" />
55+
</intent-filter>
56+
</activity>
57+
-->
58+
3159
<activity
3260
android:name=".MainActivity"
33-
android:label="@string/app_name" >
61+
android:label="@string/app_name">
62+
</activity>
63+
64+
<activity
65+
android:name=".BlankActivity"
66+
android:label="@string/app_name"
67+
>
3468
<intent-filter>
3569
<action android:name="android.intent.action.MAIN" />
3670
<category android:name="android.intent.category.LAUNCHER" />
3771
</intent-filter>
3872
</activity>
73+
74+
75+
76+
3977
<activity
4078
android:name=".MainActivity2Activity"
4179
android:label="@string/title_activity_main_activity2"

0 commit comments

Comments
 (0)