rhodes 6.2.0 → 7.1.17

data/lib/commonAPI/barcode/ext/platform/iphone/Classes/BarcodeViewFactory.mm

@@ -10,6 +10,9 @@
 #ifdef ZXING
 extern "C" void destroyView();
 #endif
+#ifdef APPLE_BARCODE_ENGINE
+extern "C" void destroyView();
+#endif
 
 class BarcodeNativeView : public NativeView {
 public:
@@ -19,6 +22,9 @@ public:
 	virtual ~BarcodeNativeView() {
 #ifdef ZXING
 		destroyView();
+#endif
+#ifdef APPLE_BARCODE_ENGINE
+        destroyView();
 #endif
 		//[mView release];
 		//mView = nil;

data/lib/commonAPI/barcode/ext/platform/iphone/Classes/barcode.m

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "zbar.h"
+//#include "zbar.h"
 #include "BarcodeViewController.h"
 
 #include "ruby/ext/rho/rhoruby.h"
@@ -32,7 +32,10 @@ const char* rho_barcode_barcode_recognize(const char* filename) {
     int img_width;
     int img_height;	
     
-  	
+    strcpy(strbuf, "");
+
+    //TODO: reimplement with ZXing
+    /* Now ZBar lib removed from extension
     rho_platform_image_load_grayscale(filename, &img_buf, &img_width, &img_height);
     
     if (img_buf != 0)
@@ -78,6 +81,7 @@ const char* rho_barcode_barcode_recognize(const char* filename) {
     if (img_buf) {
         rho_platform_image_free(img_buf);
     }
+     */
     
     
     return strbuf;

data/lib/commonAPI/barcode/ext/platform/iphone/impl/Barcode.m

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "zbar.h"
+//#include "zbar.h"
 #include "BarcodeViewController.h"
 
 extern void rho_platform_image_load_grayscale(const char* url, void** image_pixels, int* pwidth, int* pheight);
@@ -22,6 +22,10 @@ static const char* rho_barcode_barcode_recognize(const char* filename) {
     int img_width;
     int img_height;
     
+    strcpy(strbuf, "");
+    
+    //TODO: reimplement with ZXing
+    /* Now ZBar lib removed from extension
   	
     rho_platform_image_load_grayscale(filename, &img_buf, &img_width, &img_height);
     
@@ -68,7 +72,7 @@ static const char* rho_barcode_barcode_recognize(const char* filename) {
     if (img_buf) {
         rho_platform_image_free(img_buf);
     }
-    
+    */
     
     return strbuf;
 }
@@ -129,4 +133,4 @@ static const char* rho_barcode_barcode_recognize(const char* filename) {
 
 
 
-@end
+@end

data/lib/commonAPI/barcode/ext/platform/iphone/impl/BarcodeFactory.m

@@ -3,13 +3,26 @@
 #import "Barcode.h"
 #import "BarcodeSingleton.h"
 
+#include "common/barcode_engine.h"
+
 @implementation BarcodeFactory
 
 -(id<IBarcode>)createBarcodeByID:(NSString*)ID {
     Barcode* obj = [[Barcode alloc] init];
 
     [obj setProperty:@"ID" propertyValue:ID methodResult:nil];
+#ifdef APPLE_BARCODE_ENGINE
+    // Apple scanner
+    [obj setProperty:@"friendlyName" propertyValue:@"Apple S/W Scanner" methodResult:nil];
+#else
+#ifdef ZXING
+    // ZXing engine
+    [obj setProperty:@"friendlyName" propertyValue:@"ZXing S/W Scanner" methodResult:nil];
+#else
+    //ZBar
     [obj setProperty:@"friendlyName" propertyValue:@"ZBar S/W Scanner" methodResult:nil];
+#endif
+#endif
     [obj setProperty:@"scannerType" propertyValue:@"Camera" methodResult:nil];
 
     return obj;

data/lib/commonAPI/barcode/ext/platform/iphone/impl/BarcodeSingleton.m

@@ -1,22 +1,44 @@
 
 #import "BarcodeSingleton.h"
-
+#include "common/barcode_engine.h"
 
 @implementation BarcodeSingleton
 
 
 -(NSString*)getInitialDefaultID {
+#ifdef APPLE_BARCODE_ENGINE
+    // Apple scanner
+    return @"AppleScanner";
+#else
+#ifdef ZXING
+    // ZXing engine
+    return @"ZXingScanner";
+#else
+    //ZBar
     return @"ZBarScanner";
+#endif
+#endif
 }
 
 
 -(void) enumerate:(id<IMethodResult>)methodResult {
     NSMutableArray* ar = [NSMutableArray arrayWithCapacity:10];
-    [ar addObject:@"ZBarScanner"];
+#ifdef APPLE_BARCODE_ENGINE
+        // Apple scanner
+        [ar addObject:@"AppleScanner"];
+#else
+#ifdef ZXING
+        // ZXing engine
+        [ar addObject:@"ZXingScanner"];
+#else
+        //ZBar
+        [ar addObject:@"ZBarScanner"];
+#endif
+#endif
     [methodResult setResult:ar];
 }
 
 
 
 
-@end
+@end

data/lib/commonAPI/bluetooth/ext/platform/android/Rakefile

@@ -52,6 +52,7 @@ ARGS = ['-Iext/platform/android/generated/jni',
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
     
 SRC = get_sources File.join(SOURCELIST)
@@ -59,14 +60,17 @@ SRC = get_sources File.join(SOURCELIST)
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,TARGETLIB)
 TARGETLIB_x86 = File.join(TARGETDIR_x86,TARGETLIB)
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,TARGETLIB)
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,TARGETLIB)
 
 cd '../../..'
 
@@ -82,14 +86,20 @@ namespace 'config' do
   task :mips do
       setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'aarch64')
+  end
 end
 
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
   abi = File.basename(File.dirname(t.name))
@@ -100,6 +110,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -125,17 +136,25 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
 end
 multitask TARGETLIB_MIPS => OBJ_MIPS
 
-
-namespace 'build' do
-  task :arm => OBJ_ARM
-  task :x86 => OBJ_x86
-  task :mips => OBJ_MIPS
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
 end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
 
-namespace 'arch' do
-  task :arm => TARGETLIB_ARM
-  task :x86 => TARGETLIB_x86
-  task :mips => TARGETLIB_MIPS
-end
+
+namespace 'build' do
+    task :arm => OBJ_ARM
+    task :x86 => OBJ_x86
+    task :mips => OBJ_MIPS
+    task :aarch64 => OBJ_AARCH64
+  end
+  
+  namespace 'arch' do
+    task :arm => TARGETLIB_ARM
+    task :x86 => TARGETLIB_x86
+    task :mips => TARGETLIB_MIPS
+    task :aarch64 => TARGETLIB_AARCH64
+  end
 
 task :default => ["arch:arm"]

data/lib/commonAPI/clipboard/ext/platform/android/Rakefile

@@ -52,6 +52,7 @@ ARGS = ['-Iext/platform/android/generated/jni',
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
     
 SRC = get_sources File.join(SOURCELIST)
@@ -59,14 +60,17 @@ SRC = get_sources File.join(SOURCELIST)
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,TARGETLIB)
 TARGETLIB_x86 = File.join(TARGETDIR_x86,TARGETLIB)
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,TARGETLIB)
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,TARGETLIB)
 
 cd '../../..'
 
