rhodes 3.2.1 → 3.2.2.beta

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar/Symbol.h

@@ -316,6 +316,7 @@ public:
     }
 
     /// retrieve the string name for any addon.
+    /// @deprecated in 0.11
     const std::string get_addon_name () const
     {
         return(zbar_get_addon_name(_type));
@@ -518,9 +519,7 @@ inline const SymbolIterator SymbolSet::symbol_end () const {
 static inline std::ostream& operator<< (std::ostream& out,
                                         const Symbol& sym)
 {
-    out << sym.get_type_name()
-        << sym.get_addon_name()
-        << ":" << sym.get_data();
+    out << sym.get_type_name() << ":" << sym.get_data();
     return(out);
 }
 

data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i

@@ -1,8 +1,9 @@
 /* barcode.i */
 %module Barcode
 %{
+#include "ruby/ext/rho/rhoruby.h"
 extern const char* rho_barcode_barcode_recognize(const char* filename);
-extern void rho_barcode_take_barcode(const char* callback);
+extern void rho_barcode_take_barcode(const char* callback, VALUE options);
 
 #define barcode_recognize rho_barcode_barcode_recognize 
 #define take_barcode rho_barcode_take_barcode 
@@ -10,4 +11,4 @@ extern void rho_barcode_take_barcode(const char* callback);
 %}
 
 extern const char* barcode_recognize(const char* filename);
-extern void take_barcode(const char* callback);
+extern void take_barcode(const char* callback, VALUE options);

data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c

@@ -1814,8 +1814,9 @@ static VALUE mBarcode;
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
 
+#include "ruby/ext/rho/rhoruby.h"
 extern const char* rho_barcode_barcode_recognize(const char* filename);
-extern void rho_barcode_take_barcode(const char* callback);
+extern void rho_barcode_take_barcode(const char* callback, VALUE options);
 
 #define barcode_recognize rho_barcode_barcode_recognize 
 #define take_barcode rho_barcode_take_barcode 
@@ -1929,19 +1930,21 @@ fail:
 SWIGINTERN VALUE
 _wrap_take_barcode(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
+  VALUE arg2 = (VALUE) 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","take_barcode", 1, argv[0] ));
   }
   arg1 = (char *)(buf1);
-  take_barcode((char const *)arg1);
+  arg2 = argv[1];
+  take_barcode((char const *)arg1,arg2);
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return Qnil;
 fail:

data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c

@@ -8,11 +8,11 @@
 
 #include "../zbar/zbar/include/zbar.h"
 
-
+#include "ruby/ext/rho/rhoruby.h"
 
 static char strbuf[1024];
 
-void rho_barcode_take_barcode(const char* callback) {
+void rho_barcode_take_barcode(const char* callback, VALUE options) {
 
 }
 

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

@@ -1286,7 +1286,7 @@ public class RhodesService extends Service {
 	
 	private void restartGeoLocationIfNeeded() {
 		if (mNeedGeoLocationRestart) {
-			GeoLocation.isKnownPosition();
+			GeoLocation.restart();
 			mNeedGeoLocationRestart = false;
 		}
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java

@@ -148,5 +148,10 @@ class CameraNewService implements CameraService {
 		return new Size(neww, newh);
 	}
 	
-
-}
+	public boolean isAutoFocusSupported(android.hardware.Camera camera) {
+		String focus_mode = camera.getParameters().getFocusMode();
+		boolean auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
+		return auto_focus_supported;
+	}
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraOldService.java

@@ -45,5 +45,9 @@ class CameraOldService implements CameraService {
 		return null;
 	}
 	
+	public boolean isAutoFocusSupported(android.hardware.Camera camera) {
+		return false;
+	}
+	
 	
-}
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java

@@ -137,4 +137,11 @@ class CameraSemiService implements CameraService {
 		return new Size(neww, newh);
 	}
 	
-}
+	public boolean isAutoFocusSupported(android.hardware.Camera camera) {
+		String focus_mode = camera.getParameters().getFocusMode();
+		boolean auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
+		return auto_focus_supported;
+	}
+	
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraService.java

@@ -27,7 +27,7 @@
 package com.rhomobile.rhodes.camera;
 
 
-interface CameraService {
+public interface CameraService {
 
 	public class Size {
 		public Size(int w, int h) {
@@ -45,5 +45,7 @@ interface CameraService {
 	Size getClosestPictureSize(android.hardware.Camera camera, int w, int h);
 	
 	Size getClosestPreviewSize(android.hardware.Camera camera, int w, int h);
+	
+	boolean isAutoFocusSupported(android.hardware.Camera camera);
 
-}
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java

@@ -63,7 +63,7 @@ public class ImageCapture extends BaseActivity implements SurfaceHolder.Callback
 	private static final String TAG = "ImageCapture";
 	
 	private String callbackUrl;
-	private Camera camera;
+	private android.hardware.Camera camera;
 	private boolean isPreviewRunning = false;
 	private SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyyMMddHHmmssSS");
 
@@ -270,11 +270,16 @@ public class ImageCapture extends BaseActivity implements SurfaceHolder.Callback
 		//this only from API v.5 and higher
 		//String focus_mode = camera.getParameters().getFocusMode();
 		//if ((focus_mode != Camera.Parameters.FOCUS_MODE_FIXED) && (focus_mode != Camera.Parameters.FOCUS_MODE_INFINITY)) {
-		camera.autoFocus(new Camera.AutoFocusCallback() {
-			public void onAutoFocus(boolean success, Camera camera) {
-				takePicture();
-			}
-		});
+		if (com.rhomobile.rhodes.camera.Camera.getCameraService().isAutoFocusSupported(camera)) {
+			camera.autoFocus(new Camera.AutoFocusCallback() {
+				public void onAutoFocus(boolean success, Camera camera) {
+					takePicture();
+				}
+			});
+		}
+		else {
+			takePicture();
+		}
 		//}
 	}
 

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

@@ -64,10 +64,6 @@ public class GeoLocation {
 			return 30000; // 30 sec
 	}
 	
-	private static void reportFail(String name, Exception e) {
-		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
-	}
-	
 	private static void checkState() throws IllegalAccessException {
 		if (!Capabilities.GPS_ENABLED)
 			throw new IllegalAccessException("Capability GPS disabled");
@@ -117,10 +113,22 @@ public class GeoLocation {
 			}
 		}
 		catch (Exception e) {
-			reportFail("stop", e);
+			Logger.E(TAG, e);
 		}
 	}
-	
+
+    public static void restart() {
+        try {
+            checkState();
+            Logger.T(TAG, "restart");
+            if (updatePeriod != -1)
+                getImpl().setTimeout(getUpdatePeriod());
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e);
+        }
+    }
+
 	public static boolean isAvailable() {
 		Logger.T(TAG, "isAvailable...");
 		try {
@@ -133,7 +141,7 @@ public class GeoLocation {
 			return result;
 		}
 		catch (Exception e) {
-			reportFail("isAvailable", e);
+            Logger.E(TAG, e);
 		}
 		return false;
 	}
@@ -145,7 +153,7 @@ public class GeoLocation {
 			return getImpl().getLatitude();
 		}
 		catch (Exception e) {
-			reportFail("getLatitude", e);
+            Logger.E(TAG, e);
 		}
 		return 0.0;
 	}
@@ -157,7 +165,7 @@ public class GeoLocation {
 			return getImpl().getLongitude();
 		}
 		catch (Exception e) {
-			reportFail("getLongitude", e);
+            Logger.E(TAG, e);
 		}
 		return 0.0;
 	}
@@ -169,7 +177,7 @@ public class GeoLocation {
 			return getImpl().getAccuracy();
 		}
 		catch (Exception e) {
-			reportFail("getAccuracy", e);
+            Logger.E(TAG, e);
 		}
 		return 0;
 	}
@@ -181,7 +189,7 @@ public class GeoLocation {
 			return getImpl().isKnownPosition();
 		}
 		catch (Exception e) {
-			reportFail("isKnownPosition", e);
+            Logger.E(TAG, e);
 		}
 		return false;
 	}
