Skip to content

Commit 4aebf93

Browse files
authored
Merge pull request OutSystems#5 from usernuno/outsystems
Update to version 3.10.3 by merging from original repository
2 parents 168f2f5 + 0691287 commit 4aebf93

64 files changed

Lines changed: 2534 additions & 754 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.

CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Contributing to the OneSignal Android SDK
2+
3+
:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
4+
5+
### How to Contribute
6+
We love the open source community and enjoy the support and contributions of many of our users. We ask that any potential contributors to the SDK Follow the following guidelines:
7+
8+
If your proposed contribution is a small bug fix, please feel free to create your own fork of the repository and create a pull request.
9+
10+
If your contribution would _break_ or _change_ the functionality of the SDK, please reach out to us on (contact) before you put in a lot of effort into a change we may not be able to use. We try our best to make sure that the SDK remains stable so that developers do not have to continually change their code, however some breaking changes _are_ desirable, so please get in touch to discuss your idea before you put in a lot of effort.
11+
12+
#### Before Submitting A Bug Report
13+
Before creating bug reports, please check this list of steps to follow.
14+
15+
1. Make sure that you are actually encountering an _issue_ and not a _question_. If you simply have a question about the SDK, we would be more than happy to assist you in our Support section on the web (https://www.onesignal.com - click the Message button at the bottom right)
16+
2. Please make sure to [include as many details as possible](#how-do-i-submit-a-good-bug-report)
17+
18+
> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
19+
20+
21+
#### How Do I Submit a Good Bug Report
22+
* **Use a clear and descriptive title** for the issue to identify the problem.
23+
* **Include Reproducibility** It is nearly always a good idea to include steps to reproduce the issue. If you cannot reliably reproduce the issue yourself, that's ok, but reproducible steps help best.
24+
* **Describe your environment**, tell us what version of the Android SDK you are using, how you added it to your project (ie. maven or manually adding it to your project), what version of Android you are targeting, and so on.
25+
* **Include a Stack Trace** If your issue involves a crash/exception, ***PLEASE*** post the stack trace to help us identify the root issue.
26+
* **Include an Example Project** This isn't required, but if you want your issue fixed quickly, it's often a good idea to include an example project as a zip and include it with the issue. You can also download the Demo project (included in the `/Examples` folder of this repo) and set up an example project with this code as a starting point.
542 Bytes
Binary file not shown.

Examples/AndroidStudio/.idea/codeStyles/Project.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/AndroidStudio/app/build.gradle

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
plugins {
2-
id 'com.onesignal.androidsdk.onesignal-gradle-plugin' version '0.8.1'
1+
buildscript {
2+
repositories {
3+
maven { url 'https://plugins.gradle.org/m2/'}
4+
}
5+
dependencies {
6+
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.11.0, 0.99.99]'
7+
}
8+
}
9+
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
10+
11+
repositories {
12+
maven { url 'https://maven.google.com' }
313
}
414

515
apply plugin: 'com.android.application'
6-
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
716

817
android {
918
compileSdkVersion 27
@@ -13,7 +22,7 @@ android {
1322
applicationId 'com.onesignal.example'
1423

1524
// TODO: Please update the OneSignal ID below to yours!
16-
manifestPlaceholders = [onesignal_app_id: "3beb3078-e0f1-4629-af17-fde833b9f716",
25+
manifestPlaceholders = [onesignal_app_id: '3beb3078-e0f1-4629-af17-fde833b9f716',
1726
// Project number pulled from dashboard, local value is ignored.
1827
onesignal_google_project_number: 'REMOTE']
1928

@@ -31,10 +40,12 @@ android {
3140
}
3241

3342
dependencies {
34-
compile fileTree(dir: 'libs', include: ['*.jar'])
35-
36-
compile 'com.android.support:appcompat-v7:27.0.+'
43+
implementation fileTree(dir: 'libs', include: ['*.jar'])
44+
implementation 'com.android.support:appcompat-v7:27.+'
3745

3846
// OneSignal SDK
39-
compile 'com.onesignal:OneSignal:[3.8.1, 3.99.99)'
47+
implementation 'com.onesignal:OneSignal:[3.9.2, 3.99.99)'
48+
49+
// Required for geotagging
50+
implementation 'com.google.android.gms:play-services-location:15.0.1'
4051
}

Examples/AndroidStudio/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.1.3'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
@@ -15,8 +15,8 @@ buildscript {
1515

1616
allprojects {
1717
repositories {
18-
jcenter()
1918
google()
19+
jcenter()
2020
}
2121
}
2222

Examples/Eclipse/OneSignalExample/AndroidManifest.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@
9393
<meta-data android:name="onesignal_app_id"
9494
android:value="b2f7f966-d8cc-11e4-bed1-df8f05be55ba" />
9595

96+
<receiver android:name="com.onesignal.GcmBroadcastReceiver"
97+
android:permission="com.google.android.c2dm.permission.SEND" >
98+
<!-- High priority so OneSignal payloads can be filtered from other GCM receivers if filterOtherGCMReceivers is enabled. -->
99+
<intent-filter android:priority="999" >
100+
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
101+
<category android:name="com.onesignal.example" />
102+
</intent-filter>
103+
</receiver>
104+
96105
<receiver android:name="com.onesignal.NotificationOpenedReceiver" />
97106

98107
<service android:name="com.onesignal.GcmIntentService" />

OneSignalSDK.jar

16 KB
Binary file not shown.

OneSignalSDK/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dependencies {
4848
// exclude group: 'com.google.android.gms', module: 'play-services-gcm'
4949
// exclude group: 'com.google.android.gms', module: 'play-services-analytics'
5050
// exclude group: 'com.google.android.gms', module: 'play-services-location'
51+
// exclude group: 'com.google.firebase', module: 'firebase-messaging'
5152
}
5253

5354
// Use snapshot
@@ -58,16 +59,15 @@ dependencies {
5859
// compile(name: 'OneSignal-release', ext: 'aar')
5960

6061
// New Instructions - Use for released SDK
61-
// compile 'com.onesignal:OneSignal:[3.5.8, 3.99.99]'
62+
// compile 'com.onesignal:OneSignal:[3.8.2, 3.99.99]'
6263

6364
// Old Instructions - Use for released SDK
6465
// compile 'com.onesignal:OneSignal:3.+@aar'
6566

66-
//implementation 'com.google.android.gms:play-services-gcm:11.2.2'
67-
implementation 'com.google.android.gms:play-services-location:11.8.0'
67+
implementation 'com.google.android.gms:play-services-location:12.0.0'
6868

6969
// For Chrome tabs
70-
// compile 'com.android.support:customtabs:26.1.0'
70+
compile 'com.android.support:customtabs:27.1.0'
7171
}
7272

7373
//apply plugin: 'com.google.gms.google-services'
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"project_info": {
3+
"project_number": "86233933250",
4+
"firebase_url": "https://onesignalexample-8d956.firebaseio.com",
5+
"project_id": "onesignalexample-8d956",
6+
"storage_bucket": "onesignalexample-8d956.appspot.com"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:86233933250:android:37fb51944ca88b0f",
12+
"android_client_info": {
13+
"package_name": "com.onesignal.example"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "86233933250-qcj1t4q0lpon6q1nidojhrdh6gmgg3b6.apps.googleusercontent.com",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key": "AIzaSyCvCs5vm7k3mo_2K0oB00QL7Z2zQKqSYY0"
25+
}
26+
],
27+
"services": {
28+
"analytics_service": {
29+
"status": 1
30+
},
31+
"appinvite_service": {
32+
"status": 1,
33+
"other_platform_oauth_client": []
34+
},
35+
"ads_service": {
36+
"status": 2
37+
}
38+
}
39+
}
40+
],
41+
"configuration_version": "1"
42+
}

OneSignalSDK/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636

3737

38-
38+
<meta-data android:name="com.onesignal.PrivacyConsent" android:value="ENABLE" />
3939

4040
<!--
4141

0 commit comments

Comments
 (0)