rhodes 3.3.2 → 3.3.3.beta.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+## 3.3.3
+* Fix Windows Mobile issues
+
 ## 3.3.2
 * iPhone: fix AppStore sumbit issue. Now all files stored in Private Documents, only database and user files in Documents 
 * Fix issues with Ruby 1.9.2 on Mac

data/Manifest.txt

@@ -2117,6 +2117,8 @@ platform/shared/common/AppMenu.h
 platform/shared/common/AutoPointer.h
 platform/shared/common/BundleManager.cpp
 platform/shared/common/emml.h
+platform/shared/common/ExtManager.cpp
+platform/shared/common/ExtManager.h
 platform/shared/common/InputStream.h
 platform/shared/common/iphone/RhoClassFactory.cpp
 platform/shared/common/iphone/RhoClassfactory.h
@@ -4783,6 +4785,7 @@ res/generators/templates/application/public/jquery/jquery-1.6.4.js
 res/generators/templates/application/public/jquery/jquery-1.6.4.min.js
 res/generators/templates/application/public/js/application.js
 res/generators/templates/application/public/js/jqmobile-patch.js
+res/generators/templates/application/public/js/jquery-wp7-patch.js
 res/generators/templates/application/public/js/rho.js
 res/generators/templates/application/public/js/rhogeolocation-wm.js
 res/generators/templates/application/public/js/rhogeolocation.js
@@ -4809,6 +4812,7 @@ res/generators/templates/extension/extensions/montana/ext/montana/platform/iphon
 res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Rakefile
 res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/Montana.sln
 res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/Montana.vcproj
+res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/montana.vsprops
 res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/Rakefile
 res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/src/montana_wm.cpp
 res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/src/montana_wm.h

data/Rakefile

@@ -274,8 +274,8 @@ namespace "config" do
         $app_config["capabilities"] += ["barcode"] if $app_config["extensions"].index("barcode-moto")
     end
 
-    puts "$app_config['extensions'] : #{$app_config['extensions']}"   
-    puts "$app_config['capabilities'] : #{$app_config['capabilities']}"   
+    puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"   
+    puts "$app_config['capabilities'] : #{$app_config['capabilities'].inspect}"   
     
     $hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
     

data/doc/device-caps.txt

