feat(manifest): removing manifest parser

Author: milos1290

AndroidSDK/src/com/leanplum/LeanplumCloudMessagingProvider.java

@@ -45,13 +45,6 @@ abstract class LeanplumCloudMessagingProvider {
    */
   public abstract String getRegistrationId();
 
-  /**
-   * Verifies that Android Manifest is set up correctly.
-   *
-   * @return true If Android Manifest is set up correctly.
-   */
-  public abstract boolean isManifestSetUp();
-
   public abstract boolean isInitialized();
 
   /**

AndroidSDK/src/com/leanplum/LeanplumFcmProvider.java

@@ -22,23 +22,14 @@
 package com.leanplum;
 
 import com.google.firebase.iid.FirebaseInstanceId;
-import com.leanplum.internal.LeanplumManifestHelper;
 import com.leanplum.internal.Log;
 
-import java.util.Collections;
-
 /**
  * Leanplum provider for work with Firebase.
  *
  * @author Anna Orlova
  */
 class LeanplumFcmProvider extends LeanplumCloudMessagingProvider {
-  private static final String INSTANCE_ID_EVENT = "com.google.firebase.INSTANCE_ID_EVENT";
-  private static final String MESSAGING_EVENT = "com.google.firebase.MESSAGING_EVENT";
-  private static final String PUSH_FCM_LISTENER_SERVICE =
-      "com.leanplum.LeanplumPushFcmListenerService";
-  private static final String PUSH_FIREBASE_MESSAGING_SERVICE =
-      "com.leanplum.LeanplumPushFirebaseMessagingService";
 
   public String getRegistrationId() {
     return FirebaseInstanceId.getInstance().getToken();
@@ -48,34 +39,13 @@ public boolean isInitialized() {
     return true;
   }
 
-  public boolean isManifestSetUp() {
-    boolean hasReceivers =
-        LeanplumManifestHelper.checkComponent(LeanplumManifestHelper.getReceivers(),
-            PUSH_RECEIVER, false, null,
-            Collections.singletonList(PUSH_FIREBASE_MESSAGING_SERVICE), null);
-
-    boolean hasPushFirebaseMessagingService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_FIREBASE_MESSAGING_SERVICE, false, null,
-        Collections.singletonList(MESSAGING_EVENT), null);
-    boolean hasPushFcmListenerService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_FCM_LISTENER_SERVICE, false, null,
-        Collections.singletonList(INSTANCE_ID_EVENT), null);
-    boolean hasPushRegistrationService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_REGISTRATION_SERVICE, false, null, null, null);
-
-    boolean hasServices = hasPushFirebaseMessagingService && hasPushFcmListenerService
-        && hasPushRegistrationService;
-
-    return hasReceivers && hasServices;
-  }
-
   /**
    * Unregister from FCM.
    */
   public void unregister() {
     try {
       FirebaseInstanceId.getInstance().deleteInstanceId();
-      Log.i("Application was unregistred from FCM.");
+      Log.i("Application was unregistered from FCM.");
     } catch (Exception e) {
       Log.e("Failed to unregister from FCM.");
     }

AndroidSDK/src/com/leanplum/LeanplumGcmProvider.java

@@ -47,16 +47,6 @@ class LeanplumGcmProvider extends LeanplumCloudMessagingProvider {
   private static final String ERROR_PHONE_REGISTRATION_ERROR = "PHONE_REGISTRATION_ERROR";
   private static final String ERROR_TOO_MANY_REGISTRATIONS = "TOO_MANY_REGISTRATIONS";
 
-  private static final String SEND_PERMISSION = "com.google.android.c2dm.permission.SEND";
-  private static final String RECEIVE_PERMISSION = "com.google.android.c2dm.permission.RECEIVE";
-  private static final String RECEIVE_ACTION = "com.google.android.c2dm.intent.RECEIVE";
-  private static final String REGISTRATION_ACTION = "com.google.android.c2dm.intent.REGISTRATION";
-  private static final String INSTANCE_ID_ACTION = "com.google.android.gms.iid.InstanceID";
-  private static final String PUSH_LISTENER_SERVICE = "com.leanplum.LeanplumPushListenerService";
-  private static final String GCM_RECEIVER = "com.google.android.gms.gcm.GcmReceiver";
-  private static final String PUSH_INSTANCE_ID_SERVICE =
-      "com.leanplum.LeanplumPushInstanceIDService";
-
   private static String senderIds;
 
   static void setSenderId(String senderId) {
@@ -121,41 +111,6 @@ public boolean isInitialized() {
     return senderIds != null || getCurrentRegistrationId() != null;
   }
 
-  public boolean isManifestSetUp() {
-    Context context = Leanplum.getContext();
-    if (context == null) {
-      return false;
-    }
-
-    boolean hasPermissions = LeanplumManifestHelper.checkPermission(RECEIVE_PERMISSION, false, true)
-        && (LeanplumManifestHelper.checkPermission(context.getPackageName() +
-        ".gcm.permission.C2D_MESSAGE", true, false) || LeanplumManifestHelper.checkPermission(
-        context.getPackageName() + ".permission.C2D_MESSAGE", true, true));
-
-    boolean hasGcmReceiver = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getReceivers(), GCM_RECEIVER, true, SEND_PERMISSION,
-        Arrays.asList(RECEIVE_ACTION, REGISTRATION_ACTION), context.getPackageName());
-    boolean hasPushReceiver = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getReceivers(), PUSH_RECEIVER, false, null,
-        Collections.singletonList(PUSH_LISTENER_SERVICE), null);
-
-    boolean hasReceivers = hasGcmReceiver && hasPushReceiver;
-
-    boolean hasPushListenerService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_LISTENER_SERVICE, false, null,
-        Collections.singletonList(RECEIVE_ACTION), null);
-    boolean hasPushInstanceIDService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_INSTANCE_ID_SERVICE, false, null,
-        Collections.singletonList(INSTANCE_ID_ACTION), null);
-    boolean hasPushRegistrationService = LeanplumManifestHelper.checkComponent(
-        LeanplumManifestHelper.getServices(), PUSH_REGISTRATION_SERVICE, false, null, null, null);
-
-    boolean hasServices = hasPushListenerService && hasPushInstanceIDService
-        && hasPushRegistrationService;
-
-    return hasPermissions && hasReceivers && hasServices;
-  }
-
   /**
    * Unregister from GCM.
    */

