rhodes 7.4.1 → 7.6.0

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java

@@ -12,7 +12,7 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
     public IRhoWebView onCreateWebView(IRhoExtManager extManager, int tabIndex) {
         return null;
     }
-    
+
     @Override
     public boolean onWebViewCreated(IRhoExtManager extManager, IRhoWebView ext, boolean res) {
         return res;
@@ -64,6 +64,17 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
         return res;
     }
 
+    @Override
+    public boolean onGoBack(IRhoExtManager extManager, String current_url, String back_url, IRhoWebView ext, boolean res) {
+        return res;
+    }
+
+    @Override
+    public boolean onGoForward(IRhoExtManager extManager, String current_url, String forward_url, IRhoWebView ext, boolean res) {
+        return res;
+    }
+
+
     @Override
     public boolean onAlert(IRhoExtManager extManager, String message, IRhoWebView ext, IAlertResult alertResult, boolean res) {
         return res;
@@ -113,7 +124,7 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
     public void onAppActivate(IRhoExtManager extManager, boolean bActivate) {
     }
 
-    
+
     @Override
     public boolean startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoWebView ext, boolean res) {
         return res;
@@ -133,7 +144,7 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
     public boolean onNewConfig(IRhoExtManager extManager, IRhoConfig config, String name, boolean res) {
         return res;
     }
-    
+
     @Override
     public String onGetProperty(IRhoExtManager extManager, String name) {
         return null;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java

@@ -3,6 +3,8 @@ package com.rhomobile.rhodes.extmanager;
 import android.content.Context;
 import android.view.KeyEvent;
 import android.view.View;
+import android.graphics.Rect;
+
 
 public interface IRhoExtManager {
 
@@ -103,6 +105,8 @@ public interface IRhoExtManager {
      * @param requestCode value to erase from map
      */
     void dropActivityResultRequestCode(int requestCode);
+
+    void onInputMethod(View view, boolean enabled, String type, Rect area);
 }
 
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java

@@ -36,6 +36,8 @@ public interface IRhoExtension {
     boolean onNavigateProgress(IRhoExtManager extManager, String url, int pos, int total, IRhoWebView ext, boolean res);
     boolean onNavigateComplete(IRhoExtManager extManager, String url, IRhoWebView ext, boolean res);
     boolean onDocumentComplete(IRhoExtManager extManager, String url, IRhoWebView ext, boolean res);
+    boolean onGoBack(IRhoExtManager extManager, String current_url, String back_url, IRhoWebView ext, boolean res);
+    boolean onGoForward(IRhoExtManager extManager, String current_url, String forward_url, IRhoWebView ext, boolean res);
     boolean onAlert(IRhoExtManager extManager, String message, IRhoWebView ext, IAlertResult alertResult, boolean res);
     boolean onConfirm(IRhoExtManager extManager, String message, IRhoWebView ext, IAlertResult confirmResult, boolean res);
     boolean onPrompt(IRhoExtManager extManager, String message, String defaultResponse, IRhoWebView ext, IPromptResult promptResult, boolean res);
@@ -45,16 +47,15 @@ public interface IRhoExtension {
     boolean onConsole(IRhoExtManager extManager, String message, IRhoWebView ext, boolean res);
     boolean onInputMethod(IRhoExtManager extManager, boolean enabled, String type, Rect area, IRhoWebView ext, boolean res);
     boolean onNavigateError(IRhoExtManager extManager, String url, LoadErrorReason reason, IRhoWebView ext, boolean res);
-    boolean onAuthRequest(IRhoExtManager extManager, IAuthRequest request, IRhoWebView ext, boolean res); 
+    boolean onAuthRequest(IRhoExtManager extManager, IAuthRequest request, IRhoWebView ext, boolean res);
 
     void onAppActivate(IRhoExtManager extManager, boolean bActivate);
 
-    
-    boolean startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoWebView ext, boolean res); 
+
+    boolean startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoWebView ext, boolean res);
     boolean stopLocationUpdates(IRhoExtManager extManager, IRhoWebView ext, boolean res);
 
     boolean onNewConfig(IRhoExtManager extManager, IRhoConfig config, String name, boolean res);
 
     String onGetProperty(IRhoExtManager extManager, String name);
 }
-

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java

@@ -63,7 +63,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
     private IRhoWebView makeDefExtData(View view) {
         return RhodesActivity.safeGetInstance().getMainView().getWebView(view);
     }
-    
+
     private static native void nativeRequireRubyFile(String path);
     static native String nativeJSCallEntryPoint(String query);
 
@@ -77,22 +77,22 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             throw new IllegalArgumentException("Cannot get " + className + "." + idName, e);
         }
     }