@@ -82,14 +86,20 @@ namespace 'config' do
   task :mips do
       setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'aarch64')
+  end
 end
 
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
   abi = File.basename(File.dirname(t.name))
@@ -100,6 +110,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -125,17 +136,25 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
 end
 multitask TARGETLIB_MIPS => OBJ_MIPS
 
-
-namespace 'build' do
-  task :arm => OBJ_ARM
-  task :x86 => OBJ_x86
-  task :mips => OBJ_MIPS
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
 end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
 
-namespace 'arch' do
-  task :arm => TARGETLIB_ARM
-  task :x86 => TARGETLIB_x86
-  task :mips => TARGETLIB_MIPS
-end
+
+namespace 'build' do
+    task :arm => OBJ_ARM
+    task :x86 => OBJ_x86
+    task :mips => OBJ_MIPS
+    task :aarch64 => OBJ_AARCH64
+  end
+  
+  namespace 'arch' do
+    task :arm => TARGETLIB_ARM
+    task :x86 => TARGETLIB_x86
+    task :mips => TARGETLIB_MIPS
+    task :aarch64 => TARGETLIB_AARCH64
+  end
 
 task :default => ["arch:arm"]

data/lib/commonAPI/coreapi/ext/Notification.xml

@@ -21,6 +21,8 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
         <METHODS access="STATIC">
 
             <METHOD name="showPopup" access="STATIC" hasCallback="optional">