@@ -196,10 +204,10 @@ public class GeoLocation {
 			checkState();
 			Logger.T(TAG, "setTimeout: " + nsec + "s");
 			updatePeriod = nsec * 1000;
-			getImpl().setTimeout(updatePeriod);
+			getImpl().setTimeout(getUpdatePeriod());
 		}
 		catch (Exception e) {
-			reportFail("setTimeout", e);
+            Logger.E(TAG, e);
 		}
 	}
 

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

@@ -48,10 +48,13 @@ public class GeoLocationImpl {
 	
 	private LocationManager locationManager = null;
 	private volatile Location lastLocation;
+	
+	// These two values should be equal in most cases but explicit request to GeoLocation without call to setTimeout
 	private long invalidateLocationPeriod;
 	private volatile long pingTimeout = Long.MAX_VALUE;
 	
 	private List<RhoLocationListener> mListeners = new LinkedList<RhoLocationListener>();
+    private List<RhoLocationListener> mSwitchedOffListeners = new LinkedList<RhoLocationListener>();
 	
 	public class RhoLocationListener implements LocationListener {
 		private String providerName;
@@ -106,11 +109,11 @@ public class GeoLocationImpl {
 					if((System.currentTimeMillis() - time) > invalidateLocationPeriod) {
 						message.append(" time is very old: ").append(location.getTime());
 						message.append(". Current time: ").append(System.currentTimeMillis());
-						message.append(". Inactivity timeout: ").append(invalidateLocationPeriod).append(".");
+						message.append(". Invalitate period: ").append(invalidateLocationPeriod).append(".");
 					} else {
 						message.append(" time os ok: ").append(location.getTime());
 						message.append(". Current time: ").append(System.currentTimeMillis());
-						message.append(". Inactivity timeout: ").append(invalidateLocationPeriod).append(".");
+						message.append(". Invalidate period: ").append(invalidateLocationPeriod).append(".");
 						onLocationChanged(location);
 					}
 					Logger.T(TAG,  message.toString());
@@ -151,7 +154,7 @@ public class GeoLocationImpl {
 				if (pingTimeout < 0)
 					break;
 				try {
-					long curTimeout = errorTimeout(pingTimeout);
+					final long curTimeout = errorTimeout(pingTimeout);
 					Logger.T(TAG, "\"watchdog\" thread waits (" + curTimeout + "ms)...");
 					Thread.sleep(curTimeout);
 				}
@@ -183,7 +186,7 @@ public class GeoLocationImpl {
 	});
 	
 	// Sleep greater then ping time to do not interfere with real location updates
-	private static long errorTimeout(long time) { return time * 5; } 
+	private static long errorTimeout(long time) { return (time == Long.MAX_VALUE) ? time : (time * 5); 	} 
 	
 	private static native void geoCallback();
 	private static native void geoCallbackError();
@@ -209,7 +212,7 @@ public class GeoLocationImpl {
 					continue;
 				
 				RhoLocationListener listener = new RhoLocationListener(provider, locationManager);
-				mListeners.add(listener);
+				mSwitchedOffListeners.add(listener);
 			}
 		}
 		
@@ -217,10 +220,18 @@ public class GeoLocationImpl {
 	private void registerListeners() {
 		Iterator<RhoLocationListener> it;
 		synchronized (mListeners) {
-			it = mListeners.iterator();
+			it = mSwitchedOffListeners.iterator();
 			while (it.hasNext()) {
-				it.next().register(pingTimeout);
+			    RhoLocationListener listener = it.next();
+                
+                Logger.T(TAG, "Registering location listener: " + listener.getProviderName());
+                
+				listener.register(pingTimeout);
+				mListeners.add(listener);
 			}
+			mSwitchedOffListeners.removeAll(mListeners);
+			
+			Logger.T(TAG, "Count of switched off listeners: " + mSwitchedOffListeners.size());
 		}
 		// Request last location after every listener has registered
 		// because last location from GPS will force other listeners to unregister
@@ -237,8 +248,14 @@ public class GeoLocationImpl {
 				RhoLocationListener listener = it.next(); 
 				if ((skipProvider != null) && listener.getProviderName().equals(skipProvider))
 					continue;
+                
+                Logger.T(TAG, "Unregistering location listener: " + listener.getProviderName());
+                
 				listener.unregister();
+				it.remove();
+				mSwitchedOffListeners.add(listener);
 			}
+            Logger.T(TAG, "Count of switched off listeners: " + mSwitchedOffListeners.size());
 		}
 	}
 	
@@ -406,10 +423,15 @@ public class GeoLocationImpl {
 	}
 
 	synchronized void setTimeout(long msec) {
-		pingTimeout = msec;
-		thWatchdog.interrupt();
-		registerListeners();// do reregister for new timeout
-		Logger.T(TAG, "Set new ping timeout: " + pingTimeout + "ms");
+        if (pingTimeout != msec) {
+            pingTimeout = msec;
+            thWatchdog.interrupt();
+            registerListeners();// do reregister for new timeout
+            Logger.T(TAG, "Set new ping timeout: " + pingTimeout + "ms");
+        } else {
+            // Just renew timer in case same value
+            thWatchdog.interrupt();
+        }
 		
 	}
 }

data/platform/android/build/android.rake

@@ -33,7 +33,21 @@ USE_OWN_STLPORT = false
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0", 12 => "3.1", 13 => "3.2"  }.each do |k,v|
+{
+    2 => "1.1",
+    3 => "1.5",
+    4 => "1.6",
+    5 => "2.0",
+    6 => "2.0.1",
+    7 => "2.1",
+    8 => "2.2",
+    9 => "2.3.1",
+    10 => "2.3.3",
+    11 => "3.0",
+    12 => "3.1",
+    13 => "3.2",
+    14 => "4.0"
+  }.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -245,10 +259,58 @@ def set_app_name_android(newname)
 
   manifest.elements.each('uses-permission') { |e| manifest.delete e }
 
+
+  uses_camera = false
+  uses_autofocus = false
+  uses_front = false
+  uses_flash = false
+
+  manifest.elements.each('uses-feature') do |e|
+    uname = e.attribute("name", "android").to_s 
+    if "android.hardware.camera".eql? uname
+       uses_camera = true
+    end
+    if "android.hardware.camera.autofocus".eql? uname
+       uses_autofocus = true
+    end
+    if "android.hardware.camera.front".eql? uname
+       uses_front = true
+    end
+    if "android.hardware.camera.flash".eql? uname
+       uses_flash = true
+    end
+  end
+
   caps.sort.each do |cap|
     element = REXML::Element.new('uses-permission')
     element.add_attribute('android:name', "android.permission.#{cap}")
     manifest.add element
+    if cap == 'CAMERA'
+        if !uses_camera
+           element = REXML::Element.new('uses-feature')
+           element.add_attribute('android:required', "false")
+           element.add_attribute('android:name', "android.hardware.camera")
+           manifest.add element
+        end
+        if !uses_autofocus
+           element = REXML::Element.new('uses-feature')
+           element.add_attribute('android:required', "false")
+           element.add_attribute('android:name', "android.hardware.camera.autofocus")
+           manifest.add element
+        end
+        if !uses_front
+           element = REXML::Element.new('uses-feature')
+           element.add_attribute('android:required', "false")
+           element.add_attribute('android:name', "android.hardware.camera.front")
+           manifest.add element
+        end
+        if !uses_flash
+           element = REXML::Element.new('uses-feature')
+           element.add_attribute('android:required', "false")
+           element.add_attribute('android:name', "android.hardware.camera.flash")
+           manifest.add element
+        end
+    end
   end
 
   caps_proc.each do |p|