Remove support for manifest configuration (#809)

* Remove support for manifest configuration. Unify API for FCM and GCM recievers

* Return to getting the GCM sender ID from the manifest

Author: Jawnnypoo

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

@@ -11,7 +11,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.io.File;
@@ -59,59 +59,15 @@ public static final class Builder {
        * <p>
        * This context will then be passed through to the rest of the Parse SDK for use during
        * initialization.
-       * <p>
-       * <p/>
-       * You may define {@code com.parse.SERVER_URL}, {@code com.parse.APPLICATION_ID} and (optional) {@code com.parse.CLIENT_KEY}
-       * {@code meta-data} in your {@code AndroidManifest.xml}:
-       * <pre>
-       * &lt;manifest ...&gt;
-       *
-       * ...
-       *
-       *   &lt;application ...&gt;
-       *     &lt;meta-data
-       *       android:name="com.parse.SERVER_URL"
-       *       android:value="@string/parse_server_url" /&gt;
-       *     &lt;meta-data
-       *       android:name="com.parse.APPLICATION_ID"
-       *       android:value="@string/parse_app_id" /&gt;
-       *     &lt;meta-data
-       *       android:name="com.parse.CLIENT_KEY"
-       *       android:value="@string/parse_client_key" /&gt;
-       *
-       *       ...
-       *
-       *   &lt;/application&gt;
-       * &lt;/manifest&gt;
-       * </pre>
-       * <p/>
-       * <p>
-       * This will cause the values for {@code server}, {@code applicationId} and {@code clientKey} to be set to
-       * those defined in your manifest.
        *
        * @param context The active {@link Context} for your application. Cannot be null.
        */
-      public Builder(Context context) {
+      public Builder(@NonNull Context context) {
         this.context = context;
-
-        // Yes, our public API states we cannot be null. But for unit tests, it's easier just to
-        // support null here.
-        if (context != null) {
-          Context applicationContext = context.getApplicationContext();
-          Bundle metaData = ManifestInfo.getApplicationMetadata(applicationContext);
-          if (metaData != null) {
-            server(metaData.getString(PARSE_SERVER_URL));
-            applicationId = metaData.getString(PARSE_APPLICATION_ID);
-            clientKey = metaData.getString(PARSE_CLIENT_KEY);
-          }
-        }
       }
 
       /**
        * Set the application id to be used by Parse.
-       * <p>
-       * This method is only required if you intend to use a different {@code applicationId} than
-       * is defined by {@code com.parse.APPLICATION_ID} in your {@code AndroidManifest.xml}.
        *
        * @param applicationId The application id to set.
        * @return The same builder, for easy chaining.
@@ -123,9 +79,6 @@ public Builder applicationId(String applicationId) {
 
       /**
        * Set the client key to be used by Parse.
-       * <p>
-       * This method is only required if you intend to use a different {@code clientKey} than
-       * is defined by {@code com.parse.CLIENT_KEY} in your {@code AndroidManifest.xml}.
        *
        * @param clientKey The client key to set.
        * @return The same builder, for easy chaining.
@@ -224,10 +177,6 @@ private Configuration(Builder builder) {
     }
   }
 
-  private static final String PARSE_SERVER_URL = "com.parse.SERVER_URL";
-  private static final String PARSE_APPLICATION_ID = "com.parse.APPLICATION_ID";
-  private static final String PARSE_CLIENT_KEY = "com.parse.CLIENT_KEY";
-
   private static final Object MUTEX = new Object();
   static ParseEventuallyQueue eventuallyQueue = null;
 
@@ -239,7 +188,7 @@ private Configuration(Builder builder) {
   /**
    * Enable pinning in your application. This must be called before your application can use
    * pinning. You must invoke {@code enableLocalDatastore(Context)} before
-   * {@link #initialize(Context)} :
+   * {@link #initialize(Configuration)}:
    * <p/>
    * <pre>
    * public class MyApplication extends Application {
@@ -284,99 +233,20 @@ public static boolean isLocalDatastoreEnabled() {
 
   /**
    * Authenticates this client as belonging to your application.
-   * <p/>
-   * You may define {@code com.parse.SERVER_URL}, {@code com.parse.APPLICATION_ID} and (optional) {@code com.parse.CLIENT_KEY}
-   * {@code meta-data} in your {@code AndroidManifest.xml}:
-   * <pre>
-   * &lt;manifest ...&gt;
-   *
-   * ...
-   *
-   *   &lt;application ...&gt;
-   *     &lt;meta-data
-   *       android:name="com.parse.SERVER_URL"
-   *       android:value="@string/parse_server_url" /&gt;
-   *     &lt;meta-data
-   *       android:name="com.parse.APPLICATION_ID"
-   *       android:value="@string/parse_app_id" /&gt;
-   *     &lt;meta-data
-   *       android:name="com.parse.CLIENT_KEY"
-   *       android:value="@string/parse_client_key" /&gt;
-   *
-   *       ...
-   *
-   *   &lt;/application&gt;
-   * &lt;/manifest&gt;
-   * </pre>
-   * <p/>
-   * This must be called before your application can use the Parse library.
-   * The recommended way is to put a call to {@code Parse.initialize}
-   * in your {@code Application}'s {@code onCreate} method:
-   * <p/>
-   * <pre>
-   * public class MyApplication extends Application {
-   *   public void onCreate() {
-   *     Parse.initialize(this);
-   *   }
-   * }
-   * </pre>
-   *
-   * @param context The active {@link Context} for your application.
-   */
-  public static void initialize(Context context) {
-    Configuration.Builder builder = new Configuration.Builder(context);
-    if (builder.server == null) {
-      throw new RuntimeException("ServerUrl not defined. " +
-              "You must provide ServerUrl in AndroidManifest.xml.\n" +
-              "<meta-data\n" +
-              "    android:name=\"com.parse.SERVER_URL\"\n" +
-              "    android:value=\"<Your Server Url>\" />");
-    }
-    if (builder.applicationId == null) {
-      throw new RuntimeException("ApplicationId not defined. " +
-              "You must provide ApplicationId in AndroidManifest.xml.\n" +
-              "<meta-data\n" +
-              "    android:name=\"com.parse.APPLICATION_ID\"\n" +
-              "    android:value=\"<Your Application Id>\" />");
-    }
-    initialize(builder
-            .setLocalDatastoreEnabled(isLocalDatastoreEnabled)
-            .build()
-    );
-  }
-
-  /**
-   * Authenticates this client as belonging to your application.
-   * <p/>
-   * This method is only required if you intend to use a different {@code applicationId} or
-   * {@code clientKey} than is defined by {@code com.parse.APPLICATION_ID} or
-   * {@code com.parse.CLIENT_KEY} in your {@code AndroidManifest.xml}.
-   * <p/>
    * This must be called before your
    * application can use the Parse library. The recommended way is to put a call to
    * {@code Parse.initialize} in your {@code Application}'s {@code onCreate} method:
    * <p/>
    * <pre>
    * public class MyApplication extends Application {
    *   public void onCreate() {
-   *     Parse.initialize(this, &quot;your application id&quot;, &quot;your client key&quot;);
+   *     Parse.initialize(configuration);
    *   }
    * }
    * </pre>
    *
-   * @param context       The active {@link Context} for your application.
-   * @param applicationId The application id provided in the Parse dashboard.
-   * @param clientKey     The client key provided in the Parse dashboard.
+   * @param configuration The configuration for your application.
    */
-  public static void initialize(Context context, String applicationId, String clientKey) {
-    initialize(new Configuration.Builder(context)
-            .applicationId(applicationId)
-            .clientKey(clientKey)
-            .setLocalDatastoreEnabled(isLocalDatastoreEnabled)
-            .build()
-    );
-  }
-
   public static void initialize(Configuration configuration) {
     if (isInitialized()) {
       PLog.w(TAG, "Parse is already initialized");

Parse/src/test/java/com/parse/ParseClientConfigurationTest.java

@@ -8,35 +8,18 @@
  */
 package com.parse;
 
-import android.os.Bundle;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = TestHelper.ROBOLECTRIC_SDK_VERSION)
 public class ParseClientConfigurationTest {
 
-  private final String serverUrl = "http://example.com/parse";
-  private final String appId = "MyAppId";
-  private final String clientKey = "MyClientKey";
-  private final String PARSE_SERVER_URL = "com.parse.SERVER_URL";
-  private final String PARSE_APPLICATION_ID = "com.parse.APPLICATION_ID";
-  private final String PARSE_CLIENT_KEY = "com.parse.CLIENT_KEY";
-
   @Test
   public void testBuilder() {
     Parse.Configuration.Builder builder = new Parse.Configuration.Builder(null);
@@ -66,98 +49,4 @@ public void testBuilderServerMissingSlashURL() {
     Parse.Configuration configuration = builder.build();
     assertEquals(configuration.server, "http://myserver.com/missingslash/");
   }
-
-  @Test
-  public void testConfigureFromManifest() throws Exception {
-    Bundle metaData = setupMockMetaData();
-    when(metaData.getString(PARSE_SERVER_URL)).thenReturn(serverUrl);
-    when(metaData.getString(PARSE_APPLICATION_ID)).thenReturn(appId);
-    when(metaData.getString(PARSE_CLIENT_KEY)).thenReturn(clientKey);
-
-    Parse.Configuration.Builder builder = new Parse.Configuration.Builder(RuntimeEnvironment.application);
-    Parse.Configuration config = builder.build();
-    assertEquals(serverUrl + "/", config.server);
-    assertEquals(appId, config.applicationId);
-    assertEquals(clientKey, config.clientKey);
-
-    verifyMockMetaData(metaData);
-  }
-
-  @Test(expected = RuntimeException.class)
-  public void testConfigureFromManifestWithoutServer() throws Exception {
-    Bundle metaData = setupMockMetaData();
-    when(metaData.getString(PARSE_SERVER_URL)).thenReturn(null);
-    when(metaData.getString(PARSE_APPLICATION_ID)).thenReturn(appId);
-    when(metaData.getString(PARSE_CLIENT_KEY)).thenReturn(clientKey);
-
-    // RuntimeException due to serverUrl = null
-    Parse.initialize(RuntimeEnvironment.application);
-  }
-
-  @Test(expected = RuntimeException.class)
-  public void testConfigureFromManifestWithoutAppId() throws Exception {
-    Bundle metaData = setupMockMetaData();
-    when(metaData.getString(PARSE_SERVER_URL)).thenReturn(serverUrl);
-    when(metaData.getString(PARSE_APPLICATION_ID)).thenReturn(null);
-    when(metaData.getString(PARSE_CLIENT_KEY)).thenReturn(clientKey);
-
-    // RuntimeException due to applicationId = null
-    Parse.initialize(RuntimeEnvironment.application);
-  }
-
-  @Test
-  public void testConfigureFromManifestWithoutClientKey() throws Exception {
-    Bundle metaData = setupMockMetaData();
-    when(metaData.getString(PARSE_SERVER_URL)).thenReturn(serverUrl);
-    when(metaData.getString(PARSE_APPLICATION_ID)).thenReturn(appId);
-    when(metaData.getString(PARSE_CLIENT_KEY)).thenReturn(null);
-
-    Parse.initialize(RuntimeEnvironment.application);
-    assertEquals(new URL(serverUrl + "/"), ParseRESTCommand.server);
-    assertEquals(appId, ParsePlugins.get().applicationId());
-    assertNull(ParsePlugins.get().clientKey());
-
-    verifyMockMetaData(metaData);
-  }
-
-  private void verifyMockMetaData(Bundle metaData) throws Exception {
-    verify(metaData).getString(PARSE_SERVER_URL);
-    verify(metaData).getString(PARSE_APPLICATION_ID);
-    verify(metaData).getString(PARSE_CLIENT_KEY);
-  }
-
-  private Bundle setupMockMetaData() throws Exception {
-    Bundle metaData = mock(Bundle.class);
-    RuntimeEnvironment.application.getApplicationInfo().metaData = metaData;
-    return metaData;
-  }
-
-  private static <T> boolean collectionsEqual(Collection<T> a, Collection<T> b) {
-    if (a.size() != b.size()) {
-      return false;
-    }
-
-    Iterator<T> iteratorA = a.iterator();
-    Iterator<T> iteratorB = b.iterator();
-    for (; iteratorA.hasNext() && iteratorB.hasNext();) {
-      T objectA = iteratorA.next();
-      T objectB = iteratorB.next();
-
-      if (objectA == null || objectB == null) {
-        if (objectA != objectB) {
-          return false;
-        }
-        continue;
-      }
-
-      if (!objectA.equals(objectB)) {
-        return false;
-      }
-    }
-
-    if (iteratorA.hasNext() || iteratorB.hasNext()) {
-      return false;
-    }
-    return true;
-  }
 }