Skip to content

Commit 36985bf

Browse files
luissilvaosluissilvaos
authored
Merge pull request OutSystems#1 from OutSystems/RNMT-1298
RNMT-1298 Update OneSignal Android SDK
2 parents 0bcf361 + d457c0b commit 36985bf

131 files changed

Lines changed: 5749 additions & 3135 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,19 @@ language: android
22
sudo: false
33
jdk: oraclejdk8
44

5-
cache:
6-
directories:
7-
- $HOME/.gradle/caches/
8-
- $HOME/.gradle/wrapper/
9-
- $HOME/android-sdk/extras/
10-
- $HOME/android-sdk/
11-
- $HOME/android-sdk/platform-tools
12-
- $HOME/android-sdk/platforms
13-
- $HOME/android-sdk/build-tools
14-
- $HOME/android-sdk/tools
155
android:
166
components:
177
- tools
188
- tools # Include again to work around travis not using the latest.
199
# https://github.com/travis-ci/travis-ci/issues/6193
2010
# Required to get the newest platform-tools.
2111
- platform-tools
22-
- build-tools-26.0.1
23-
- android-26
12+
- build-tools-27.0.3
13+
- android-27
2414
licenses:
2515
- '.+'
2616
before_install:
17+
- yes | sdkmanager "platforms;android-27"
2718
- pwd
2819
- ls -la
2920
- cd OneSignalSDK
@@ -34,11 +25,6 @@ script:
3425
after_failure:
3526
- cat build/reports/lint-results.xml
3627
- cat build/outputs/lint-results-debug.xml
37-
- cd ../..
38-
- pwd
39-
- ls -la $HOME
40-
- ls -la $HOME/android-sdk
41-
after_success:
4228
- cd ../..
4329
- pwd
4430
- ls -la $HOME

‎Examples/AndroidStudio/.idea/misc.xml‎

Lines changed: 1 addition & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/AndroidStudio/app/app.iml‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,40 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2626
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2727
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4849
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5159
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -78,49 +86,52 @@
7886
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9093
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
9598
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9699
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
98101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
99103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
100104
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
101105
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
102106
</content>
103-
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
107+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
104108
<orderEntry type="sourceFolder" forTests="false" />
105-
<orderEntry type="library" exported="" name="support-core-ui-26.0.2" level="project" />
106-
<orderEntry type="library" exported="" name="play-services-location-11.2.2" level="project" />
107-
<orderEntry type="library" exported="" name="support-compat-26.0.2" level="project" />
108-
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
109-
<orderEntry type="library" exported="" name="support-media-compat-26.0.2" level="project" />
110-
<orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
111-
<orderEntry type="library" exported="" name="play-services-gcm-11.2.2" level="project" />
112-
<orderEntry type="library" exported="" name="support-fragment-26.0.2" level="project" />
113-
<orderEntry type="library" exported="" name="animated-vector-drawable-26.0.2" level="project" />
114-
<orderEntry type="library" exported="" name="support-annotations-26.0.2" level="project" />
115-
<orderEntry type="library" exported="" name="support-v4-26.0.2" level="project" />
116-
<orderEntry type="library" exported="" name="support-vector-drawable-26.0.2" level="project" />
117-
<orderEntry type="library" exported="" name="support-core-utils-26.0.2" level="project" />
118-
<orderEntry type="library" exported="" name="customtabs-26.0.2" level="project" />
119-
<orderEntry type="library" exported="" name="OneSignal-3.6.1" level="project" />
120-
<orderEntry type="library" exported="" name="appcompat-v7-26.0.2" level="project" />
121-
<orderEntry type="library" exported="" name="play-services-basement-11.2.2" level="project" />
122-
<orderEntry type="library" exported="" name="play-services-base-11.2.2" level="project" />
123-
<orderEntry type="library" exported="" name="play-services-tasks-11.2.2" level="project" />
124-
<orderEntry type="library" exported="" name="play-services-iid-11.2.2" level="project" />
109+
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.0.2" level="project" />
110+
<orderEntry type="library" name="com.android.support:appcompat-v7-27.0.2" level="project" />
111+
<orderEntry type="library" name="com.android.support:support-annotations:27.0.2@jar" level="project" />
112+
<orderEntry type="library" name="com.google.android.gms:play-services-gcm-license-11.8.0" level="project" />
113+
<orderEntry type="library" name="com.google.android.gms:play-services-base-license-11.8.0" level="project" />
114+
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
115+
<orderEntry type="library" name="com.google.android.gms:play-services-iid-11.8.0" level="project" />
116+
<orderEntry type="library" name="com.android.support:customtabs-27.0.2" level="project" />
117+
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.3" level="project" />
118+
<orderEntry type="library" name="com.google.android.gms:play-services-iid-license-11.8.0" level="project" />
119+
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.0.2" level="project" />
120+
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.3@jar" level="project" />
121+
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
122+
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
123+
<orderEntry type="library" name="com.android.support:support-core-ui-27.0.2" level="project" />
124+
<orderEntry type="library" name="com.android.support:support-compat-27.0.2" level="project" />
125+
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
126+
<orderEntry type="library" name="com.google.android.gms:play-services-location-license-11.8.0" level="project" />
127+
<orderEntry type="library" name="com.google.android.gms:play-services-location-11.8.0" level="project" />
128+
<orderEntry type="library" name="com.android.support:support-core-utils-27.0.2" level="project" />
129+
<orderEntry type="library" name="com.android.support:support-fragment-27.0.2" level="project" />
130+
<orderEntry type="library" name="com.android.support:support-media-compat-27.0.2" level="project" />
131+
<orderEntry type="library" name="com.google.android.gms:play-services-gcm-11.8.0" level="project" />
132+
<orderEntry type="library" name="com.google.android.gms:play-services-base-11.8.0" level="project" />
133+
<orderEntry type="library" name="com.onesignal:OneSignal-3.8.1" level="project" />
134+
<orderEntry type="library" name="com.android.support:support-v4-27.0.2" level="project" />
135+
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
125136
</component>
126137
</module>