-    
+
 
     public RhoExtManagerImpl() {
         mConfigs.put("rhoconfig", new RhoConf.RhoConfig());
     }
-    
+
     @Override
     public int getActivityResultNextRequestCode(IRhoListener listener) {
-        
+
         synchronized (mLastActivityRequestCode) {
             ++mLastActivityRequestCode;
             mActivityResultListeners.append(mLastActivityRequestCode.intValue(), listener);
         }
         return mLastActivityRequestCode;
     }
-    
+
     @Override
     public void dropActivityResultRequestCode(int requestCode) {
         synchronized (mLastActivityRequestCode) {
@@ -121,7 +121,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             mListeners.add(listener);
         }
     }
-    
+
 
     @Override
     public void setConfig(String name, IRhoConfig config) {
@@ -206,13 +206,13 @@ public class RhoExtManagerImpl implements IRhoExtManager {
 
     @Override
     public void stopNavigate(final IRhoExtension.LoadErrorReason reason) {
-        
-        
+
+
         //WebView.stopNavigate();
-        
+
         final RhodesActivity activity = RhodesActivity.safeGetInstance();
         final MainView mainView = activity.getMainView();
-        
+
         // In case stopNavigate is called from onBeforeNavigate
         // we must be aware that all other parties (extensions) finish to proceed current event
         activity.post(new Runnable() {
@@ -231,7 +231,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
     public void historyBack() {
         WebView.navigateBack();
     }
-    
+
     @Override
     public boolean onKey(int keyCode, KeyEvent event){
     	for(IRhoListener listener: mKeyListeners){
@@ -254,7 +254,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
 
     @Override
     public void setFullScreen(boolean fullScreen) {
-        
+
     }
 
     @Override
@@ -302,7 +302,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         return RhodesService.getBuildConfig(name);
     }
 
-    /** 
+    /**
      * @return is extension allowed to navigate to its start page
      */
     @Override
@@ -351,24 +351,24 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
         return res;
     }
-    
+
     public void enableLogLevelError(boolean enabled) {
         Logger.I(TAG, "RE Error log: " + enabled);
         mLogError = enabled;
     }
-    public void enableLogLevelWarning(boolean enabled) { 
+    public void enableLogLevelWarning(boolean enabled) {
         Logger.I(TAG, "RE Warning log: " + enabled);
-        mLogWarning = enabled; 
+        mLogWarning = enabled;
     }
-    public void enableLogLevelInfo(boolean enabled) { 
+    public void enableLogLevelInfo(boolean enabled) {
         Logger.I(TAG, "RE Info log: " + enabled);
         mLogInfo = enabled;
     }
-    public void enableLogLevelUser(boolean enabled) { 
+    public void enableLogLevelUser(boolean enabled) {
         Logger.I(TAG, "RE User log: " + enabled);
         mLogUser = enabled;
     }
-    public void enableLogLevelDebug(boolean enabled) { 
+    public void enableLogLevelDebug(boolean enabled) {
         Logger.I(TAG, "RE Debug log: " + enabled);
         mLogDebug = enabled;
     }
@@ -398,7 +398,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             Logger.E(tag, msg);
     }
 
-    
+
     public void onSetPropertiesData(View view,String propId, String data, int position, int total) {
         IRhoWebView rhoWebView = makeDefExtData(view);
         synchronized (mExtensions) {
@@ -409,7 +409,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
 
-    private boolean isFirstNavigate() { 
+    private boolean isFirstNavigate() {
             return mFirstNavigate;
     }
 
@@ -475,6 +475,41 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
 
+    public void onGoBack(View view, String current_url, String back_url) {
+        IRhoWebView rhoWebView = null;
+        try {
+            int tabIndex = RhodesActivity.safeGetInstance().getMainView().getWebViewTab(view);
+            rhoWebView = RhodesActivity.safeGetInstance().getMainView().getWebView(tabIndex);
+        }
+        catch(IllegalArgumentException ex) {
+            Logger.W(TAG, "Cannot get webView object for onGoBack event: WebView object is destroyed.");
+        }
+        synchronized (mExtensions) {
+            boolean res = false;
+            for (IRhoExtension ext : mExtensions.values()) {
+                res = ext.onGoBack(this, current_url, back_url, rhoWebView, res);
+            }
+        }
+    }
+
+    public void onGoForward(View view, String current_url, String forward_url) {
+        IRhoWebView rhoWebView = null;
+        try {
+            int tabIndex = RhodesActivity.safeGetInstance().getMainView().getWebViewTab(view);
+            rhoWebView = RhodesActivity.safeGetInstance().getMainView().getWebView(tabIndex);
+        }
+        catch(IllegalArgumentException ex) {
+            Logger.W(TAG, "Cannot get webView object for onGoForward event: WebView object is destroyed.");
+        }
+        synchronized (mExtensions) {
+            boolean res = false;
+            for (IRhoExtension ext : mExtensions.values()) {
+                res = ext.onGoForward(this, current_url, forward_url, rhoWebView, res);
+            }
+        }
+    }
+
+
     public void onAppActivate(boolean isActivate) {
         Logger.T(TAG, "onAppActivate: " + isActivate);
         synchronized (mExtensions) {
@@ -562,12 +597,13 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
     
+
     public void onAuthRequest(View view, final IRhoExtension.IAuthRequest request) {
         final IRhoWebView rhoWebView = makeDefExtData(view);
         boolean res = false;
         synchronized (mExtensions) {
             for (IRhoExtension ext : mExtensions.values()) {
-                res = ext.onAuthRequest(this, request, rhoWebView, res);
+                res = res || ext.onAuthRequest(this, request, rhoWebView, res);
             }
         }
         if (!res) {
@@ -580,36 +616,36 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             realmView.setPadding(10, 10, 10, 10);
 
             TableLayout formLayout = new TableLayout(ctx);
-            
+
             TableRow userRow = new TableRow(ctx);
-            
+
             TextView userPrompt = new TextView(ctx, null, android.R.style.Widget_TextView);
             userPrompt.setText("Name:");
             userPrompt.setPadding(0, 0, 10, 0);
             final EditText userField = new EditText(ContextFactory.getUiContext());
             userField.setSingleLine();
             userField.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-            
+
             userRow.addView(userPrompt);
             userRow.addView(userField);
             //userRow.setPadding(5, 0, 0, 5);
             formLayout.addView(userRow);
-            
+
             TableRow passRow = new TableRow(ctx);
-            
+
             TextView passPrompt = new TextView(ctx, null, android.R.style.Widget_TextView);
             passPrompt.setText("Password:");
             passPrompt.setPadding(0, 0, 10, 0);
             final EditText passField = new EditText(ContextFactory.getUiContext());
             passField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
             passField.setTransformationMethod(PasswordTransformationMethod.getInstance());
-            
+
             passRow.addView(passPrompt);
             passRow.addView(passField);
             //passRow.setPadding(5, 0, 0, 5);
             formLayout.addView(passRow);
             formLayout.setColumnStretchable(1, true);
-            
+
             mainLayout.addView(realmView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
             mainLayout.addView(formLayout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
 
@@ -742,7 +778,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             final TextView promptView = new TextView(ContextFactory.getUiContext(), null, android.R.style.Widget_TextView);
             promptView.setPadding(10, 10, 10, 10);
             final EditText input = new EditText(ContextFactory.getUiContext());
-            
+
             layout.addView(promptView, 0, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
             layout.addView(input, 1, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
 
@@ -840,7 +876,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
     {
     	startKeyEventUpdates(listener, false);
     }
-    
+
     @Override
     public void startKeyEventUpdates(IRhoListener listener, boolean makeImportant)
     {
@@ -855,7 +891,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
 			}
 		}
     }
-    
+
     @Override
     public void stopKeyEventUpdates(IRhoListener listener)
     {
@@ -875,11 +911,11 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
         return null;
     }
-    
+
     public void createRhoListeners() {
         for (String classname: RhodesStartupListeners.ourRunnableList) {
             if (classname.length() == 0) continue;
-            
+
             Class<? extends IRhoListener> klass = null;
             try {
                 klass = Class.forName(classname).asSubclass(IRhoListener.class);
@@ -911,6 +947,12 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
         activity.getMainView().setWebView(createWebView(activity, 0), 0);
     }
+
+    public void doFullResetWebViewByCreateNewOne() {
+        RhodesActivity.safeGetInstance().getMainView().setWebView(createWebView(RhodesActivity.safeGetInstance(), 0), 0);
+    }
+
+
     public void onStartActivity(RhodesActivity activity) {
         for (IRhoListener listener: mListeners) {
             listener.onStart(activity);
@@ -981,19 +1023,19 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             listener.onConfigurationChanged(activity, newConfig);
         }
     }
-    
+
     public void onEBLicenseVisible() {
         for (IRhoListener listener: mListeners) {
             listener.onEBLicenseVisible();
         }
     }
-    
+
     public void onEBLicenseHidden() {
         for (IRhoListener listener: mListeners) {
             listener.onEBLicenseHidden();
         }
     }
-    
+
     public void onEBLicenseDestroyed() {
         for (IRhoListener listener: mListeners) {
             listener.onEBLicenseDestroyed();
@@ -1001,4 +1043,3 @@ public class RhoExtManagerImpl implements IRhoExtManager {
     }
 
 }
-

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

@@ -69,7 +69,12 @@ public class GeoLocation {
 				ourSpeed = loc.getSpeed();
 				//The  way of getiing satellites is changed
 				//ourSatellities = getImpl().getSatellities();
-				ourSatellities = loc.getExtras().getInt("satellites");
+				android.os.Bundle extras = loc.getExtras();
+				if (extras != null) {
+					ourSatellities = extras.getInt("satellites");
+				} else {
+					ourSatellities = 0;
+				}
 				ourIsKnownPosition = true;
 			}
 			else {
@@ -166,9 +171,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 +184,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 +197,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 +211,9 @@ public class GeoLocation {
 	}
 	
 
-	public static double getLongitude() {
-		onUpdateLocation();
+	public static double getLongitude() {		
 		try {
+			onUpdateLocation();
 			checkState();
 			Logger.T(TAG, "getLongitude");
 			return ourLongitude;
@@ -219,9 +224,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 +237,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 +250,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/kioskservices/CallReceiver.java

@@ -0,0 +1,22 @@
+package com.rhomobile.rhodes.kioskservices;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
+import android.widget.Toast;
+
+import java.net.URISyntaxException;
+
+public class CallReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        TelephonyManager telephonyManager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
+        TelecomManager telecomManager = (TelecomManager)context.getSystemService(Context.TELECOM_SERVICE);
+
+        if(KioskManager.getKioskModeStatus() && telephonyManager.getCallState() == TelephonyManager.CALL_STATE_RINGING){
+            telecomManager.endCall();
+        }
+    }
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/IKioskMode.java

@@ -0,0 +1,11 @@
+package com.rhomobile.rhodes.kioskservices;
+
+public interface IKioskMode {
+    public void startKioskMode(boolean use_overlay);
+    public void stopKioskMode();
+    public boolean isKioskMode();
+    public void startOverlay();
+    public void stopOverlay();
+    public boolean isAllPermissions();
+    public void showPermissionsList();
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/kioskservices/KioskManager.java

@@ -0,0 +1,18 @@
+package com.rhomobile.rhodes.kioskservices;
+
+import android.util.Log;
+
+
+public class KioskManager {
+    private static boolean isKioskMode = false;
+
+    public static void setKioskMode(Boolean state){
+        Log.d("myLog", "Kiosk status: "+(state?"true":"false"));
+        isKioskMode = state;
+    }
+
+    public static Boolean getKioskModeStatus(){
+        Log.d("myLog", "Kiosk status: "+(isKioskMode?"true":"false"));
+        return isKioskMode;
+    }
+}