Merge branch 'master' into 605-resave-installation-local-datastore-enabled

Author: hermanliang

CONTRIBUTING.md

@@ -26,15 +26,15 @@ In order to accept your pull request, we need you to submit a CLA. You only need
 Complete your CLA here: <https://developers.facebook.com/opensource/cla>
 
 ## Bugs
-Although we try to keep developing on Parse easy, you still may run into some issues. General questions should be asked on [Google Groups][google-group], technical questions should be asked on [Stack Overflow][stack-overflow], and for everything else we'll be using GitHub issues.
+Although we try to keep developing on Parse easy, you still may run into some issues. Technical questions should be asked on [Stack Overflow][stack-overflow], and for everything else we'll be using GitHub issues.
 
 ### Known Issues
 We use GitHub issues to track public bugs. We will keep a close eye on this and try to make it clear when we have an internal fix in progress. Before filing a new issue, try to make sure your problem doesn't already exist.
 
 ### Reporting New Issues
 Not all issues are SDK issues. If you're unsure whether your bug is with the SDK or backend, you can test to see if it reproduces with our [REST API][rest-api] and [Parse API Console][parse-api-console]. If it does, you can report backend bugs [here][bug-reports].
 
-To view the REST API network requests issued by the Parse SDK and responses from the Parse backend, please check out our [Network Debugging Tool][network-debugging-tool].  With this tool, you can either log network requests/responses to Android logcat, or log them to Chrome Debugger via Stetho.
+To view the REST API network requests issued by the Parse SDK and responses from the Parse backend, please check out [OkHttp Interceptors][network-debugging-tool].  With this tool, you can either log network requests/responses to Android logcat, or log them to Chrome Debugger via Stetho.
 
 Details are key. The more information you provide us the easier it'll be for us to debug and the faster you'll receive a fix. Some examples of useful tidbits:
 
@@ -56,11 +56,10 @@ We're still working on providing a code style for your IDE and getting a linter
 ## License
 By contributing to Parse Android SDK, you agree that your contributions will be licensed under its license.
 
- [google-group]: https://groups.google.com/forum/#!forum/parse-developers
  [stack-overflow]: http://stackoverflow.com/tags/parse.com
- [bug-reports]: https://www.parse.com/help#report
- [rest-api]: https://www.parse.com/docs/rest/guide
- [network-debugging-tool]: https://github.com/ParsePlatform/ParseInterceptors-Android/wiki
+ [bug-reports]: https://github.com/parse-community/parse-server
+ [rest-api]: http://docs.parseplatform.org/rest/guide/
+ [network-debugging-tool]: https://github.com/square/okhttp/wiki/Interceptors
  [parse-api-console]: http://blog.parse.com/announcements/introducing-the-parse-api-console/
  [stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
  [tests-dir]: /Parse/src/test/java/com/parse

LICENSE

@@ -28,3 +28,7 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.

PATENTS

@@ -31,3 +31,7 @@ necessarily infringed by the Software standing alone.
 A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
 or contributory infringement or inducement to infringe any patent, including a
 cross-claim or counterclaim.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.

Parse/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.kt3k.coveralls'
 
 group = 'com.parse'
-version = '1.14.1-SNAPSHOT'
+version = '1.15.2-SNAPSHOT'
 
 buildscript {
     repositories {
@@ -39,14 +39,22 @@ android {
     }
 }
 
-ext.okhttpVersion = '3.6.0'
+ext {
+    okhttpVersion = '3.6.0'
+}
+
 dependencies {
+    compile "com.android.support:support-annotations:$supportLibVersion"
     compile 'com.parse.bolts:bolts-tasks:1.4.0'
     compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
     provided 'com.facebook.stetho:stetho:1.4.2'
 
+    //Be aware, tests fail on 3.3.2 Wait to update until
+    //java.lang.NoClassDefFoundError: android/content/pm/VersionedPackage
+    //issue is fixed in Robolectric
+    //https://github.com/robolectric/robolectric/issues/2562
     testCompile 'org.robolectric:robolectric:3.3'
-    testCompile 'org.skyscreamer:jsonassert:1.4.0'
+    testCompile 'org.skyscreamer:jsonassert:1.5.0'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
 }
@@ -123,7 +131,7 @@ uploadArchives {
         pom.project {
             name 'Parse-Android'
             artifactId = 'parse-android'
-            packaging 'jar'
+            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'
 

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/GcmRegistrar.java

@@ -38,8 +38,6 @@
   private static final String REGISTRATION_ID_EXTRA = "registration_id";
   private static final String ERROR_EXTRA = "error";
 
-  // Client-side key for [email protected]. See parse/config/gcm.yml for server-side key.
-  private static final String PARSE_SENDER_ID = "1076345567071";
   private static final String SENDER_ID_EXTRA = "com.parse.push.gcm_sender_id";
 
   public static final String REGISTER_ACTION = "com.google.android.c2dm.intent.REGISTER";
@@ -134,24 +132,33 @@ private Task<Void> sendRegistrationRequestAsync() {
       // a 32-bit integer. For `android:value="567327206255"`, this returns a truncated integer
       // because 567327206255 is larger than the largest 32-bit integer.
       Bundle metaData = ManifestInfo.getApplicationMetadata(context);
-      String senderIDs = PARSE_SENDER_ID;
+      String senderID = null;
+
       if (metaData != null) {
         Object senderIDExtra = metaData.get(SENDER_ID_EXTRA);
 
         if (senderIDExtra != null) {
-          String senderID = actualSenderIDFromExtra(senderIDExtra);
+          senderID = actualSenderIDFromExtra(senderIDExtra);
 
-          if (senderID != null) {
-            senderIDs += ("," + senderID);
-          } else {
+          if (senderID == null) {
             PLog.e(TAG, "Found " + SENDER_ID_EXTRA + " <meta-data> element with value \"" +
                 senderIDExtra.toString() + "\", but the value is missing the expected \"id:\" " +
                 "prefix.");
+            return null;
           }
         }
       }
 
-      request = Request.createAndSend(context, senderIDs);
+      if (senderID == null) {
+          PLog.e(TAG, "You must provide " + SENDER_ID_EXTRA + " in your AndroidManifest.xml\n" +
+                  "Make sure to prefix with the value with id:\n\n" +
+                  "<meta-data\n" +
+                  "    android:name=\"com.parse.push.gcm_sender_id\"\n" +
+                  "    android:value=\"id:<YOUR_GCM_SENDER_ID>\" />");
+        return null;
+      }
+
+      request = Request.createAndSend(context, senderID);
       return request.getTask().continueWith(new Continuation<String, Void>() {
         @Override
         public Void then(Task<String> task) {

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/LocalIdManager.java

@@ -129,7 +129,7 @@ synchronized String createLocalId() {
 
     if (!isLocalId(localId)) {
       throw new IllegalStateException("Generated an invalid local id: \"" + localId + "\". "
-          + "This should never happen. Contact us at https://parse.com/help");
+          + "This should never happen. Open a bug at https://github.com/parse-community/parse-server");
     }
 
     return localId;

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

@@ -463,7 +463,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) {

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

@@ -106,7 +106,7 @@ public Task<Void> then(Task<Void> ignore) throws Exception {
               }
             }
             tasks.clear();
-            return Task.forResult((Void) null);
+            return Task.forResult(null);
           }
         }
       });