+			
+
                 <DESC>Bring the application up front and show a message in a popup window. The message can be passed as a string or a hash. The popup window closes after you click on one of the buttons in the 'button' array. All custom icons' paths must be absolute paths to the icon file. Icon is not supported on iOS devices.</DESC>
                 <PLATFORM>WM, CE, Android, iOS, Win32</PLATFORM>
                 <PARAMS>
@@ -97,6 +99,51 @@ Example:
                     </PARAMS>
                 </CALLBACK>
             </METHOD>
+			
+			
+			<METHOD name="setScheduler" access="STATIC" hasCallback="none">
+			
+                <DESC></DESC>
+                <PLATFORM>Android, iOS</PLATFORM>
+                <PARAMS>
+                    <PARAM name="propertyMap" type="HASH">
+                        <DESC>The properties associated with the popup.</DESC>
+                        <PARAMS>
+                            <PARAM name="message" type="String" default="">
+                                <DESC>Text displayed in the popup window.</DESC>
+                            </PARAM>
+                            <PARAM name="title" type="String" default="">
+                                <DESC>Title of the popup window.</DESC>
+                            </PARAM>
+							<PARAM name="start" type="HASH" >
+							    <DESC>Time to start h:m:s.</DESC>
+								<PARAMS>
+								    <PARAM name="hour" type="Integer">                            
+									    <DESC>Hour in hours</DESC>                        
+									</PARAM>                        
+									<PARAM name="minute" type="Integer">                            
+									    <DESC>Minute in minutes</DESC>                        
+									</PARAM>                        
+									<PARAM name="seconds" type="Integer">                            
+									    <DESC>Seconds in seconds</DESC>                        
+									</PARAM>
+								</PARAMS>
+                            </PARAM>
+							<PARAM name="interval" type="Integer" default="">
+                                <DESC>The time interval in seconds.</DESC>
+                            </PARAM>
+							<PARAM name="repeats" type="Boolean" default="true">
+                                <DESC>Repeat or not.</DESC>
+                            </PARAM>
+                        </PARAMS>
+                    </PARAM>
+                </PARAMS>
+            </METHOD>
+			
+			<METHOD name="removeScheduler" access="STATIC" hasCallback="none">
+                <DESC></DESC>
+                <PLATFORM>Android, iOS</PLATFORM>
+            </METHOD>
 
             <METHOD name="hidePopup" access="STATIC" hasCallback="none">
                 <DESC>Closes the current popup window. On Windows Mobile/CE, Windows and RhoSimulators only Status window, displayed by showStatus can be hide.</DESC>

data/lib/commonAPI/coreapi/ext/platform/android/ApplicationManifestAdds.erb

@@ -1 +1,2 @@
+    <uses-permission android:name='android.permission.RECEIVE_BOOT_COMPLETED'/>
     <service android:name='com.rho.notification.NotificationIntentService' android:exported='false'/>

data/lib/commonAPI/coreapi/ext/platform/android/Rakefile

@@ -31,20 +31,24 @@ ARGS = ["-I\"#{$curdir}/generated/jni\"",
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
 SRC = get_sources File.join($curdir, 'ext_native.files')
 
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,'libcoreapi.a')
 TARGETLIB_x86 = File.join(TARGETDIR_x86,'libcoreapi.a')
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,'libcoreapi.a')
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,'libcoreapi.a')
 
 V4JAR = File.join(TARGETDIR, 'android-support-v4.jar')
 
@@ -62,17 +66,24 @@ namespace 'config' do
   task :mips do
       setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'],'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'],'aarch64')
+  end
 end
 
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
   abi = File.basename(File.dirname(t.name))
+  puts "debug out: #{abi}"
   Rake::Task["config:#{abi}"].invoke
   cc_compile find_source(t.name), File.dirname(t.name), ARGS or raise "\e[31mCompilation failed: #{find_source(t.name)}\e[0m"
 end
@@ -80,6 +91,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -104,6 +116,12 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
     cc_ar t.name, OBJ_MIPS or raise "\e[31mCreating library failed: #{t.name}\e[0m"
 end
 
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
+end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
+
 multitask TARGETLIB_MIPS => OBJ_MIPS
 file V4JAR => [TARGETDIR] do
     v4jar = Dir.glob(File.join(ENV['ANDROID_SDK'],'extras','android','**','v4','android-support-v4.jar'))
@@ -120,6 +138,7 @@ namespace 'arch' do
   task :arm => [TARGETLIB_ARM]
   task :x86 => [TARGETLIB_x86]
   task :mips => [TARGETLIB_MIPS]
+  task :aarch64 => [TARGETLIB_AARCH64]
 end
 
 task :default => ["arch:arm", "arch:x86"]