rhodes 7.4.1 → 7.5.1

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/{CameraSingletonObject.java → CameraSingleton.java}

@@ -27,26 +27,35 @@ import com.rhomobile.rhodes.api.IMethodResult;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.ui.FileList;
 
-public class CameraSingletonObject implements ICameraSingletonObject {
-    private static final String TAG = CameraSingletonObject.class.getSimpleName();
-    public static boolean deprecated_choose_pic;
-    private int mId;
+public class CameraSingleton implements ICameraSingleton {
+    private static final String TAG = CameraSingleton.class.getSimpleName();
+    private int mId = 0;
 
     static int getCameraIndex(String id) {
         return Integer.valueOf(id.substring(7)).intValue();
     }
+
     static String getCameraId(int idx) {
         return "camera#" + String.valueOf(idx);
     }
 
-    @Override
     public int getCameraCount() {
         Logger.T(TAG, "getCameraCount");
-        return 1;
+        return android.hardware.Camera.getNumberOfCameras();
     }
 
-    public CameraSingletonObject() {
-        mId = 0;
+
+    public CameraSingleton() {
+        int camera_count = getCameraCount();
+        for (int i = 0 ; i < camera_count; i++) {
+            android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
+            android.hardware.Camera.getCameraInfo(i, info);
+            if (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK) {
+                setDefaultIndex(i);
+                return;
+            }
+        }
+
     }
 
     @Override
@@ -76,7 +85,29 @@ public class CameraSingletonObject implements ICameraSingletonObject {
 
     @Override
     public void getCameraByType(String cameraType, IMethodResult result) {
-        result.set(getDefaultID());
+        int cameraTypeId = android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
+        if (cameraType.equalsIgnoreCase(ICameraSingleton.CAMERA_TYPE_FRONT)) {
+            Logger.T(TAG, "Requesting front camera.");
+            cameraTypeId = android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT;
+        } else if (cameraType.equalsIgnoreCase(ICameraSingleton.CAMERA_TYPE_BACK)) {
+            Logger.T(TAG, "Requesting back camera.");
+            cameraTypeId = android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
+        } else {
+            Logger.E(TAG, "Unknown camera type requested: " + cameraType);
+            result.setArgError("Unknown camera type requested: " + cameraType);
+            return;
+        }
+
+        int cameraCount = getCameraCount();
+        int i;
+        for (i = 0 ; i < cameraCount; i++) {
+            android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
+            android.hardware.Camera.getCameraInfo(i, info);
+            if (info.facing == cameraTypeId) {
+                result.set(getCameraId(i));
+                return;
+            }
+        }
     }
 
     @Override
@@ -84,73 +115,56 @@ public class CameraSingletonObject implements ICameraSingletonObject {
         CameraObject.CURRENT_SCREEN_AUTO_ROTATE_MODE = RhodesActivity.safeGetInstance().getScreenAutoRotateMode();
     	CameraObject.CURRENT_FULL_SCREEN_MODE = RhodesActivity.safeGetInstance().getFullScreenMode();
 
-    	if(propertyMap.get("deprecated") == null || propertyMap.get("deprecated").equalsIgnoreCase("false")){
 
-        CameraObject.deprecated_take_pic = false;
-
-    		propertyMap.put("deprecated", "false");
-    		deprecated_choose_pic = false;
-    	}
-    	else
-    		deprecated_choose_pic = true;
-
-        // set default values
-        if(propertyMap.get("useSystemViewfinder") == null) {
-            propertyMap.put("useSystemViewfinder", "true");
+        if(propertyMap.get(ICameraSingleton.PROPERTY_USE_REAL_BITMAP_RESIZE) == null) {
+            propertyMap.put(ICameraSingleton.PROPERTY_USE_REAL_BITMAP_RESIZE, "true");
         }
-        if(propertyMap.get("useRealBitmapResize") == null) {
-            propertyMap.put("useRealBitmapResize", "true");
-        }
-        if(propertyMap.get("useRotationBitmapByEXIF") == null) {
-            propertyMap.put("useRotationBitmapByEXIF", "true");
+        if(propertyMap.get(ICameraSingleton.PROPERTY_USE_ROTATION_BITMAP_BY_EXIF) == null) {
+            propertyMap.put(ICameraSingleton.PROPERTY_USE_ROTATION_BITMAP_BY_EXIF, "true");
         }
 
         Intent intent = null;
         String outputFormat = null;
-        if(propertyMap.get("outputFormat") == null){
-            propertyMap.put("outputFormat", "image");
-            outputFormat = propertyMap.get("outputFormat");
-        }
-        else{
-            outputFormat = propertyMap.get("outputFormat");
+        if(propertyMap.get(ICameraSingleton.PROPERTY_OUTPUT_FORMAT) == null){
+            propertyMap.put(ICameraSingleton.PROPERTY_OUTPUT_FORMAT, ICameraSingleton.OUTPUT_FORMAT_IMAGE);
         }
+        outputFormat = propertyMap.get(ICameraSingleton.PROPERTY_OUTPUT_FORMAT);
+
         CameraFactory factory = (CameraFactory)CameraFactorySingleton.getInstance();
         factory.getRhoListener().setMethodResult(result);
         factory.getRhoListener().setActualPropertyMap(propertyMap);
         RhodesActivity ra = RhodesActivity.safeGetInstance();
        
 
-        if ( Boolean.parseBoolean(propertyMap.get("useSystemViewfinder")) ) {
-            /*
-            Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT);
-            getIntent.setType("image/*");
 
-            Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-            pickIntent.setType("image/*");
+        /*
+        Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        getIntent.setType("image/*");
 
-            Intent chooserIntent = Intent.createChooser(getIntent, "Select Image");
-            chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent});
+        Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        pickIntent.setType("image/*");
 
-            intent =  chooserIntent;
-            */
+        Intent chooserIntent = Intent.createChooser(getIntent, "Select Image");
+        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent});
+
+        intent =  chooserIntent;
+        */
+
+        intent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        intent.setType("image/*");
 
-            intent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-            intent.setType("image/*");
 
-        }else{
-            intent = new Intent(ra, FileList.class);
-        }
 
         propertyMap.put("fromGallery", "true");
         String fileName = null;
-        if(!propertyMap.containsKey("fileName")){
+        if(!propertyMap.containsKey(ICameraSingleton.PROPERTY_FILE_NAME)){
             fileName = "/sdcard/DCIM/Camera/";
         }
         else{
-            fileName = propertyMap.get("fileName");
+            fileName = propertyMap.get(ICameraSingleton.PROPERTY_FILE_NAME);
         }
         if (fileName != null && fileName.length() > 0) {
-            if (outputFormat.equalsIgnoreCase("image")) {
+            if (outputFormat.equalsIgnoreCase(ICameraSingleton.OUTPUT_FORMAT_IMAGE)) {
                 String tmpPath = getTemporaryLoc(fileName);
                 if (tmpPath == null) {
                     throw new RuntimeException("Failed to access shared temporary folder");
@@ -193,15 +207,6 @@ public class CameraSingletonObject implements ICameraSingletonObject {
 
     }
     */
-
-    @Override
-    public ICameraObject createCameraObject(String id) {
-        Logger.T(TAG, "createCameraObject: " + id);
-        return new CameraObject(id);
-    }
-
-
-
     private static String insertImage(ContentResolver cr, String imageFullPath) {
 
             String filename =  imageFullPath.substring(imageFullPath.lastIndexOf("/")+1, imageFullPath.length());
@@ -272,13 +277,8 @@ public class CameraSingletonObject implements ICameraSingletonObject {
          * @see android.provider.MediaStore.Images.Media (StoreThumbnail private method)
          */
 
-private static Bitmap storeThumbnail(
-                ContentResolver cr,
-                Bitmap source,
-                long id,
-                float width,
-                float height,
-                int kind) {
+    private static Bitmap storeThumbnail(ContentResolver cr, Bitmap source, long id,
+                float width, float height, int kind) {
 
             // create the matrix to scale it
             Matrix matrix = new Matrix();
@@ -315,8 +315,6 @@ private static Bitmap storeThumbnail(
 
     }
 
-
-
     public static void copyImageFileToDeviceGallery(String imageFullPath) {
 
         String imageName = imageFullPath.substring(imageFullPath.lastIndexOf("/")+1, imageFullPath.length());
@@ -327,15 +325,12 @@ private static Bitmap storeThumbnail(
 
 
     @Override
-    public void copyImageToDeviceGallery(String pathToImage,
-    IMethodResult result) {
+    public void copyImageToDeviceGallery(String pathToImage, IMethodResult result) {
         copyImageFileToDeviceGallery(pathToImage);
     }
 
 
-
-    public void copyImageToDeviceGalleryOld(String pathToImage,
-    IMethodResult result) {
+    public void copyImageToDeviceGalleryOld(String pathToImage, IMethodResult result) {
         // TODO Auto-generated method stub
         String imageName = pathToImage.substring(pathToImage.lastIndexOf("/")+1, pathToImage.length());
         String abspath = copyImageToDesired(pathToImage, imageName);
@@ -428,5 +423,4 @@ private static Bitmap storeThumbnail(
 
         return mediafile.getAbsolutePath();
     }
-
 }

data/lib/commonAPI/printing_zebra/ext/platform/android/src/com/rhomobile/printing/zebra/impl/ZebraPrintingProviderImpl.java

@@ -100,7 +100,8 @@ public class ZebraPrintingProviderImpl implements IZebraPrintingProvider {
 		        }
 		    };	
 			mUsbManager = (UsbManager) RhodesActivity.safeGetInstance().getSystemService(Context.USB_SERVICE);
-        	mPermissionIntent = PendingIntent.getBroadcast(RhodesActivity.safeGetInstance(), 0, new Intent(ACTION_USB_PERMISSION), 0);
+        	mPermissionIntent = PendingIntent.getBroadcast(RhodesActivity.safeGetInstance(), 0, new Intent(ACTION_USB_PERMISSION), 
+        		PendingIntent.FLAG_IMMUTABLE);
         	IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
         	RhodesActivity.safeGetInstance().registerReceiver(mUsbReceiver, filter);	
 		}

data/lib/extensions/fcm-push/ext/android/ApplicationManifestAdds.erb

@@ -1,29 +1,17 @@
-<service android:name="com.rhomobile.rhodes.fcm.FCMIntentService">
+<service android:name="com.rhomobile.rhodes.fcm.FCMIntentService" android:exported='false'>
 	<intent-filter android:priority="900">
 	    <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
 	</intent-filter>
 </service>
 
 <service android:exported="true" android:name="com.google.firebase.messaging.FirebaseMessagingService">
     <intent-filter android:priority="-500">
         <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
     </intent-filter>
 </service>
 
-<service android:name="com.rhomobile.rhodes.fcm.FCMTokenRefresherService" android:exported="true">
-     <intent-filter>
-         <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-     </intent-filter>
- </service>
-
-<receiver android:name="com.google.android.gms.measurement.AppMeasurementReceiver"
-	 android:enabled="true">
-	 <intent-filter>
-	     <action android:name="com.google.android.gms.measurement.UPLOAD" />
-	     <action android:name="com.android.vending.INSTALL_REFERRER"/>
-	 </intent-filter>
-</receiver>
-
 
 <receiver android:exported="false" android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"/>
 <service android:exported="true" android:name="com.google.firebase.iid.FirebaseInstanceIdService">
@@ -35,9 +23,19 @@
 <receiver android:exported="true" android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver" android:permission="com.google.android.c2dm.permission.SEND">
     <intent-filter>
         <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
-        <category android:name="<%=@appPackageName%>"/>
     </intent-filter>
 </receiver>
 
+
+
+<service android:directBootAware="true" android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
+    <meta-data android:name="com.google.firebase.components:com.google.firebase.messaging.FirebaseMessagingRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+    <meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+    <meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+    <meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+</service>
+
+<provider android:authorities="<%=@appPackageName%>.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+
+
 <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>

data/lib/extensions/fcm-push/ext/android/Rakefile

@@ -132,49 +132,74 @@ end
 multitask TARGETLIB_AARCH64 => OBJ_AARCH64
 
 
-$jsonfile = File.read(File.join($app_dir, 'google-services.json')) if File.exists?(File.join($app_dir, 'google-services.json'))
-  
+
+
+
+
+###############
+
 $xmlFileWithDataFromJson = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>"
+
 def add_data_to_string(name, dataFromJson)
-  $xmlFileWithDataFromJson << "\n\t<string name=\"" << name << "\" translatable=\"false\">" << 
-  $jsonfile.scan(/#{dataFromJson}.*\".*\"/).last.scan(/:.*\".*\"/).last.scan(/\".*\"/).last.gsub("\"","") << "</string>"
+  $xmlFileWithDataFromJson << "\n\t<string name=\"" << name << "\" translatable=\"false\">" << dataFromJson << "</string>"
 end
 
-def createXmlFromJson()
-  puts "Creating values.xml from google-sevices.json" if $jsonfile
-  add_data_to_string("default_web_client_id", "client_id") if $jsonfile
-  add_data_to_string("firebase_database_url", "firebase_url") if $jsonfile
-  
-  if ENV["CUSTOM_FCM_SENDER_ID"].nil?
-    add_data_to_string("gcm_defaultSenderId", "project_number") if $jsonfile
-  else  
-    $xmlFileWithDataFromJson << "\n\t<string name=\"gcm_defaultSenderId\" translatable=\"false\">" <<  
-    ENV["CUSTOM_FCM_SENDER_ID"] << "</string>"
+$jsonfile = File.read(File.join($app_dir, 'google-services.json')) if File.exists?(File.join($app_dir, 'google-services.json'))
+
+if $jsonfile.nil? 
+
+  if ENV["FCM_MPBILESDK_APP_ID"].nil?
+    puts "Please set mobilesdk_app_id variable in android/fcm section of build.yml"
+  end
+  if ENV["FCM_PROJECT_NUMBER"].nil?
+    puts "Please set project_number variable in android/fcm section of build.yml"
+  end
+  if ENV["FCM_CURRENT_KEY"].nil?
+    puts "Please set current_key variable in android/fcm section of build.yml"
+  end
+  if ENV["FCM_PROJECT_ID"].nil?
+    puts "Please set project_id variable in android/fcm section of build.yml"
   end
-  add_data_to_string("google_api_key", "current_key") if $jsonfile
   
-  if ENV["CUSTOM_FCM_APPLICATION_ID"].nil?
-    add_data_to_string("google_app_id", "mobilesdk_app_id") if $jsonfile
-  else
-    $xmlFileWithDataFromJson << "\n\t<string name=\"google_app_id\" translatable=\"false\">" <<  
-    ENV["CUSTOM_FCM_APPLICATION_ID"] << "</string>"
+  if ENV["FCM_MPBILESDK_APP_ID"].nil? or ENV["FCM_PROJECT_NUMBER"].nil? or ENV["FCM_CURRENT_KEY"].nil? or ENV["FCM_PROJECT_ID"].nil?
+    exit 1
+  end
+
+
+  add_data_to_string("google_app_id", ENV["FCM_MPBILESDK_APP_ID"])
+  add_data_to_string("gcm_defaultSenderId", ENV["FCM_PROJECT_NUMBER"])
+  add_data_to_string("google_api_key", ENV["FCM_CURRENT_KEY"])
+  add_data_to_string("project_id", ENV["FCM_PROJECT_ID"])
+
+else
+  begin 
+    jsonHash = JSON.parse($jsonfile)
+
+    puts "Creating values.xml from google-sevices.json" if $jsonfile
+
+    add_data_to_string("google_app_id", jsonHash["client"][0]["client_info"]["mobilesdk_app_id"])
+    add_data_to_string("gcm_defaultSenderId", jsonHash["project_info"]["project_number"])
+    add_data_to_string("default_web_client_id", jsonHash["client"][0]["oauth_client"][0]["client_id"])
+    add_data_to_string("google_api_key", jsonHash["client"][0]["api_key"][0]["current_key"])
+    add_data_to_string("google_crash_reporting_api_key", jsonHash["client"][0]["api_key"][0]["current_key"])
+    add_data_to_string("project_id", jsonHash["project_info"]["project_id"])
+
+  rescue Exception => e
+    puts "\nCan't create id values for firebase. Please check your google-services.json.\n"
+    puts e
+    exit 1
   end
-  add_data_to_string("google_crash_reporting_api_key", "current_key") if $jsonfile
-  add_data_to_string("google_storage_bucket", "storage_bucket") if $jsonfile
-  add_data_to_string("project_id", "project_id") if $jsonfile
-
-  $xmlFileWithDataFromJson << "\n</resources>"
-  resGoogleDir = File.join($curdir, 'res', 'res', 'values')
-  #resDebug = File.join(resGoogleDir, 'debug')
-  #resRelease = File.join(resGoogleDir, 'release')
-  #FileUtils.mkdir_p(resDebug) unless File.exists?(resDebug)
-  FileUtils.mkdir_p(resGoogleDir) unless File.exists?(resGoogleDir)
-  #File.open(File.join(resDebug, 'values.xml'), 'w') {|f| f.write($xmlFileWithDataFromJson) }
-  File.open(File.join(resGoogleDir, 'fireBaseValues.xml'), 'w') {|f| f.write($xmlFileWithDataFromJson) }
-  puts "fireBaseValues.xml created"
 end
 
-createXmlFromJson()
+$xmlFileWithDataFromJson << "\n</resources>"
+resGoogleDir = File.join($curdir, 'res', 'res', 'values')
+
+FileUtils.mkdir_p(resGoogleDir) unless File.exists?(resGoogleDir)
+File.open(File.join(resGoogleDir, 'fireBaseValues.xml'), 'w') {|f| f.write($xmlFileWithDataFromJson) }
+puts "fireBaseValues.xml created"
+
+##############
+
 
 namespace 'arch' do
   task :arm => [TARGETLIB_ARM]

data/lib/extensions/fcm-push/ext/android/ext_java.files

@@ -1,4 +1,3 @@
 ext/android/src/com/rhomobile/rhodes/fcm/FCMFacade.java
 ext/android/src/com/rhomobile/rhodes/fcm/FCMIntentService.java
-ext/android/src/com/rhomobile/rhodes/fcm/FCMTokenRefresherService.java
 ext/android/src/com/rhomobile/rhodes/fcm/FCMListener.java

data/lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMFacade.java

@@ -37,7 +37,6 @@ import com.google.firebase.messaging.RemoteMessage;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.firebase.iid.FirebaseInstanceId;
 import com.rhomobile.rhodes.R;
 import java.lang.Throwable;
 import com.rhomobile.rhodes.extmanager.AbstractRhoListener;
@@ -46,13 +45,13 @@ import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.extmanager.RhoExtManager;
 import com.rhomobile.rhodes.extmanager.RhoExtManagerImpl;
 import com.rhomobile.rhodes.extmanager.IRhoExtManager;
+import com.google.firebase.iid.FirebaseInstanceId;
 
 public final class FCMFacade {
     private static final String TAG = FCMFacade.class.getSimpleName();
     public static final FCMListener listener = FCMListener.getInstance();
     
     static final String FCM_PUSH_CLIENT = "fcm";
-    static String clientToken = "";
 
     private static String gStr(int key){
         String value = "";
@@ -90,13 +89,12 @@ public final class FCMFacade {
             try {
                 options = new FirebaseOptions.Builder()
                 .setApplicationId(gStr(R.string.google_app_id))
-                //.setApiKey(gStr(R.string.google_api_key))
-                //.setDatabaseUrl(gStr(R.string.firebase_database_url))
-                //.setStorageBucket(gStr(R.string.google_storage_bucket))
+                .setApiKey(gStr(R.string.google_api_key))
+                .setProjectId(gStr(R.string.project_id))
                 .setGcmSenderId(gStr(R.string.gcm_defaultSenderId))
                 .build();
             } catch( Throwable e ) {
-                Logger.E(TAG, "FCM: poblems on building options: " + e);
+                Logger.E(TAG, "FCM: problems on building options: " + e);
                 e.printStackTrace();
             }
 
@@ -104,39 +102,37 @@ public final class FCMFacade {
                 FirebaseApp.initializeApp(ContextFactory.getContext(), options);
                 Logger.T(TAG, "FCM: initialization of application");
             }catch(Exception e){
-                Logger.E(TAG, "FCM: poblems on initialization app: " + e);
+                Logger.E(TAG, "FCM: problems on initialization app: " + e);
                 e.printStackTrace();
             }
             try{
                 FirebaseApp.getInstance();
                 Logger.T(TAG, "FCM: Firebase Inited");                
             }catch(Exception e){
-                Logger.E(TAG, "FCM: poblems on getting instance: " + e);
+                Logger.E(TAG, "FCM: problems on getting instance: " + e);
                 e.printStackTrace();
             }
         }   
   
         refreshToken();  
-
-        
-
     }
+
     public static void refreshToken(){
         try{
             Logger.T(TAG, "FCM: registation of application");
-            clientToken = "";
+            String clientToken = ContextFactory.getContext().getSharedPreferences("FireBase", 
+                ContextFactory.getContext().MODE_PRIVATE).getString("token", "");
+
             clientToken = FirebaseInstanceId.getInstance().getToken();
-            if ((clientToken != "")&&(clientToken != null)){
+            if ((clientToken != "") && (clientToken != null)){
                 PushContract.handleRegistration(ContextFactory.getContext(), clientToken, FCMFacade.FCM_PUSH_CLIENT);
-                Logger.T(TAG, "FCM: registation successfully");
+                Logger.T(TAG, "FCM: registation successfully, token = " + clientToken);
             }else{
-                clientToken = "";
                 Logger.T(TAG, "FCM: can't get token, try to refresh later");
             }
         }catch(Exception exc){
-            Logger.T(TAG, "FCM: can't handle registation");
+            Logger.T(TAG, "FCM: can't handle registation " + exc.toString() );
         }
-        Logger.T(TAG, "FCM: token = " + clientToken);
     }
 
 }