AndroidSDK/src/com/leanplum/LeanplumPushService.java

@@ -662,17 +662,19 @@ static void onStart() {
 
   private static void initPushService() {
     if (isFirebaseEnabled()) {
-      if (!enableServices()) {
+      if (!enableFcmServices()) {
+        Log.i("Failed to initialize FCM services.");
         return;
       }
       provider = new LeanplumFcmProvider();
     } else {
-      if (!enableServices()) {
+      if (!enableGcmServices()) {
+        Log.i("Failed to initialize GCM services.");
         return;
       }
       provider = new LeanplumGcmProvider();
     }
-    if (!provider.isInitialized() || !provider.isManifestSetUp()) {
+    if (!provider.isInitialized()) {
       return;
     }
     if (hasAppIDChanged(Request.appId())) {
@@ -681,24 +683,15 @@ private static void initPushService() {
     registerInBackground();
   }
 
-
-  /**
-   * Enable Leanplum GCM or FCM services.
-   *
-   * @return True if services was enabled.
-   */
-  private static boolean enableServices() {
+  private static boolean enableFcmServices() {
     Context context = Leanplum.getContext();
     if (context == null) {
+      Log.i("Failed to enable FCM services, context is null.");
       return false;
     }
-
     PackageManager packageManager = context.getPackageManager();
-    if (packageManager == null) {
-      return false;
-    }
 
-    if (isFirebaseEnabled) {
+    if (isFirebaseEnabled()) {
       Class fcmListenerClass = getClassForName(LEANPLUM_PUSH_FCM_LISTENER_SERVICE_CLASS);
       if (fcmListenerClass == null) {
         return false;
@@ -710,20 +703,29 @@ private static boolean enableServices() {
           return false;
         }
       }
-    } else {
-      Class gcmPushInstanceIDClass = getClassForName(LEANPLUM_PUSH_INSTANCE_ID_SERVICE_CLASS);
-      if (gcmPushInstanceIDClass == null) {
-        return false;
-      }
+    }
+    return true;
+  }
 
-      if (!wasComponentEnabled(context, packageManager, gcmPushInstanceIDClass)) {
-        if (!enableComponent(context, packageManager, LEANPLUM_PUSH_LISTENER_SERVICE_CLASS) ||
-            !enableComponent(context, packageManager, gcmPushInstanceIDClass) ||
-            !enableComponent(context, packageManager, GCM_RECEIVER_CLASS)) {
-          return false;
-        }
+  private static boolean enableGcmServices() {
+    Context context = Leanplum.getContext();
+    if (context == null) {
+      Log.i("Failed to enable FCM services, context is null.");
+      return false;
+    }
+    PackageManager packageManager = context.getPackageManager();
+    Class gcmPushInstanceIDClass = getClassForName(LEANPLUM_PUSH_INSTANCE_ID_SERVICE_CLASS);
+    if (gcmPushInstanceIDClass == null) {
+      return false;
+    }
 
+    if (!wasComponentEnabled(context, packageManager, gcmPushInstanceIDClass)) {
+      if (!enableComponent(context, packageManager, LEANPLUM_PUSH_LISTENER_SERVICE_CLASS) ||
+          !enableComponent(context, packageManager, gcmPushInstanceIDClass) ||
+          !enableComponent(context, packageManager, GCM_RECEIVER_CLASS)) {
+        return false;
       }
+
     }
     return true;
   }