fixed error messages

Author: markpiller

src/com/backendless/Messaging.java

@@ -254,39 +254,47 @@ private synchronized void registerDeviceGCMSync( Context context, String GCMSend
   }
 
   /**
-   * For FireBase messaging only.
+   * For Firebase Cloud Messaging only
    */
   public void registerDevice()
   {
     registerDevice( Collections.singletonList( DEFAULT_CHANNEL_NAME ) );
   }
 
   /**
-   * For FireBase messaging only.
+   * For Firebase Cloud Messaging only
    */
   public void registerDevice( List<String> channels )
   {
     registerDevice( channels, (Date) null );
   }
 
   /**
-   * For FireBase messaging only.
+   * For Firebase Cloud Messaging only
    */
   public void registerDevice( List<String> channels, Date expiration )
   {
     registerDevice( channels, expiration, (AsyncCallback<DeviceRegistrationResult>) null );
   }
 
   /**
-   * For FireBase messaging only.
+   * For Firebase Cloud Messaging only
+   */
+  public void registerDevice( AsyncCallback<DeviceRegistrationResult> callback )
+  {
+    registerDevice( Collections.singletonList( DEFAULT_CHANNEL_NAME ), (Date) null, callback );
+  }
+  
+  /**
+   * For Firebase Cloud Messaging only
    */
   public void registerDevice( List<String> channels, AsyncCallback<DeviceRegistrationResult> callback )
   {
     registerDevice( channels, (Date) null, callback );
   }
 
   /**
-   * For FireBase messaging only.
+   * For Firebase Cloud Messaging only
    */
   public void registerDevice( List<String> channels, Date expiration, AsyncCallback<DeviceRegistrationResult> callback )
   {
@@ -295,21 +303,21 @@ public void registerDevice( List<String> channels, Date expiration, AsyncCallbac
 
     if( channels == null || channels.isEmpty() ||
             (channels.size() == 1 && (channels.get( 0 ) == null || channels.get( 0 ).isEmpty())) )
-    {
       channels = Collections.singletonList( DEFAULT_CHANNEL_NAME );
-    }
 
     for( String channel : channels )
       checkChannelName( channel );
 
     long expirationMs = 0;
+
     if( expiration != null)
     {
       if( expiration.before( Calendar.getInstance().getTime() ) )
         throw new IllegalArgumentException( ExceptionMessage.WRONG_EXPIRATION_DATE );
       else
         expirationMs = expiration.getTime();
     }
+
     FCMRegistration.registerDevice( ContextHandler.getAppContext(), channels, expirationMs, callback );
   }
 

src/com/backendless/push/BackendlessPushService.java

@@ -486,7 +486,7 @@ public static boolean isFCM( Context appContext )
     }
     catch( ClassNotFoundException e )
     {
-      Log.i( TAG, "Class FirebaseMessagingService not found. GCM will be used." );
+      Log.e( TAG, "Class FirebaseMessagingService cannot be found. FCM is not properly configured in your application." );
       return isFCM = false;
     }
 
@@ -507,8 +507,9 @@ public static boolean isFCM( Context appContext )
       }
       catch( ClassNotFoundException e )
       {
-        Log.e( TAG, "Can not load declared service class.", e );
-        throw new IllegalStateException( "Can not load declared service class.", e );
+        String error = "Unable to load com.backendless.push.BackendlessFCMService";
+        Log.e( TAG, error, e );
+        throw new IllegalStateException( error, e );
       }
 
       for( ServiceInfo srvInfo : services )
@@ -524,13 +525,13 @@ public static boolean isFCM( Context appContext )
         }
         catch( ClassNotFoundException e )
         {
-          Log.w( TAG, "You have declared class in AndroidManifest.xml that is not present in your app.", e );
+          Log.e( TAG, "An FCM service class is registered in AndroidManifest.xml but it cannot be found in your app. The class name is " + srvInfo.name, e );
         }
       }
 
       if( !flag )
       {
-        Log.i( TAG, "Class FirebaseMessagingService not found. GCM will be used." );
+        Log.i( TAG, "Class FirebaseMessagingService cannot found. FCM is not properly configured in your app." );
         return isFCM = false;
       }
     }
@@ -546,7 +547,7 @@ public static boolean isFCM( Context appContext )
     List<ResolveInfo> srvIntentFilters = packageManager.queryIntentServices( intent, PackageManager.GET_INTENT_FILTERS );
 
     if( srvIntentFilters.isEmpty() )
-      throw new IllegalStateException( "Missed intent-filter action " + action );
+      throw new IllegalStateException( "Missing the intent-filter action: " + action );
 
     return isFCM = true;
   }