rhodes 3.3.3.beta.4 → 3.3.3

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

@@ -1,5 +1,7 @@
 package com.rhomobile.rhodes.extmanager;
 
+import java.util.Map;
+
 import android.view.View;
 
 public interface IRhoExtManager {
@@ -7,6 +9,8 @@ public interface IRhoExtManager {
     void registerExtension(String strName, IRhoExtension ext);
     IRhoExtension getExtByName(String strName);
 
+    void addRhoListener(IRhoListener listener);
+
     /**
      * Web view getter. In case of Motorola WebKit is used it returns object which may be directly casted to NeonEkihView
      * @return Current web view instance from MainView
@@ -35,18 +39,32 @@ public interface IRhoExtManager {
     //boolean existsJavascript(String jsFunction);
     void executeJavascript(String jsFunction);
 
-    //void rhoLog(int nSeverity,String szModule,String szMsg,String szFile, int nLine);
     String getCurrentUrl();
     void stopNavigate();
     void historyForward();
     void historyBack();
     void refreshPage(boolean bFromCache);
     void quitApp();
+    void setFullScreen(boolean fullScreen);
     void minimizeApp();
     void restoreApp();
     //void resizeBrowserWindow(RECT rc);
     void zoomPage(float fZoom);
     void zoomText(int nZoom);
+    
+    /**
+     * Handler to notify RhoExtManager about new configuration value
+     * @param name - configuration parameter name
+     * @param value - configuration parameter value
+     * @return true if value is processed by RhoExtManager
+     */
+    boolean onNewConfigValue(String name, String value);
+    
+    /**
+     * Handler to notify RhoExtManager that new configuration is going to apply
+     * @return true if it is allowed for extension to navigate start page itself
+     */
+    boolean onStartNewConfig();
 
 }
 

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

@@ -1,5 +1,7 @@
 package com.rhomobile.rhodes.extmanager;
 
+import android.graphics.Rect;
+
 public interface IRhoExtension {
 
     void onSetPropertiesData(IRhoExtManager extManager, String propId, String data, int pos, int total, IRhoExtData ext);
@@ -14,14 +16,20 @@ public interface IRhoExtension {
     //long onSIPState(IRhoExtManager extManager, boolean bSIPState, IRhoExtData ext);
     void onAlert(IRhoExtManager extManager, String message, IRhoExtData ext);
     void onConfirm(IRhoExtManager extManager, String message, IRhoExtData ext);
+    void onPrompt(IRhoExtManager extManager, String message, String defaultResponse, IRhoExtData ext);
     void onSelect(IRhoExtManager extManager, String[] items, int selected, IRhoExtData ext);
     void onStatus(IRhoExtManager extManager, String status, IRhoExtData ext);
     void onTitle(IRhoExtManager extManager, String title, IRhoExtData ext);
     void onConsole(IRhoExtManager extManager, String message, IRhoExtData ext);
-    void onInputMethod(IRhoExtManager extManager, boolean enabled, IRhoExtData ext);
+    void onInputMethod(IRhoExtManager extManager, boolean enabled, String type, Rect area, IRhoExtData ext);
     void onNavigateError(IRhoExtManager extManager, String url, IRhoExtData ext);
 
     void onAppActivate(IRhoExtManager extManager, boolean bActivate);
 
+    //EkiohLocation getCachedLocation(IRhoExtManager extManager, IRhoExtData ext);
+    void startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoExtData ext); 
+    void stopLocationUpdates(IRhoExtManager extManager, IRhoExtData ext);
+    void onAuthRequired(IRhoExtManager extManager, String type, String url, String realm, IRhoExtData ext); 
+
 }
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/{RhodesActivityListener.java → extmanager/IRhoListener.java}

@@ -24,19 +24,23 @@
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
-package com.rhomobile.rhodes;
+package com.rhomobile.rhodes.extmanager;
 
+import com.rhomobile.rhodes.RhodesActivity;
+
+import android.app.Dialog;
 import android.content.Intent;
 
-public interface RhodesActivityListener {
-	
-	void onCreate(RhodesActivity activity, Intent intent);
-	void onStart(RhodesActivity activity);
-	void onResume(RhodesActivity activity);
-	void onPause(RhodesActivity activity);
-	void onStop(RhodesActivity activity);
-	void onDestroy(RhodesActivity activity);
-	void onNewIntent(RhodesActivity activity, Intent intent);
-	
-	void onRhodesActivityStartup(RhodesActivity activity);
+public interface IRhoListener {
+
+    void onCreate(RhodesActivity activity, Intent intent);
+    void onStart(RhodesActivity activity);
+    void onResume(RhodesActivity activity);
+    void onPause(RhodesActivity activity);
+    void onStop(RhodesActivity activity);
+    void onDestroy(RhodesActivity activity);
+    void onNewIntent(RhodesActivity activity, Intent intent);
+    Dialog onCreateDialog(RhodesActivity activity, int id/*, Bundle args*/);
+
+    void onCreateApplication(IRhoExtManager extManager);
 }

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

@@ -1,7 +1,6 @@
 package com.rhomobile.rhodes.extmanager;
 
 public class RhoExtManager extends Object {
-
     private static RhoExtManagerImpl ourRhoExtManager = null;
 
     public static RhoExtManagerImpl getImplementationInstance() {
@@ -11,8 +10,71 @@ public class RhoExtManager extends Object {
         return ourRhoExtManager;
     }
 
+    /**
+     * Gets resource id.
+     * For example to get R.string.app_name value call getResourceId("string.app_name")
+     * @param name - symbolic name of resource as it referenced at R class
+     * @return resource id
+     */
+    public static int getResourceId(String name) {
+        String[] nameComponents = name.split("\\.", 2);
+        if (nameComponents.length == 2) {
+            return RhoExtManagerImpl.getResId(nameComponents[0], nameComponents[1]);
+        }
+        throw new IllegalArgumentException(name);
+    }
+
+    /**
+     * Gets resource id.
+     * For example to get R.string.app_name value call getResourceId("string", "app_name")
+     * @param className - symbolic name of R sub class containing an id
+     * @param idName - symbolic name of field in the sub class
+     * @return resource id
+     */
+    public static int getResourceId(String className, String idName) {
+        return RhoExtManagerImpl.getResId(className, idName);
+    }
+    /**
+     * @return IRhoExtManager instance
+     */
     public static IRhoExtManager getInstance() {
         return getImplementationInstance();
     }
 
+    /**
+     * Convenient way to print trace message to rhodes log
+     * @param tag - log source
+     * @param msg - log message
+     */
+    public static void logT(String tag, String msg) {
+        getImplementationInstance().logT(tag, msg);
+    }
+
+    /**
+     * Convenient way to print info message to rhodes log
+     * @param tag - log source
+     * @param msg - log message
+     */
+    public static void logI(String tag, String msg) {
+        getImplementationInstance().logI(tag, msg);
+    }
+
+    /**
+     * Convenient way to print warning message to rhodes log
+     * @param tag - log source
+     * @param msg - log message
+     */
+    public static void logW(String tag, String msg) {
+        getImplementationInstance().logW(tag, msg);
+    }
+
+    /**
+     * Convenient way to print error message to rhodes log
+     * @param tag - log source
+     * @param msg - log message
+     */
+    public static void logE(String tag, String msg) {
+        getImplementationInstance().logE(tag, msg);
+    }
+
 }

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

@@ -1,18 +1,40 @@
 package com.rhomobile.rhodes.extmanager;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Hashtable;
 
+import android.app.Dialog;
+import android.content.Intent;
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.R;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.WebView;
+import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
+import com.rhomobile.rhodes.util.Utils;
 
 public class RhoExtManagerImpl implements IRhoExtManager {
     private static final String TAG = RhoExtManagerImpl.class.getSimpleName();
 
-	private Hashtable<String, IRhoExtension> mExtensions;
+    private Hashtable<String, IRhoExtension> mExtensions = new Hashtable<String, IRhoExtension>();
+    private ArrayList<IRhoListener> mListeners = new ArrayList<IRhoListener>();
+    private Object mLicense;
+    private boolean mFirstNavigate = true;
+    private boolean mLogError = true;
+    private boolean mLogWarning = true;
+    private boolean mLogInfo = true;
+    private boolean mLogUser = true;
+    private boolean mLogDebug = true;
 
     private IRhoExtData makeDefExtData(View view) {
         return new RhoExtDataImpl(view, RhodesActivity.safeGetInstance().getMainView().activeTab());
@@ -20,10 +42,17 @@ public class RhoExtManagerImpl implements IRhoExtManager {
     
     private static native void nativeRequireRubyFile(String path);
 
-	public RhoExtManagerImpl() {
-		mExtensions = new Hashtable<String, IRhoExtension>();
-	}
-	
+    static int getResId(String className, String idName) {
+        className = R.class.getCanonicalName() + "$" + className;
+        try {
+            Class<?> rClass = Class.forName(className);
+            Field field = rClass.getDeclaredField(idName);
+            return field.getInt(null);
+        } catch (Throwable e) {
+            throw new IllegalArgumentException("Cannot get " + className + "." + idName, e);
+        }
+    }
+
 	@Override
 	public IRhoExtension getExtByName(String strName) {
 	    synchronized (mExtensions) {
@@ -42,14 +71,23 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
 
+    @Override
+    public void addRhoListener(IRhoListener listener) {
+        if (!mListeners.contains(listener)) {
+            mListeners.add(listener);
+        }
+    }
+
     @Override
 	public View getWebView() {
-        return RhodesActivity.safeGetInstance().getMainView().getWebView(WebView.activeTab()).getView();
+        MainView mainView = RhodesActivity.safeGetInstance().getMainView();
+        return mainView != null ? mainView.getWebView(mainView.activeTab()).getView() : null;
     }
 
     @Override
     public View getTopView() {
-        return RhodesActivity.safeGetInstance().getMainView().getView();
+        MainView mainView = RhodesActivity.safeGetInstance().getMainView();
+        return mainView != null ? mainView.getView() : null;
     }
 
     @Override
@@ -91,7 +129,8 @@ public class RhoExtManagerImpl implements IRhoExtManager {
 
     @Override
     public String getCurrentUrl() {
-        return RhodesActivity.safeGetInstance().getMainView().currentLocation(RhodesActivity.safeGetInstance().getMainView().activeTab());
+        MainView mainView = RhodesActivity.safeGetInstance().getMainView();
+        return mainView != null ? mainView.currentLocation(mainView.activeTab()) : "";
     }
 
     @Override
@@ -119,6 +158,11 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         RhodesService.exit();
     }
 
+    @Override
+    public void setFullScreen(boolean fullScreen) {
+        
+    }
+
     @Override
     public void minimizeApp() {
         // TODO Auto-generated method stub
@@ -131,12 +175,12 @@ public class RhoExtManagerImpl implements IRhoExtManager {
 
     @Override
     public void zoomPage(float fZoom) {
-        // TODO Auto-generated method stub
+        WebView.setZoom((int)(fZoom * 100));
     }
 
     @Override
     public void zoomText(int nZoom) {
-        // TODO Auto-generated method stub
+        WebView.setTextZoom(nZoom);
     }
 
     @Override
@@ -144,10 +188,68 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         return RhodesService.getBuildConfig(name);
     }
 
+    /** 
+     * @return is extension allowed to navigate to its start page
+     */
+    @Override
+    public boolean onStartNewConfig() {
+        return Capabilities.SHARED_RUNTIME_ENABLED;
+    }
 
+    /**
+     * @param name - parameter name
+     * @param value - parameter value
+     * @return is parameter accepted by rhodes platform
+     */
+    @Override
+    public boolean onNewConfigValue(String name, String value) {
+        return false;
+    }
     //-----------------------------------------------------------------------------------------------------------------
     // Rhodes implementation related methods are below
 
+    public void enableLogLevelError(boolean enabled) {
+        Log.i(TAG, "RE Error log: " + enabled);
+        mLogError = enabled;
+    }
+    public void enableLogLevelWarning(boolean enabled) { 
+        Log.i(TAG, "RE Warning log: " + enabled);
+        mLogWarning = enabled; 
+    }
+    public void enableLogLevelInfo(boolean enabled) { 
+        Log.i(TAG, "RE Info log: " + enabled);
+        mLogInfo = enabled;
+    }
+    public void enableLogLevelUser(boolean enabled) { 
+        Log.i(TAG, "RE User log: " + enabled);
+        mLogUser = enabled;
+    }
+    public void enableLogLevelDebug(boolean enabled) { 
+        Log.i(TAG, "RE Debug log: " + enabled);
+        mLogDebug = enabled;
+    }
+
+    void logT(String tag, String msg) {
+        if (mLogDebug)
+            Logger.I(tag, msg);
+    }
+
+    void logI(String tag, String msg) {
+        if (mLogInfo || mLogUser)
+            Logger.I(tag, msg);
+    }
+
+    void logW(String tag, String msg) {
+        if (mLogWarning)
+            Logger.W(tag, msg);
+    }
+
+    void logE(String tag, String msg) {
+        if (mLogError)
+            Logger.E(tag, msg);
+    }
+
+    
     public void onSetPropertiesData(View view,String propId, String data, int position, int total) {
         synchronized (mExtensions) {
             for (IRhoExtension ext : mExtensions.values()) {
@@ -162,6 +264,30 @@ public class RhoExtManagerImpl implements IRhoExtManager {
                 ext.onBeforeNavigate(this, url, makeDefExtData(view));
             }
         }
+        if(mFirstNavigate) {
+            if(Capabilities.MOTOROLA_ENABLED) {
+                PerformOnUiThread.exec(new Runnable() {
+                    @SuppressWarnings("deprecation")
+                    @Override
+                    public void run() {
+                        Logger.I(TAG, "Init license now");
+                        try {
+                            RhodesActivity activity = RhodesActivity.safeGetInstance();
+                            LayoutInflater inflater = activity.getLayoutInflater();
+                            View licenseView = inflater.inflate(getResId("layout", "license"), null);  
+                            activity.addContentView(licenseView, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT));
+                            Class<?> licenseClass = Class.forName("com.motorolasolutions.rhoelements.License");
+                            Constructor<?> licenseCtor = licenseClass.getConstructor();
+                            mLicense = licenseCtor.newInstance();
+                        } catch(Throwable e) {
+                            Logger.E(TAG, e);
+                            Logger.T(TAG, "No motorola runtime licensing");
+                        }
+                    }
+                });
+            }
+            mFirstNavigate = false;
+        }
     }
 
     public void onNavigateComplete(View view, String url) {
@@ -204,10 +330,10 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
 
-    public void onInputMethod(View view, boolean enabled) {
+    public void onInputMethod(View view, boolean enabled, String type, Rect area) {
         synchronized (mExtensions) {
             for (IRhoExtension ext : mExtensions.values()) {
-                ext.onInputMethod(this, enabled, makeDefExtData(view));
+                ext.onInputMethod(this, enabled, type, area, makeDefExtData(view));
             }
         }
     }
@@ -244,10 +370,10 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         }
     }
 
-    public void onPrompt(View view, String prompt, String arg2) {
+    public void onPrompt(View view, String prompt, String defaultResponse) {
         synchronized (mExtensions) {
             for (IRhoExtension ext : mExtensions.values()) {
-                ext.onConfirm(this, prompt, makeDefExtData(view));
+                ext.onPrompt(this, prompt, defaultResponse, makeDefExtData(view));
             }
         }
     }
@@ -275,5 +401,104 @@ public class RhoExtManagerImpl implements IRhoExtManager {
             }
         }
     }
+    
+    public void onAuthRequired(View view, String type, String url, String realm) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onAuthRequired(this, type, url, realm, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void startLocationUpdates(View view, boolean val) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.startLocationUpdates(this, val, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void stopLocationUpdates(View view) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.stopLocationUpdates(this, makeDefExtData(view));
+            }
+        }
+    }
+
+    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);
+            } catch (ClassNotFoundException e) {
+                Utils.platformLog("RhodesActivity", "processStartupListeners() : ClassNotFoundException for ["+classname+"]");
+                e.printStackTrace();
+            }
+            IRhoListener listener = null;
+            try {
+                if (klass != null) {
+                    listener = klass.newInstance();
+                }
+            } catch (InstantiationException e) {
+                Utils.platformLog("RhodesActivity", "processStartupListeners() : InstantiationException for ["+classname+"]");
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                Utils.platformLog("RhodesActivity", "processStartupListeners() : IllegalAccessException for ["+classname+"]");
+                e.printStackTrace();
+            }
+            if (listener != null) {
+                listener.onCreateApplication(this);
+            }
+        }
+    }
+
+    public void onCreateActivity(RhodesActivity activity, Intent intent) {
+        for (IRhoListener listener: mListeners) {
+            listener.onCreate(activity, intent);
+        }
+    }
+    public void onStartActivity(RhodesActivity activity) {
+        for (IRhoListener listener: mListeners) {
+            listener.onStart(activity);
+        }
+    }
+    public void onResumeActivity(RhodesActivity activity) {
+        for (IRhoListener listener: mListeners) {
+            listener.onResume(activity);
+        }
+    }
+    public void onPauseActivity(RhodesActivity activity) {
+        for (IRhoListener listener: mListeners) {
+            listener.onPause(activity);
+        }
+    }
+    public void onStopActivity(RhodesActivity activity) {
+        for (IRhoListener listener: mListeners) {
+            listener.onStop(activity);
+        }
+    }
+    public void onDestroyActivity(RhodesActivity activity) {
+        for (IRhoListener listener: mListeners) {
+            listener.onDestroy(activity);
+        }
+    }
+    public void onNewIntent(RhodesActivity activity, Intent intent) {
+        for (IRhoListener listener: mListeners) {
+            listener.onNewIntent(activity, intent);
+        }
+    }
+    public Dialog onCreateDialog(RhodesActivity activity, int id/*, Bundle args*/) {
+        Dialog res = null;
+        for (IRhoListener listener: mListeners) {
+            res = listener.onCreateDialog(activity, id);
+            if (res != null)
+                break;
+        }
+        return res;
+    }
+
 }