diff --git a/OneSignalSDK.jar b/OneSignalSDK.jar index e11ae60b94..76786f6912 100644 Binary files a/OneSignalSDK.jar and b/OneSignalSDK.jar differ diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle index 78b7537d06..4556166785 100644 --- a/OneSignalSDK/onesignal/build.gradle +++ b/OneSignalSDK/onesignal/build.gradle @@ -5,8 +5,7 @@ android { buildToolsVersion "23.0.2" defaultConfig { - minSdkVersion 10 - targetSdkVersion 23 + minSdkVersion 9 consumerProguardFiles 'consumer-proguard-rules.pro' } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java index a0cd87a854..fde305a669 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java @@ -61,8 +61,6 @@ import android.os.SystemClock; import android.util.Log; -import com.stericson.RootTools.internal.RootToolsInternalMethods; - import com.onesignal.OneSignalDbContract.NotificationTable; public class OneSignal { @@ -155,7 +153,7 @@ public void init() { private static TrackGooglePurchase trackGooglePurchase; private static TrackAmazonPurchase trackAmazonPurchase; - public static final String VERSION = "020102"; + public static final String VERSION = "020103"; private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS(); diff --git a/OneSignalSDK/onesignal/src/main/java/com/stericson/RootTools/internal/RootToolsInternalMethods.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/RootToolsInternalMethods.java similarity index 58% rename from OneSignalSDK/onesignal/src/main/java/com/stericson/RootTools/internal/RootToolsInternalMethods.java rename to OneSignalSDK/onesignal/src/main/java/com/onesignal/RootToolsInternalMethods.java index 1dcada53c0..f4c0e86a79 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/stericson/RootTools/internal/RootToolsInternalMethods.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/RootToolsInternalMethods.java @@ -1,18 +1,18 @@ /** * This file is part of the RootTools Project: http://code.google.com/p/roottools/ - * + * * Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks - * + * * This code is dual-licensed under the terms of the Apache License Version 2.0 and * the terms of the General Public License (GPL) Version 2. * You may use this code according to either of these licenses as is most appropriate * for your project on a case-by-case basis. - * + * * The terms of each license can be found at: - * + * * * http://www.apache.org/licenses/LICENSE-2.0 * * http://www.gnu.org/licenses/gpl-2.0.txt - * + * * Unless required by applicable law or agreed to in writing, software * distributed under these Licenses is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,23 +20,21 @@ * limitations under that License. */ -package com.stericson.RootTools.internal; +// Namespaced in com.onesignal to prevent class name conflicts if app developer includes the full RootTools library. +package com.onesignal; -public class RootToolsInternalMethods { - public static boolean isRooted() { - boolean found = false; - if (!found) { - String[] places = { "/sbin/", "/system/bin/", "/system/xbin/", - "/data/local/xbin/", "/data/local/bin/", - "/system/sd/xbin/", "/system/bin/failsafe/", "/data/local/" }; - for (String where : places) { - if (new java.io.File(where + "su").exists()) { - found = true; - break; - } - } - } - - return found; - } +class RootToolsInternalMethods { + static boolean isRooted() { + String[] places = {"/sbin/", "/system/bin/", "/system/xbin/", + "/data/local/xbin/", "/data/local/bin/", + "/system/sd/xbin/", "/system/bin/failsafe/", + "/data/local/"}; + + for (String where : places) { + if (new java.io.File(where + "su").exists()) + return true; + } + + return false; + } } \ No newline at end of file