-
Notifications
You must be signed in to change notification settings - Fork 371
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Lowered required support library revision and geo tag fix
* No longer requires revision 23 of the Android Support Library. 22 is need for all features but an older one can be used safely. * Fixed bug where geo tag permission prompt did not work if used from the Application class on Android 6.0 * Updated example project.
- Loading branch information
Showing
18 changed files
with
206 additions
and
70 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
OneSignalSDK/app/src/main/java/com/onesignal/example/OneSignalExampleApp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.onesignal.example; | ||
|
|
||
| import android.app.Application; | ||
|
|
||
| import com.onesignal.OneSignal; | ||
|
|
||
| public class OneSignalExampleApp extends Application { | ||
|
|
||
| @Override | ||
| public void onCreate() { | ||
| super.onCreate(); | ||
| OneSignal.setLogLevel(OneSignal.LOG_LEVEL.DEBUG, OneSignal.LOG_LEVEL.NONE); | ||
| OneSignal.startInit(this) | ||
| .setAutoPromptLocation(true) | ||
| // .setNotificationOpenedHandler(new ExampleNotificationOpenedHandler()) | ||
| .init(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
OneSignalSDK/onesignal/src/main/java/com/onesignal/AndroidSupportV4Compat.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /** | ||
| * Modified MIT License | ||
| * Copyright 2015 OneSignal | ||
| * | ||
| * Internals Copyright (C) 2012 The Android Open Source Project | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * 1. The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * 2. All copies of substantial portions of the Software may only be used in connection | ||
| * with services provided by OneSignal. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package com.onesignal; | ||
|
|
||
|
|
||
| import android.annotation.TargetApi; | ||
| import android.app.Activity; | ||
| import android.content.Context; | ||
| import android.support.annotation.NonNull; | ||
|
|
||
| // Designed as a compat for use of Android Support v4 revision 23.+ methods when an older revision of the library is included with the app developer's project. | ||
| class AndroidSupportV4Compat { | ||
|
|
||
| static class ContextCompat { | ||
| static int checkSelfPermission(@NonNull Context context, @NonNull String permission) { | ||
| if (permission == null) | ||
| throw new IllegalArgumentException("permission is null"); | ||
|
|
||
| return context.checkPermission(permission, android.os.Process.myPid(), android.os.Process.myUid()); | ||
| } | ||
| } | ||
|
|
||
| interface RequestPermissionsRequestCodeValidator { | ||
| void validateRequestPermissionsRequestCode(int requestCode); | ||
| } | ||
|
|
||
| static class ActivityCompat { | ||
| static void requestPermissions(final @NonNull Activity activity, final @NonNull String[] permissions, final int requestCode) { | ||
| // OneSignal SDK code already checks that device is Android M, omit else code from the support library. | ||
| ActivityCompatApi23.requestPermissions(activity, permissions, requestCode); | ||
| } | ||
| } | ||
|
|
||
| @TargetApi(23) | ||
| static class ActivityCompatApi23 { | ||
| static void requestPermissions(Activity activity, String[] permissions, int requestCode) { | ||
| if (activity instanceof RequestPermissionsRequestCodeValidator) | ||
| ((RequestPermissionsRequestCodeValidator) activity).validateRequestPermissionsRequestCode(requestCode); | ||
| activity.requestPermissions(permissions, requestCode); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.