rhodes 7.4.1 → 7.5.1

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

@@ -32,9 +32,10 @@ import android.app.NotificationManager;
 import android.graphics.BitmapFactory;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
+import com.google.firebase.messaging.Constants;
 import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.PushContract;
@@ -49,123 +50,123 @@ import org.json.JSONObject;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
+import android.os.Bundle;
 import android.os.Handler;
+import java.util.Queue;
+import java.util.LinkedList;
 
 
 public class FCMIntentService extends FirebaseMessagingService {
 
     private static final String TAG = FCMIntentService.class.getSimpleName();
     public static final FCMListener listener = FCMListener.getInstance();
-    static private String lastHandledIntent = null;
+        
+    public static Queue<String> messagesQueue = new LinkedList<String>();
     
-    private static FirebaseMessagingService savedService = null;
-    private static Map<String, Intent> savedIntents = new HashMap<String, Intent>();
+
+    public FCMIntentService(){
+        super();
+        Logger.I(TAG, "FCM: creating FCMIntentService");
+    }
+  
 
     @Override
-    public void onMessageReceived(RemoteMessage remoteMessage) {
-        lastHandledIntent = null;
-        savedIntents.remove(remoteMessage.getMessageId());
+    public void handleIntent(Intent intent) {
+        Logger.W(TAG, "FCM: onHandleIntent()");
+        extractDataFromIntent(intent);
+        super.handleIntent(intent);
+    }
 
-        Logger.I(TAG, "FCM: onMessageReceived()");
-        Map<String, String> params = new HashMap<String, String>();
 
-        if (remoteMessage.getMessageId() != null) params.put("id", remoteMessage.getMessageId());
-        Logger.I(TAG, "FCM: id - " + remoteMessage.getMessageId());
+    void extractDataFromIntent(Intent intent){
 
-        if (remoteMessage.getFrom() != null) params.put("from", remoteMessage.getFrom());
-        Logger.I(TAG, "FCM: from - " + remoteMessage.getFrom());
+        Bundle bundle = intent.getExtras();
+        if (bundle != null) {
+            try{
 
-        if (remoteMessage.getTo() != null) params.put("to", remoteMessage.getTo());
-        Logger.I(TAG, "FCM: to - " + remoteMessage.getTo());
+                RemoteMessage remoteMessage = new RemoteMessage(bundle);
 
-        if (remoteMessage.getNotification() != null){
-            if (remoteMessage.getNotification().getBody() != null)  params.put("body", remoteMessage.getNotification().getBody());
-            Logger.I(TAG, "FCM: body - " + remoteMessage.getNotification().getBody());
+                if (remoteMessage.getMessageId() == null) return;
 
-            if (remoteMessage.getNotification().getTitle() != null) params.put("title", remoteMessage.getNotification().getTitle());
-            Logger.I(TAG, "FCM: title - " + remoteMessage.getNotification().getTitle());
+                Logger.I(TAG, "FCM: onMessageReceived()");
+                Map<String, String> params = new HashMap<String, String>();
 
-            if (remoteMessage.getNotification().getTag() != null) params.put("tag", remoteMessage.getNotification().getTag());
-            Logger.I(TAG, "FCM: tag - " + remoteMessage.getNotification().getTag());
-        }
 
-        try{
-            JSONObject jsonObject = new JSONObject(params);
+                if (remoteMessage.getMessageId() != null) params.put("id", remoteMessage.getMessageId());
+                Logger.I(TAG, "FCM: id - " + remoteMessage.getMessageId());
 
-            try {
-                jsonObject.put("data", new JSONObject(remoteMessage.getData()));
-                Logger.I(TAG, "FCM: data - " + remoteMessage.getData());
-            } catch (JSONException e) {
-                Logger.I(TAG, "FCM: jsonObject generation error");
-                e.printStackTrace();
-            }
+                if (remoteMessage.getFrom() != null) params.put("from", remoteMessage.getFrom());
+                Logger.I(TAG, "FCM: from - " + remoteMessage.getFrom());
 
-            Logger.W(TAG, "FCM: push message in JSON: " + jsonObject.toString());
+                if (remoteMessage.getTo() != null) params.put("to", remoteMessage.getTo());
+                Logger.I(TAG, "FCM: to - " + remoteMessage.getTo());
 
-            PushContract.handleMessage(ContextFactory.getContext(), jsonObject.toString(), FCMFacade.FCM_PUSH_CLIENT);
-        }catch(Exception e){
-            Logger.E(TAG, "FCM: can't create object for handleMessage");
-            e.printStackTrace();
-        }
-    }
+                if (remoteMessage.getNotification() != null){
+                    if (remoteMessage.getNotification().getBody() != null)  params.put("body", remoteMessage.getNotification().getBody());
+                    Logger.I(TAG, "FCM: body - " + remoteMessage.getNotification().getBody());
 
-   
+                    if (remoteMessage.getNotification().getTitle() != null) params.put("title", remoteMessage.getNotification().getTitle());
+                    Logger.I(TAG, "FCM: title - " + remoteMessage.getNotification().getTitle());
 
-    @Override
-    public void onDeletedMessages() {
-        Logger.W(TAG, "FCM: onDeletedMessages()");
-        
-    }
+                    if (remoteMessage.getNotification().getTag() != null) params.put("tag", remoteMessage.getNotification().getTag());
+                    Logger.I(TAG, "FCM: tag - " + remoteMessage.getNotification().getTag());
+                }
 
-    @Override
-    synchronized public void handleIntent(Intent intent) {
-        Logger.W(TAG, "FCM: onHandleIntent()");
-        savedService = this;
-        if (intent.getExtras() != null) {
-            for (String key : intent.getExtras().keySet()) {
-                Object value = intent.getExtras().get(key);
-                //Logger.W(TAG, "Key: " + key + " Value: " + value);
-                if (key.equals("google.message_id")){
-                    savedIntents.put((String) value, intent);
-                    lastHandledIntent = (String) value;
-                    Logger.W(TAG, "FCM: onHandleIntent() : message id captured");
+            
+                JSONObject jsonObject = new JSONObject(params);
+
+                try {
+                    jsonObject.put("data", new JSONObject(remoteMessage.getData()));
+                    Logger.I(TAG, "FCM: data - " + remoteMessage.getData());
+                } catch (JSONException e) {
+                    Logger.I(TAG, "FCM: jsonObject generation error");
+                    e.printStackTrace();
                 }
+
+                Logger.W(TAG, "FCM: push message in JSON: " + jsonObject.toString());
+
+                messagesQueue.add(jsonObject.toString());
+
+            }catch(Exception e){
+                Logger.W(TAG, "FCM: exception on extracting data from intent");
+                e.printStackTrace();
             }
+
+            handleMessagesQueue();
         }
-        super.handleIntent(intent);        
+
     }
 
-    public static void tryToHandleIntent(String value){
+    public static void handleMessagesQueue(){
         try{
-            if (savedService != null){
-                Logger.W(TAG, "FCM: tryToHandleIntent() - trying to handle intent");
-                if (savedIntents.containsKey(value)){
-                    savedService.handleIntent(savedIntents.get(value));
-                    Logger.W(TAG, "FCM: tryToHandleIntent() - intent handled");
-                }
+            while(messagesQueue.size() != 0){
+                Logger.W(TAG, "FCM: tryToHandleIntent() - trying to handle messages queue");
+                PushContract.handleMessage(ContextFactory.getContext(), messagesQueue.peek(), FCMFacade.FCM_PUSH_CLIENT);
+                messagesQueue.remove();
             }
         }catch(Exception e){
-            Logger.W(TAG, "FCM: tryToHandleIntent() - can't handle intent");
+            Logger.E(TAG, "FCM: can't handle the messages queue");
+            e.printStackTrace();
         }
     }
 
-
     static public void resume()
     {
-        if (lastHandledIntent != null){
-
-            Timer timerObj = new Timer();
-            TimerTask timerTaskObj = new TimerTask() {
-                public void run() {
-                    if (lastHandledIntent != null){
-                        tryToHandleIntent(lastHandledIntent);
-                    }
-                }
-            };
-            timerObj.schedule(timerTaskObj, 1000);
+        Timer timerObj = new Timer();
+        TimerTask timerTaskObj = new TimerTask() {
+            public void run() {
+                handleMessagesQueue();
+            }
+        };
+        timerObj.schedule(timerTaskObj, 1000);
+    }
 
-            
-        }
+    @Override
+    public void onNewToken(String token){
+        super.onNewToken(token);
+        Logger.W(TAG, "FCM: onNewToken: " + token);
+        ContextFactory.getContext().getSharedPreferences("FireBase", MODE_PRIVATE).edit().putString("token", token).apply();
+        FCMFacade.refreshToken();        
     }
 
 

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

@@ -74,22 +74,6 @@ public class FCMListener extends AbstractRhoListener{
     @Override
     public void onNewIntent(RhodesActivity activity, Intent intent) { 
         Logger.W("fcm", "FCM: onNewIntent");
-        if ((intent != null)&&(intent.getExtras() != null)) {
-        	try{
-	            for (String key : intent.getExtras().keySet()) {
-	                Object value = intent.getExtras().get(key);
-	                Logger.W(TAG, "Key: " + key + " Value: " + value);
-	                if (key.equals("google.message_id")){
-	                    FCMIntentService.tryToHandleIntent((String)value);
-	                }
-	            }
-	        }catch(Exception e){
-
-	        }
-        }else{
-            Logger.W(TAG, "New intent is null");
-        }
-        
     }
 
     @Override

data/lib/extensions/fcm-push/ext.yml

@@ -13,7 +13,7 @@ android:
   library_deps: [extras/google/google_play_services/libproject/google-play-services_lib]
   source_list: ext/android/ext_java.files
   maven_deps:
-  - 'com.google.firebase:firebase-messaging:11.0.2'
+  - 'com.google.firebase:firebase-messaging:21.1.0'
   adds: ext/android/res
 libraries: ['fcm-push']
 xml_api_paths: ext/fcm.xml

data/lib/extensions/gmaps/ext/platform/android/ApplicationManifestAdds.erb

@@ -1,3 +1,4 @@
 <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="<%=@apikey%>"/>
 <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
 <activity android:name='com.rhomobile.rhodes.gmaps.GMapActivity' android:windowSoftInputMode='stateAlwaysHidden' android:configChanges='orientation' android:screenOrientation='<%= @screenOrientation %>'/>
+<uses-library android:name="org.apache.http.legacy" android:required="false" />

data/lib/extensions/gmaps/ext/platform/android/src/com/rhomobile/rhodes/gmaps/GMapActivity.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -16,6 +16,7 @@ import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.UiSettings;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.CameraPosition;
@@ -45,7 +46,7 @@ import android.location.Geocoder;
 import android.os.Bundle;
 import android.os.IBinder;
 
-public class GMapActivity extends FragmentActivity {
+public class GMapActivity extends FragmentActivity implements OnMapReadyCallback {
     
     static class MarkerAdds {
         public String url;
@@ -117,8 +118,14 @@ public class GMapActivity extends FragmentActivity {
         setContentView(R.layout.gmaplayout);
         
         SupportMapFragment mapFragment = (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map);
-        
-        mMap = mapFragment.getMap();
+
+        mapFragment.getMapAsync(this);
+    }
+
+
+    @Override
+    public void onMapReady(GoogleMap googleMap){
+        mMap = googleMap;
         
         if ( null == mMap ) {
             Logger.E(TAG,"GoogleMap object is null from fragment. Finishing activity.");
@@ -298,6 +305,7 @@ public class GMapActivity extends FragmentActivity {
         geocoding.start();
     }
 
+
     @Override
     protected void onStart() {
         super.onStart();

data/lib/extensions/gmaps/ext.yml

@@ -13,4 +13,6 @@ android:
   library_deps: [extras/google/google_play_services/libproject/google-play-services_lib]
   
   #will work with newer SDKs
-  maven_deps: ['com.google.android.gms:play-services-maps:9.0.2']
+  maven_deps: 
+    - 'com.google.android.gms:play-services-maps:17.0.0'
+    - 'androidx.fragment:fragment:1.2.5'

data/platform/android/Rhodes/jni/src/MethodResultJni.cpp

@@ -421,6 +421,10 @@ void MethodResultJni::setRubyProcCallback(JNIEnv* env, jlong jRubyProc)
 
     env->SetLongField(m_jResult, s_fidRubyProcCallback, jRubyProc);
 
+    m_hasCallback = true;
+
+    rho_ruby_holdValue(jRubyProc);
+
     RAWTRACE("Callback has been set ^^^");
 }
 //----------------------------------------------------------------------------------------------------------------------

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java

@@ -70,8 +70,8 @@ import android.view.Window;
 import android.widget.FrameLayout;
 import android.util.Log;
 
-import android.support.v4.content.PermissionChecker;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.content.PermissionChecker;
+import androidx.core.app.ActivityCompat;
 
 public class RhodesActivity extends BaseActivity implements SplashScreen.SplashScreenListener, ActivityCompat.OnRequestPermissionsResultCallback {
 	
@@ -636,7 +636,7 @@ public class RhodesActivity extends BaseActivity implements SplashScreen.SplashS
 		mHandler.postDelayed(r, delay);
 	}
 	
-	public SplashScreen getSplashScreen() {
+	public SplashScreen getRhodesSplashScreen() {
 		return mSplashScreen;
 	}
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -436,7 +436,7 @@ public class RhodesService extends Service {
 
         try {
             // Show splash screen only if we have active activity
-            SplashScreen splashScreen = RhodesActivity.safeGetInstance().getSplashScreen();
+            SplashScreen splashScreen = RhodesActivity.safeGetInstance().getRhodesSplashScreen();
             if (splashScreen != null) {
                 splashScreen.start();
             }
@@ -1197,9 +1197,9 @@ public class RhodesService extends Service {
 		//min API = 24
 		//builder.setCustomContentView(expandedView);
 		Intent intent = new Intent(ACTION_ASK_CANCEL_DOWNLOAD);
-		builder.setContentIntent(PendingIntent.getBroadcast(context, 0, intent, 0));
+		builder.setContentIntent(PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_IMMUTABLE));
 		intent = new Intent(ACTION_CANCEL_DOWNLOAD);
-		builder.setDeleteIntent(PendingIntent.getBroadcast(context, 0, intent, 0));
+		builder.setDeleteIntent(PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_IMMUTABLE));
 
 		mNM.notify(DOWNLOAD_PACKAGE_ID, builder.build() );
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/StatusNotification.java

@@ -47,7 +47,7 @@ public class StatusNotification
 	public static Notification simpleNotification(String tag, int notificationId, Context ctx, Intent intent, String title, String text)
 	{
 		Notification notification = makeNotification(text);
-		PendingIntent contentIntent = PendingIntent.getActivity(ctx, 0, intent, 0);
+		PendingIntent contentIntent = PendingIntent.getActivity(ctx, 0, intent, PendingIntent.FLAG_IMMUTABLE);
 		
 		notification.setLatestEventInfo(ctx, title, text, contentIntent);
 		notification.defaults = Notification.DEFAULT_ALL;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java

@@ -166,9 +166,9 @@ public class GeoLocation {
 		return false;
 	}
 	
-	public static double getLatitude() {
-		onUpdateLocation();
+	public static double getLatitude() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getLatitude");
 			return ourLatitude;
@@ -179,9 +179,9 @@ public class GeoLocation {
 		return 0.0;
 	}
 	
-	public static double getSpeed() {
-		onUpdateLocation();
+	public static double getSpeed() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getSpeed");
 			return ourSpeed;
@@ -192,9 +192,9 @@ public class GeoLocation {
 		return 0.0;
 	}
 	
-	public static int getSatellities() {
-		onUpdateLocation();
+	public static int getSatellities() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getSatellities");
 			return ourSatellities;
@@ -206,9 +206,9 @@ public class GeoLocation {
 	}
 	
 
-	public static double getLongitude() {
-		onUpdateLocation();
+	public static double getLongitude() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getLongitude");
 			return ourLongitude;
@@ -219,9 +219,9 @@ public class GeoLocation {
 		return 0.0;
 	}
 	
-	public static double getAltitude() {
-		onUpdateLocation();
+	public static double getAltitude() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getAltitude");
 			return ourAltitude;
@@ -232,9 +232,9 @@ public class GeoLocation {
 		return 0.0;
 	}
 	
-	public static float getAccuracy() {
-		onUpdateLocation();
+	public static float getAccuracy() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getAccuracy");
 			return (float)ourAccuracy;
@@ -245,9 +245,9 @@ public class GeoLocation {
 		return 0;
 	}
 
-	public static boolean isKnownPosition() {
-		onUpdateLocation();
+	public static boolean isKnownPosition() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "isKnownPosition");
 			return ourIsKnownPosition;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -87,13 +87,17 @@ public class GeoLocationImpl {
 				}
 			}
 			if(this.provider != null) {
-				if (exMode) {
-					this.manager.requestLocationUpdates(providerName, minTime, (float)minDistance, this);
-				}
-				else {
-					this.manager.requestLocationUpdates(providerName, UPDATE_PERIOD_IN_MILLISECONDS, 0, this, Looper.getMainLooper());
+				try {
+					if (exMode) {
+						this.manager.requestLocationUpdates(providerName, minTime, (float)minDistance, this);
+					}
+					else {
+						this.manager.requestLocationUpdates(providerName, UPDATE_PERIOD_IN_MILLISECONDS, 0, this, Looper.getMainLooper());
+					}
+					available = this.manager.isProviderEnabled(this.providerName);
+				} catch ( SecurityException e ) {
+					Logger.E(TAG,e);					
 				}
-				available = this.manager.isProviderEnabled(this.providerName);
 			}
 			return available;
 		}
@@ -102,7 +106,7 @@ public class GeoLocationImpl {
 			available = false;
 			if (this.provider != null && this.manager != null) {
 				Logger.T(TAG, "Unregistering location listener for '" + this.providerName + "'.");
-				this.manager.removeUpdates(this);
+				this.manager.removeUpdates(this);				
 				this.provider = null;
 				return true;
 			}
@@ -112,8 +116,13 @@ public class GeoLocationImpl {
 		
 		void requestLastLocation() {
 			if (this.provider != null && this.manager != null) {
-				Location location = this.manager.getLastKnownLocation(this.providerName);
-				onLocationChanged(location);
+				try
+				{				
+					Location location = this.manager.getLastKnownLocation(this.providerName);
+					onLocationChanged(location);
+				} catch ( SecurityException e ) {
+					Logger.E(TAG,e);	
+				}				
 			}
 		}
 		

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality26.java

@@ -26,7 +26,7 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.app.Notification.Builder;
 import android.content.Context;
 import android.app.NotificationManager;