Merge pull request parse-community#1 from aontas/master

Update master to latest OSS version (1.15.5)

Author: aontas

Parse/build.gradle

@@ -2,10 +2,17 @@ import com.android.builder.core.BuilderConstants
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'com.jfrog.bintray'
 
 group = 'com.parse'
-version = '1.15.0'
+version = '1.15.6-SNAPSHOT'
 
+ext {
+    projDescription = 'A library that gives you access to the powerful Parse cloud platform from your Android app.'
+    artifact = 'parse-android'
+    projName = 'Parse-Android'
+    gitLink = 'https://github.com/parse-community/Parse-SDK-Android'
+}
 buildscript {
     repositories {
         jcenter()
@@ -129,22 +136,22 @@ uploadArchives {
         }
 
         pom.project {
-            name 'Parse-Android'
-            artifactId = 'parse-android'
+            name projName
+            artifactId = artifact
             packaging 'aar'
-            description 'A library that gives you access to the powerful Parse cloud platform from your Android app.'
-            url 'https://github.com/ParsePlatform/Parse-SDK-Android'
+            description projDescription
+            url gitLink
 
             scm {
-                connection 'scm:[email protected]:ParsePlatform/Parse-SDK-Android.git'
-                developerConnection 'scm:[email protected]:ParsePlatform/Parse-SDK-Android.git'
-                url 'https://github.com/ParsePlatform/Parse-SDK-Android'
+                connection 'scm:[email protected]:parse-community/Parse-SDK-Android.git'
+                developerConnection 'scm:[email protected]:parse-community/Parse-SDK-Android.git'
+                url 'https://github.com/parse-community/Parse-SDK-Android'
             }
 
             licenses {
                 license {
                     name 'BSD License'
-                    url 'https://github.com/ParsePlatform/Parse-SDK-Android/blob/master/LICENSE'
+                    url 'https://github.com/parse-community/Parse-SDK-Android/blob/master/LICENSE'
                     distribution 'repo'
                 }
             }
@@ -183,7 +190,7 @@ jacoco {
     toolVersion "0.7.1.201405082137"
 }
 
-task jacocoTestReport(type:JacocoReport, dependsOn: "testDebugUnitTest") {
+task jacocoTestReport(type: JacocoReport, dependsOn: "testDebugUnitTest") {
     group = "Reporting"
     description = "Generate Jacoco coverage reports"
 
@@ -216,3 +223,92 @@ task jacocoTestReport(type:JacocoReport, dependsOn: "testDebugUnitTest") {
 coveralls.jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacocoTestReport.xml"
 
 //endregion
+
+// Requires apply plugin: 'com.jfrog.bintray'
+
+bintray {
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_API_KEY')
+
+    publications = ["MyPublication"]
+
+    publish = true
+    pkg {
+        repo = 'maven'
+        name = 'com.parse:parse-android'
+        userOrg = 'parse'
+        licenses = ['BSD License']
+        vcsUrl = 'https://github.com/parse-community/Parse-SDK-Android'
+        version {
+            name = project.version
+            desc = projDescription
+            released = new Date()
+            vcsTag = project.version
+
+            // Sonatype username/passwrod must be set for this operation to happen
+            mavenCentralSync {
+              sync = true
+              user = ossrhUsername
+              password = ossrhPassword
+              close = '1' // release automatically
+           }
+        }
+    }
+}
+
+def pomConfig = {
+    licenses {
+        license {
+            name 'BSD License'
+            url 'https://github.com/parse-community/Parse-SDK-Android/blob/master/LICENSE'
+            distribution 'repo'
+        }
+    }
+
+    scm {
+       url gitLink
+    }
+
+    developers {
+        developer {
+            id 'parse'
+            name 'Parse'
+        }
+    }
+}
+
+// Create the publication with the pom configuration:
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        MyPublication(MavenPublication) {
+            groupId group
+            // We have to specify it here because otherwise Bintray's plugin will assume the artifact's name is Parse
+            artifactId artifact
+            artifacts = [androidSourcesJar, bundleRelease]
+            version version
+            pom.withXml {
+                def root = asNode()
+                root.appendNode('description', projDescription)
+                root.appendNode('name', projName)
+                root.appendNode('url', gitLink)
+                root.children().last() + pomConfig
+
+                // maven-publish workaround to include dependencies
+                def dependenciesNode = asNode().appendNode('dependencies')
+
+                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
+                configurations.compile.allDependencies.each {
+                    def dependencyNode = dependenciesNode.appendNode('dependency')
+                    dependencyNode.appendNode('groupId', it.group)
+                    dependencyNode.appendNode('artifactId', it.name)
+                    dependencyNode.appendNode('version', it.version)
+                }
+
+            }
+        }
+    }
+}
+
+// End of Bintray plugin

Parse/release-proguard.pro

@@ -1,29 +1,7 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/opt/android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Keep source file names, line numbers, and Parse class/method names for easier debugging
--keepattributes SourceFile,LineNumberTable
 -keepnames class com.parse.** { *; }
 
 # Required for Parse
 -keepattributes *Annotation*
 -keepattributes Signature
--dontwarn android.net.SSLCertificateSocketFactory
--dontwarn android.app.Notification
--dontwarn com.squareup.**
+# https://github.com/square/okio#proguard
 -dontwarn okio.**

Parse/src/main/java/com/parse/ConfigCallback.java

@@ -40,5 +40,5 @@ public interface ConfigCallback extends ParseCallback2<ParseConfig, ParseExcepti
    *          The exception raised by the fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(ParseConfig config, ParseException e);
+  void done(ParseConfig config, ParseException e);
 }

Parse/src/main/java/com/parse/CountCallback.java

@@ -44,5 +44,5 @@ public interface CountCallback {
    * @param e
    *          The exception raised by the count, or null if it succeeded.
    */
-  public void done(int count, ParseException e);
+  void done(int count, ParseException e);
 }

Parse/src/main/java/com/parse/DeleteCallback.java

@@ -40,5 +40,5 @@ public interface DeleteCallback extends ParseCallback1<ParseException> {
    *          The exception raised by the delete, or {@code null} if it succeeded.
    */
   @Override
-  public void done(ParseException e);
+  void done(ParseException e);
 }

Parse/src/main/java/com/parse/FindCallback.java

@@ -45,5 +45,5 @@ public interface FindCallback<T extends ParseObject> extends ParseCallback2<List
    *          The exception raised by the save, or null if it succeeded.
    */
   @Override
-  public void done(List<T> objects, ParseException e);
+  void done(List<T> objects, ParseException e);
 }

Parse/src/main/java/com/parse/FunctionCallback.java

@@ -45,5 +45,5 @@ public interface FunctionCallback<T> extends ParseCallback2<T, ParseException> {
    *          The exception raised by the cloud call, or {@code null} if it succeeded.
    */
   @Override
-  public void done(T object, ParseException e);
+  void done(T object, ParseException e);
 }

Parse/src/main/java/com/parse/GcmBroadcastReceiver.java

@@ -11,13 +11,15 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.CallSuper;
 
 /**
  * @exclude
  */
 public class GcmBroadcastReceiver extends BroadcastReceiver {
   @Override
-  public final void onReceive(Context context, Intent intent) {
+  @CallSuper
+  public void onReceive(Context context, Intent intent) {
     ServiceUtils.runWakefulIntentInService(context, intent, PushService.class);
   }
 }

Parse/src/main/java/com/parse/GetCallback.java

@@ -43,5 +43,5 @@ public interface GetCallback<T extends ParseObject> extends ParseCallback2<T, Pa
    *          The exception raised by the fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(T object, ParseException e);
+  void done(T object, ParseException e);
 }

Parse/src/main/java/com/parse/GetDataCallback.java

@@ -35,6 +35,6 @@ public interface GetDataCallback extends ParseCallback2<byte[], ParseException>
    *          The exception raised by the fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(byte[] data, ParseException e);
+  void done(byte[] data, ParseException e);
 }
 

Parse/src/main/java/com/parse/GetDataStreamCallback.java

@@ -37,5 +37,5 @@ public interface GetDataStreamCallback extends ParseCallback2<InputStream, Parse
    *          The exception raised by the fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(InputStream input, ParseException e);
+  void done(InputStream input, ParseException e);
 }