‎Examples/AndroidStudio/app/build.gradle‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1+
plugins {
2+
id 'com.onesignal.androidsdk.onesignal-gradle-plugin' version '0.8.1'
3+
}
4+
15
apply plugin: 'com.android.application'
6+
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
27

38
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '26.0.1'
9+
compileSdkVersion 27
10+
buildToolsVersion '27.0.3'
611

712
defaultConfig {
8-
applicationId "com.onesignal.example"
13+
applicationId 'com.onesignal.example'
914

1015
// TODO: Please update the OneSignal ID below to yours!
1116
manifestPlaceholders = [onesignal_app_id: "3beb3078-e0f1-4629-af17-fde833b9f716",
1217
// Project number pulled from dashboard, local value is ignored.
13-
onesignal_google_project_number: "REMOTE"]
18+
onesignal_google_project_number: 'REMOTE']
1419

1520
minSdkVersion 15
16-
targetSdkVersion 26
21+
targetSdkVersion 27
1722
versionCode 1
18-
versionName "1.0"
23+
versionName '1.0'
1924
}
2025
buildTypes {
2126
release {
@@ -28,20 +33,8 @@ android {
2833
dependencies {
2934
compile fileTree(dir: 'libs', include: ['*.jar'])
3035

31-
// OneSignal SDK
32-
compile 'com.onesignal:OneSignal:[3.6.1,3.99.99)'
33-
34-
// OneSignal requires at least version 7.0.0 of GMS but the newest version is recommend.
35-
// Required for OneSignal, even if you have added FCM.
36-
compile 'com.google.android.gms:play-services-gcm:11.0.4'
36+
compile 'com.android.support:appcompat-v7:27.0.+'
3737

38-
// Required for geotagging
39-
compile 'com.google.android.gms:play-services-location:11.0.4'
40-
41-
42-
// play-services-analytics is only needed when using 8.1.0 or older.
43-
// compile 'com.google.android.gms:play-services-analytics:+'
44-
//noinspection GradleCompatible
45-
compile 'com.android.support:appcompat-v7:26.0.2'
46-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
38+
// OneSignal SDK
39+
compile 'com.onesignal:OneSignal:[3.8.1, 3.99.99)'
4740
}

‎Examples/AndroidStudio/app/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:theme="@style/AppTheme">
1818

1919

20-
<!-- Disbale opening of launcher Activity -->
20+
<!-- Disable opening of launcher Activity -->
2121
<meta-data android:name="com.onesignal.NotificationOpened.DEFAULT" android:value="DISABLE" />
2222

2323
<!-- Disable Badges -->
@@ -30,7 +30,16 @@
3030
<category android:name="android.intent.category.LAUNCHER" />
3131
</intent-filter>
3232
</activity>
33-
<activity android:name=".GreenActivity"></activity>
33+
<activity android:name=".GreenActivity" />
34+
35+
<service
36+
android:name=".NotificationExtenderExample"
37+
android:permission="android.permission.BIND_JOB_SERVICE"
38+
android:exported="false">
39+
<intent-filter>
40+
<action android:name="com.onesignal.NotificationExtender" />
41+
</intent-filter>
42+
</service>
3443
</application>
3544

3645
</manifest>

‎Examples/AndroidStudio/app/src/main/java/com/onesignal/example/ExampleApplication.java‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.onesignal.OSNotificationAction;
88
import com.onesignal.OSNotificationOpenResult;
99
import com.onesignal.OSNotification;
10-
import com.onesignal.OSNotificationPayload;
1110
import com.onesignal.OneSignal;
1211

1312
import org.json.JSONObject;
@@ -19,19 +18,14 @@ public void onCreate() {
1918
super.onCreate();
2019

2120
// Logging set to help debug issues, remove before releasing your app.
22-
//OneSignal.setLogLevel(OneSignal.LOG_LEVEL.DEBUG, OneSignal.LOG_LEVEL.WARN);
21+
//OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.WARN);
2322

2423
OneSignal.startInit(this)
25-
.autoPromptLocation(false) // default call promptLocation later
2624
.setNotificationReceivedHandler(new ExampleNotificationReceivedHandler())
2725
.setNotificationOpenedHandler(new ExampleNotificationOpenedHandler())
2826
.inFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
2927
.unsubscribeWhenNotificationsAreDisabled(true)
3028
.init();
31-
32-
// Call syncHashedEmail anywhere in your app if you have the user's email.
33-
// This improves the effectiveness of OneSignal's "best-time" notification scheduling feature.
34-
// OneSignal.syncHashedEmail(userEmail);
3529
}
3630

3731
private class ExampleNotificationReceivedHandler implements OneSignal.NotificationReceivedHandler {
@@ -51,7 +45,6 @@ public void notificationReceived(OSNotification notification) {
5145
String groupKey = notification.payload.groupKey;
5246
String groupMessage = notification.payload.groupMessage;
5347
String fromProjectNumber = notification.payload.fromProjectNumber;
54-
//BackgroundImageLayout backgroundImageLayout = notification.payload.backgroundImageLayout;
5548
String rawPayload = notification.payload.rawPayload;
5649

5750
String customKey;
@@ -92,13 +85,12 @@ public void notificationOpened(OSNotificationOpenResult result) {
9285

9386
if (actionType == OSNotificationAction.ActionType.ActionTaken) {
9487
Log.i("OneSignalExample", "Button pressed with id: " + result.action.actionID);
88+
9589
if (result.action.actionID.equals("id1")) {
9690
Log.i("OneSignalExample", "button id called: " + result.action.actionID);
9791
activityToLaunch = GreenActivity.class;
98-
} else {
92+
} else
9993
Log.i("OneSignalExample", "button id called: " + result.action.actionID);
100-
}
101-
10294
}
10395
// The following can be used to open an Activity of your choice.
10496
// Replace - getApplicationContext() - with any Android Context.
@@ -113,15 +105,11 @@ public void notificationOpened(OSNotificationOpenResult result) {
113105

114106
// Add the following to your AndroidManifest.xml to prevent the launching of your main Activity
115107
// if you are calling startActivity above.
116-
/*
117-
<application ...>
118-
<meta-data android:name="com.onesignal.NotificationOpened.DEFAULT" android:value="DISABLE" />
119-
</application>
120-
*/
121-
122-
123-
124-
108+
/*
109+
<application ...>
110+
<meta-data android:name="com.onesignal.NotificationOpened.DEFAULT" android:value="DISABLE" />
111+
</application>
112+
*/
125113
}
126114
}
127115
}

0 commit comments

Comments
 (0)