@@ -717,7 +717,7 @@ Get a list of scanners present on the device. Return array of hashes ('name','id
 Enables the scanner. barcode_callback get the same parameters as Barcode.take_barcode:
 
     :::ruby
-    Barcode.enable(url_for(:action => :barcode_callback), {:name=>name_from_enumerate})
+    Barcode.enable(url_for(:action => :barcode_callback), {:id=>id_from_enumerate})
 
 Callback parameters:
 
@@ -742,7 +742,7 @@ Performs a soft trigger stop
 Enables the scanner and start scanner. Before callback is called scanner is disabled:
 
     :::ruby
-    Barcode.take_barcode(url_for(:action => :barcode_callback), {:name=>name_from_enumerate})
+    Barcode.take_barcode(url_for(:action => :barcode_callback), {:id=>id_from_enumerate})
 
 THe callback uses these parameters.
 

data/doc/rhodes-api.txt

@@ -52,13 +52,10 @@ The [BluetoothSession Class](/rhodes/device-caps#bluetooth) controls the session
 
 The [NFC Classes](/rhodes/nfc) provide access to Near Field Communication functionality, which is currently only supported on Android.
 
-ZZZ Filled in
 The [RingtoneManager Class](/rhodes/ringtonemanager-api) allows you to view and play a device's ringtones.
 
-ZZZZ Filled in
 The [Alert Class](/rhodes/alert-api) lets you call system alert methods for popup, vibrate, or playing audio files.
 
-ZZZZ Filled in
 The [Timer Class](/rhodes/timer-api) lets the device use a timer.
 
 The [MapView Class](/rhodes/device-caps#mapview) provides an embeddable map interface with the create method and various settings and annotations depending on the map provider (such as Google).

data/installer/rhostudio-moto.nsi

@@ -81,11 +81,11 @@ section
     createShortCut "$SMPROGRAMS\RhoStudio\RhoStudio.lnk" "$INSTDIR\eclipse\RhoStudio.exe"
 
     # added information in 'unistall programs' in contorol panel
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "DisplayName" "RhoStudio - RAD tool for develop and debug rhodes/rhoconnect applications"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "DisplayIcon" "$\"$INSTDIR\uninstall.exe$\""
     
     Goto okFinishSection
@@ -114,27 +114,27 @@ section "uninstall"
     # remove env vars
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\ruby\bin"
     Call un.EnvVarUpdate
     Pop $R0
 
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\make-3.81\bin"
     Call un.EnvVarUpdate
     Pop $R0
 
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\redis-2.4.0"
     Call un.EnvVarUpdate
     Pop $R0
 
-    DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" REDIS_HOME
-    DeleteRegKey HKLM  "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio"
+    DeleteRegValue HKCU "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" REDIS_HOME
+    DeleteRegKey HKCU  "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio"
 
     # remove $INSTDIR
     RMDir /r /REBOOTOK $INSTDIR
@@ -150,7 +150,7 @@ Section "GNU Make" gnumakeSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\make-3.81\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -181,14 +181,14 @@ Section "DevKit" devkitSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\devkit\mingw\bin"
   Call EnvVarUpdate
   Pop $R0
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\devkit\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -201,7 +201,6 @@ Section "Ruby, Rubygems, Rhodes, Rhoconnect and adapters" rubySection
  
   File /r "ruby"
   File /r "make-3.81"
-  #File /r "rhosync"
   File "README.html"
   File "RHOSTUDIO-LICENSE.txt"
  
@@ -209,7 +208,7 @@ Section "Ruby, Rubygems, Rhodes, Rhoconnect and adapters" rubySection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\ruby\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -228,14 +227,14 @@ Section "Redis" redisSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0
@@ -300,39 +299,6 @@ SectionEnd
 ;======================================================
 ;Functions
  
-Function .onInit
-    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "configUi.ini"
-FunctionEnd 
-
-LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Configuration page"
-LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "This page will update application files based on your system configuration."
-
-/*
-Function customerConfig
-   !insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE)" "$(TEXT_IO_SUBTITLE)"
-   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "configUi.ini"
-   !insertmacro MUI_INSTALLOPTIONS_READ $varApacheEmail "configUi.ini" "Field 3" "State"
-   !insertmacro MUI_INSTALLOPTIONS_READ $varApachePort "configUi.ini" "Field 4" "State"
-
-   Push SERVERADMIN
-   Push $varApacheEmail
-   Push all
-   Push all
-   Push $INSTDIR\apache2\conf\httpd.conf
-   Call AdvReplaceInFile
- 
-   Push SERVERPORT
-   Push $varApachePort
-   Push all
-   Push all
-   Push $INSTDIR\apache2\conf\httpd.conf
-   Call AdvReplaceInFile
-
-   ExecWait '"$INSTDIR\apache2\bin\httpd.exe" -k install'
-   ExecWait 'net start Apache2.2'
-FunctionEnd
-*/
-
 Function FixScriptFilesInDir
 Exch $R0 #path
 Exch

data/installer/rhostudio.nsi

@@ -80,11 +80,11 @@ section
     createShortCut "$SMPROGRAMS\RhoStudio\RhoStudio.lnk" "$INSTDIR\eclipse\RhoStudio.exe"
 
     # added information in 'unistall programs' in contorol panel
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "DisplayName" "RhoStudio - RAD tool for develop and debug rhodes/rhoconnect applications"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
                  "DisplayIcon" "$\"$INSTDIR\uninstall.exe$\""
     
     Goto okFinishSection
@@ -113,21 +113,21 @@ section "uninstall"
     # remove env vars
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\ruby\bin"
     Call un.EnvVarUpdate
     Pop $R0
 
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\make-3.81\bin"
     Call un.EnvVarUpdate
     Pop $R0
 
     Push "PATH" 
     Push "R" 
-    Push "HKLM" 
+    Push "HKCU" 
     Push "$INSTDIR\redis-2.4.0"
     Call un.EnvVarUpdate
     Pop $R0
@@ -149,7 +149,7 @@ Section "GNU Make" gnumakeSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\make-3.81\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -180,14 +180,14 @@ Section "DevKit" devkitSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\devkit\mingw\bin"
   Call EnvVarUpdate
   Pop $R0
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\devkit\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -208,7 +208,7 @@ Section "Ruby, Rubygems, Rhodes, Rhoconnect and adapters" rubySection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\ruby\bin"
   Call EnvVarUpdate
   Pop $R0
@@ -227,14 +227,14 @@ Section "Redis" redisSection
 
   Push "PATH" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
-  Push "HKLM" 
+  Push "HKCU" 
   Push "$INSTDIR\redis-2.4.0"
   Call EnvVarUpdate
   Pop $R0

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

@@ -48,10 +48,15 @@ public class RhodesApplication extends Application{
 	
     private static final String TAG = RhodesApplication.class.getSimpleName();
     private static Handler mHandler;
+    static AppEventObserver sRhodesAppActiveWatcher;
     static {
         NativeLibraries.load();
     }
 
+    public static void handleAppStarted() {
+        sRhodesAppActiveWatcher.run();
+    }
+    
     private ApplicationInfo getAppInfo() {
         Context context = this;
         String pkgName = context.getPackageName();
@@ -84,6 +89,8 @@ public class RhodesApplication extends Application{
 
         Log.i(TAG, "Initializing...");
         
+        sRhodesAppActiveWatcher = AppState.AppStarted.addObserver("RhodesAppActiveObserver", true);
+        
         RhodesApplication.runWhen(
                 UiState.MainActivityStarted,
                 new StateHandler(false) {
@@ -228,19 +235,124 @@ public class RhodesApplication extends Application{
         public abstract void run();
     }
 
-    private static void runHandlers(Collection<StateHandler> handlers)
-    { 
-    	for(StateHandler handler: handlers) {
-    		handler.run();
+    /**
+     * 
+     * @author lexis_tikh
+     *
+     */
+    private static class EventObserver implements Runnable{
+        private volatile boolean mReady = false;
+        private boolean mCheckOnce;
+        private String mTag;
+
+        public EventObserver(String tag, boolean once) { mTag = tag; mCheckOnce = once; }
+        public synchronized boolean isReady() { return mReady; }
+        public String toString() { return mTag + " - " + (mReady?"ready":"not ready");}
+        public synchronized void reset() { mReady = false; }
+        public boolean isCheckOnce() { return mCheckOnce; }
+        public void run() { // notify
+            synchronized(this) {
+                mReady = true;
+            }
+            Logger.I(mTag, "Ready");
+        }
+    }
+
+    public static class AppEventObserver extends EventObserver {
+        private AppState mState;
+
+        public AppEventObserver(String tag, AppState state, boolean once) {
+            super(tag, once);
+            mState = state;
+        }
+        public void run() {
+            super.run();
+            
+            if(mState == null) throw new IllegalStateException("AppEventObserver state is not initialized");
+            
+            RhodesApplication.stateChanged(mState);
+        }
+    }
+
+    public static class UiEventObserver extends EventObserver {
+        private UiState mState;
+
+        public UiEventObserver(String tag, UiState state, boolean once) {
+            super(tag, once);
+            mState = state;
+        }
+        public void run() {
+            super.run();
+            
+            if(mState == null) throw new IllegalStateException("UiEventObserver state is not initialized");
+            
+            RhodesApplication.stateChanged(mState);
+        }
+    }
+
+    private static int runHandlers(Collection<StateHandler> handlers) {
+        if (handlers == null) return 0;
+
+        for(StateHandler handler: handlers) {
+            handler.run();
             Exception error = handler.getError();
             if (error != null)
             {
                 Logger.E(TAG, error);
                 Thread.dumpStack();
             }
-    	}
+        }
+        
+        return handlers.size();
+    }
+    
+    private static class StateImpl <Observer extends EventObserver> {
+        private String TAG;
+        private Vector<Observer> mObservers = new Vector<Observer>();
+        private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
+
+        public StateImpl(String tag) { TAG = tag; }
+        
+        public void addObserver(Observer o) { mObservers.add(o); }
+        public void addHandler(StateHandler h) { mHandlers.add(h); }
+
+        public boolean isComplete() {
+            boolean complete = true;
+            for (Observer observer: mObservers) {
+                complete &= observer.isReady();
+                if (!complete) {
+                    Logger.D(TAG, observer.toString());
+                    break;
+                }
+            }
+            return complete;
+        }
+
+        public Collection<StateHandler> commitHandlers() {
+            Vector<StateHandler> handlers = new Vector<StateHandler>();
+            Vector<StateHandler> doneHandlers = new Vector<StateHandler>();
+            for (StateHandler handler: mHandlers) {
+                handlers.add(handler);
+                if (handler.isRunOnce()) {
+                    doneHandlers.add(handler);
+                }
+            }
+            mHandlers.removeAll(doneHandlers);
+            return handlers;
+        }
+
+        public void commitObservers() {
+            Vector<EventObserver> observers = new Vector<EventObserver>();
+            for (EventObserver o: mObservers) {
+                if (o.isCheckOnce()) {
+                    observers.add(o);
+                }
+            }
+            mObservers.removeAll(observers);
+        }
     }
     
+    
     public enum AppState
     {
         Undefined("Undefined") {
@@ -264,42 +376,49 @@ public class RhodesApplication extends Application{
         
         private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
         private String TAG;
+        private StateImpl<AppEventObserver> mImpl;
         
-        private AppState(String tag) { TAG = tag; }
+        private AppState(String tag) {
+            TAG = tag;
+            mImpl = new StateImpl<AppEventObserver>(tag);
+        }
         
         private synchronized Collection<StateHandler> commit()
         {
-            Vector<StateHandler> handlers = new Vector<StateHandler>();
+            Collection<StateHandler> handlers = null;// = new Vector<StateHandler>();
 
             Logger.T(TAG, "Starting commit. Current AppState: " + sAppState.TAG);
-            if((this == AppActivated) && (sAppState == Undefined)) {
-                appActivatedFlag = true;
-                Logger.I(TAG, "Cannot commit now, application will be activated when started.");
-            } else {
-       	      	Logger.T(TAG, "Commiting AppState handlers.");
-	            Vector<StateHandler> doneHandlers = new Vector<StateHandler>();
-	            for (StateHandler handler: mHandlers) {
-	            	handlers.add(handler);
-	                if (handler.isRunOnce()) {
-	                    doneHandlers.add(handler);
-	                }
-	            }
-	            mHandlers.removeAll(doneHandlers);
-	            sAppState = this;
+            if(mImpl.isComplete()) {
+                if((this == AppActivated) && (sAppState == Undefined)) {
+                    appActivatedFlag = true;
+                    Logger.I(TAG, "Cannot commit now, application will be activated when started.");
+                } else {
+                    Logger.T(TAG, "Commiting AppState handlers.");
+                    
+                    handlers = mImpl.commitHandlers();
+                    mImpl.commitObservers();
+                    
+                    sAppState = this;
+                }
             }
             Logger.T(TAG, "After AppState commit: " + sAppState.TAG);
             return handlers;
         }
         
         public synchronized void addHandler(StateHandler handler) { mHandlers.add(handler); }
+        public synchronized AppEventObserver addObserver(String tag, boolean once) {
+            AppEventObserver observer = new AppEventObserver(tag, this, once);
+            mImpl.addObserver(observer);
+            return observer;
+        }
         public abstract boolean canHandle(AppState state);
-        
+
         static public void handleState(AppState state) {
-            runHandlers(state.commit());
-            Logger.I(sAppState.TAG, "Handlers have completed.");
+            int cnt = runHandlers(state.commit());
+            Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
             if((state == AppStarted) && appActivatedFlag) {
-                runHandlers(AppActivated.commit());
-                Logger.I(sAppState.TAG, "Handlers have completed.");
+                cnt = runHandlers(AppActivated.commit());
+                Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
             }
             return;
         }
@@ -324,40 +443,42 @@ public class RhodesApplication extends Application{
             public boolean canHandle(UiState state) { return (state == this) || (state == MainActivityCreated); }
         };
 
-        private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
+        private StateImpl<UiEventObserver> mImpl;
         public String TAG;
         
-        private UiState(String tag) { TAG = tag; }
+        private UiState(String tag) {
+            TAG = tag;
+            mImpl = new StateImpl<UiEventObserver>(tag);
+        }
         
         private synchronized Collection<StateHandler> commit()
         {
-            Vector<StateHandler> handlers = new Vector<StateHandler>();
+            Collection<StateHandler> handlers = null;
 
             Logger.T(TAG, "Starting commit. Current UiState: " + sUiState.TAG);
 
-            if (!sUiState.canHandle(this)) {
-        		
-	            Logger.T(TAG, "Commiting UiState handlers.");
-	            Vector<StateHandler> doneHandlers = new Vector<StateHandler>();
-	            for (StateHandler handler: mHandlers) {
-	            	handlers.add(handler);
-	                if (handler.isRunOnce()) {
-	                    doneHandlers.add(handler);
-	                }
-	            }
-	            mHandlers.removeAll(doneHandlers);
-	            sUiState = this;
-        	}
+            if (mImpl.isComplete()) {
+                if (!sUiState.canHandle(this)) {
+                    handlers = mImpl.commitHandlers();
+                    mImpl.commitObservers();
+                    sUiState = this;
+                }
+            }
             Logger.T(TAG, "After UiState commit: " + sUiState.TAG);
             return handlers;
         }
         
-        public synchronized void addHandler(StateHandler handler) { mHandlers.add(handler); }
+        public synchronized void addHandler(StateHandler handler) { mImpl.addHandler(handler); }
+        public synchronized UiEventObserver addObserver(String tag, boolean once) {
+            UiEventObserver observer = new UiEventObserver(tag, this, once);
+            mImpl.addObserver(observer);
+            return observer;
+        }
         public abstract boolean canHandle(UiState state);
-        
+
         static public void handleState(UiState state) {
-            runHandlers(state.commit());
-            Logger.I(sAppState.TAG, "Handlers have completed.");
+            int cnt = runHandlers(state.commit());
+            Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
         }
     }