Parse/src/main/java/com/parse/GetFileCallback.java

@@ -37,5 +37,5 @@ public interface GetFileCallback extends ParseCallback2<File, ParseException> {
    *          The exception raised by the fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(File file, ParseException e);
+  void done(File file, ParseException e);
 }

Parse/src/main/java/com/parse/LocationCallback.java

@@ -44,5 +44,5 @@ public interface LocationCallback extends ParseCallback2<ParseGeoPoint, ParseExc
    *          The exception raised by the location fetch, or {@code null} if it succeeded.
    */
   @Override
-  public void done(ParseGeoPoint geoPoint, ParseException e);
+  void done(ParseGeoPoint geoPoint, ParseException e);
 }

Parse/src/main/java/com/parse/LocationNotifier.java

@@ -60,7 +60,7 @@
   /* package */ static Task<Location> getCurrentLocationAsync(Context context,
       long timeout, Criteria criteria) {
     final TaskCompletionSource<Location> tcs = new TaskCompletionSource<>();
-    final Capture<ScheduledFuture<?>> timeoutFuture = new Capture<ScheduledFuture<?>>();
+    final Capture<ScheduledFuture<?>> timeoutFuture = new Capture<>();
     final LocationManager manager =
         (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
     final LocationListener listener = new LocationListener() {

Parse/src/main/java/com/parse/LockSet.java

@@ -16,13 +16,13 @@
 import java.util.concurrent.locks.Lock;
 
 /** package */ class LockSet {
-  private static WeakHashMap<Lock, Long> stableIds = new WeakHashMap<Lock, Long>();
+  private static final WeakHashMap<Lock, Long> stableIds = new WeakHashMap<>();
   private static long nextStableId = 0L;
 
   private final Set<Lock> locks;
 
   public LockSet(Collection<Lock> locks) {
-    this.locks = new TreeSet<Lock>(new Comparator<Lock>() {
+    this.locks = new TreeSet<>(new Comparator<Lock>() {
       @Override
       public int compare(Lock lhs, Lock rhs) {
         Long lhsId = getStableId(lhs);

Parse/src/main/java/com/parse/LogInCallback.java

@@ -43,5 +43,5 @@ public interface LogInCallback extends ParseCallback2<ParseUser, ParseException>
    *          The exception raised by the login, or {@code null} if it succeeded.
    */
   @Override
-  public void done(ParseUser user, ParseException e);
+  void done(ParseUser user, ParseException e);
 }

Parse/src/main/java/com/parse/LogOutCallback.java

@@ -39,5 +39,5 @@ public interface LogOutCallback extends ParseCallback1<ParseException> {
    *          The exception raised by the log out, or {@code null} if it succeeded.
    */
   @Override
-  public void done(ParseException e);
+  void done(ParseException e);
 }

Parse/src/main/java/com/parse/ManifestInfo.java

@@ -416,34 +416,32 @@ private static boolean hasGrantedPermissions(Context context, String... permissi
     return true;
   }
 
-  private static boolean checkResolveInfo(Class<? extends BroadcastReceiver> clazz, List<ResolveInfo> infoList) {
+  private static boolean checkResolveInfo(Class<? extends BroadcastReceiver> clazz, List<ResolveInfo> infoList, String permission) {
     for (ResolveInfo info : infoList) {
-      if (info.activityInfo != null && clazz.getCanonicalName().equals(info.activityInfo.name)) {
-        return true;
+      if (info.activityInfo != null) {
+        final Class resolveInfoClass;
+        try {
+          resolveInfoClass = Class.forName(info.activityInfo.name);
+        } catch (ClassNotFoundException e) {
+          break;
+        }
+        if (clazz.isAssignableFrom(resolveInfoClass) && (permission == null || permission.equals(info.activityInfo.permission))) {
+            return true;
+        }
       }
     }
 
     return false;
   }
 
-  private static boolean checkReceiver(Class<? extends BroadcastReceiver> clazz, String permission, Intent[] intents) {    
-    ActivityInfo receiver = getReceiverInfo(clazz); 
-
-    if (receiver == null) {
-      return false;
-    }
-    
-    if (permission != null && !permission.equals(receiver.permission)) {
-      return false;
-    }
-    
+  private static boolean checkReceiver(Class<? extends BroadcastReceiver> clazz, String permission, Intent[] intents) {
     for (Intent intent : intents) {
       List<ResolveInfo> receivers = getPackageManager().queryBroadcastReceivers(intent, 0);
       if (receivers.isEmpty()) {
         return false;
       }
 
-      if (!checkResolveInfo(clazz, receivers)) {
+      if (!checkResolveInfo(clazz, receivers, permission)) {
         return false;
       }
     }
@@ -463,7 +461,7 @@ private static boolean hasAnyGcmSpecificDeclaration() {
   }
 
   private static boolean isGooglePlayServicesAvailable() {
-    return Build.VERSION.SDK_INT >= 8 && getPackageInfo("com.google.android.gsf") != null;
+    return getPackageInfo("com.google.android.gsf") != null;
   }
 
   private static ManifestCheckResult gcmSupportLevel() {

Parse/src/main/java/com/parse/NotificationCompat.java

@@ -314,15 +314,15 @@ public Builder setStyle(Style style) {
      */
     @Deprecated
     public Notification getNotification() {
-      return (Notification) IMPL.build(this);
+      return IMPL.build(this);
     }
 
     /**
      * Combine all of the options that have been set and return a new {@link Notification}
      * object.
      */
     public Notification build() {
-      return (Notification) IMPL.build(this);
+      return IMPL.build(this);
     }
 
     protected static CharSequence limitCharSequenceLength(CharSequence cs) {