rhodes 6.2.0 → 7.1.17

data/lib/commonAPI/devicesecurity/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
 
+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 '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 :generate_inbuilt_values do

data/lib/commonAPI/devicesecurity/ext/platform/iphone/DeviceSecurity.xcodeproj/project.pbxproj

@@ -219,6 +219,8 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "DeviceSecurity" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
@@ -265,6 +267,7 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -275,6 +278,12 @@
 					"$(RHO_ROOT)/platform/shared/ruby/include",
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
+					../../../../../../platform/shared/common,
+					../../../../../../platform/shared/rubyext,
+					../../../../../../platform/shared/ruby/include,
+					../../../../../../platform/shared/ruby/iphone,
+					../../../../../../platform/shared,
+					../../../../../../platform/iphone/Classes,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
@@ -287,6 +296,7 @@
 		1DEB922408733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -296,6 +306,12 @@
 					"$(RHO_ROOT)/platform/shared/ruby/include",
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
+					../../../../../../platform/shared/common,
+					../../../../../../platform/shared/rubyext,
+					../../../../../../platform/shared/ruby/include,
+					../../../../../../platform/shared/ruby/iphone,
+					../../../../../../platform/shared,
+					../../../../../../platform/iphone/Classes,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;

data/lib/commonAPI/hardwarekeys/ext/keycapture.xml

@@ -25,12 +25,15 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
         </TEMPLATES>
 
         <CONSTANTS>
-          <CONSTANT name="IPHONE_VOLUME_UP" value="10" type="INTEGER" productException="eb">
+          <CONSTANT name="IPHONE_VOLUME_UP" value="IPHONE_VOLUME_UP" type="STRING" productException="eb">
               <DESC>IPhone volume up keyCode. Used to capture the volume up key when it is pressed.</DESC>
           </CONSTANT>
-          <CONSTANT name="IPHONE_VOLUME_DOWN" value="11" type="INTEGER" productException="eb">
+          <CONSTANT name="IPHONE_VOLUME_DOWN" value="IPHONE_VOLUME_DOWN" type="STRING" productException="eb">
               <DESC>IPhone volume down keyCode. Used to capture the volume down key when it is pressed.</DESC>
           </CONSTANT>
+          <CONSTANT name="ALL_KEYS" value="ALL" type="STRING" productException="eb">
+              <DESC>all keys captured</DESC>
+          </CONSTANT>
         </CONSTANTS>
 
         <PROPERTIES access="STATIC">
@@ -254,13 +257,12 @@ end
                         <RUBY>
                 <![CDATA[
     def keyCallback
-    {
-        if(@params["keyValue"] == Rho::KeyCapture.IPHONE_VOLUME_UP){
+        if @params["keyValue"] == Rho::KeyCapture::IPHONE_VOLUME_UP
             //do something
-        }
-    }
+        end
+    end
 
-    Rho::KeyCapture.captureKey true, Rho::KeyCapture.IPHONE_VOLUME_UP, url_for(:action => :key_Callback)
+    Rho::KeyCapture.captureKey true, Rho::KeyCapture::IPHONE_VOLUME_UP, url_for(:action => :key_Callback)
                         ]]>
                         </RUBY>
                     </CODE>
@@ -311,7 +313,7 @@ When the specified key is pressed, the event will fire but the homeKey event wil
            <REMARK title="Capturing Function">
                 <DESC>If you have enabled the function key in the configuration settings and that function key has some special behavior in the Operating system the key will not be capturable unless you also set the 'FunctionKeysCapturable' option (see RhoElements Configuration Settings). An example of special behavior is the F6 and F7 keys on the MC75a (non QWERTY) which control the volume up and volume down. Although 'FunctionKeysCapturable' will allow you to capture Function keys it will also disable the special Function key behavior. Which buttons map to which function keys will differ from device to device, some devices such as the MC9500 have dedicated, labeled function keys whereas other devices such as the MC75a do not label the fact that their volume / red phone / green phone keys all behave as function keys internally.</DESC>
             </REMARK>
-            
+
             <REMARK title="Keys with multiple functionalities">
                 <DESC>Some keys which are meant for performing multiple functionalities but performs the single functionality may return the single code value. In that case it is recommended to remap the key code value with the expected desired keycode value.</DESC>
             </REMARK>
@@ -327,7 +329,7 @@ When the specified key is pressed, the event will fire but the homeKey event wil
             <REMARK title="F5 Key">
                 <DESC>In Internet Explorer the F5 key is used to refresh the current page. It is not recommended to rely on this functionality on Windows Mobile and it is not supported.</DESC>
             </REMARK>
-            
+
             <REMARK title="PTT Keys">
                 <DESC>On Android, PTT keys are capturable using captureTrigger method only.</DESC>
             </REMARK>

data/lib/commonAPI/hardwarekeys/ext/platform/iphone/impl/KeyCaptureSingleton.h

@@ -7,13 +7,14 @@ typedef void (^SomeFunction)();
 
 @interface KeyCaptureSingleton : KeyCaptureSingletonBase<IKeyCaptureSingleton> {
     float launchVolume;
+    float savedLaunchVolume;
     BOOL hadToLowerVolume;
     BOOL hadToRaiseVolume;
-    
+
     BOOL _isCapturingVolumeButtons;
     BOOL _suspended;
     UIView *_volumeView;
-    
+
     id<IMethodResult> callbackHolder;
     NSMutableDictionary *keyCaptureCallbacks;
 }
@@ -30,4 +31,5 @@ typedef void (^SomeFunction)();
 -(void) remapKey:(NSString*)keyValue remapTo:(NSString*)remapTo methodResult:(id<IMethodResult>)methodResult;
 -(void) captureTrigger:(id<IMethodResult>)methodResult;
 
-@end
+
+@end

data/lib/commonAPI/hardwarekeys/ext/platform/iphone/impl/KeyCaptureSingleton.m

@@ -21,6 +21,10 @@ NSString* keyUp = @"up";
 NSString* keyDown = @"down";
 NSString* allKeys = @"all";
 
+#define IPHONE_VOLUME_UP_CODE = 10
+#define IPHONE_VOLUME_DOWN_CODE = 11
+
+
 @implementation KeyCaptureSingleton
 
 // capture volume buttons
@@ -46,8 +50,8 @@ void volumeListenerCallback (
                              ){
     const float *volumePointer = inData;
     float volume = *volumePointer;
-    
-    
+
+    //NSLog(@" VOLUME = [%@],  VOLUME FROM PLAYER = [%@], LAUNCH_VOLUME = [%@]", [NSNumber numberWithDouble:volume], [NSNumber numberWithDouble:[[MPMusicPlayerController applicationMusicPlayer] volume]], [NSNumber numberWithDouble:[(KeyCaptureSingleton*)inClientData launchVolume]]);
     if( volume > [(KeyCaptureSingleton*)inClientData launchVolume] )
     {
         [(KeyCaptureSingleton*)inClientData volumeUp];
@@ -56,18 +60,24 @@ void volumeListenerCallback (
     {
         [(KeyCaptureSingleton*)inClientData volumeDown];
     }
-    
+
 }
 
 -(void)volumeDown
 {
     AudioSessionRemovePropertyListenerWithUserData(kAudioSessionProperty_CurrentHardwareOutputVolume, volumeListenerCallback, self);
-    
-    [[MPMusicPlayerController applicationMusicPlayer] setVolume:launchVolume];
-    
-    [self performSelector:@selector(initializeVolumeButtonCapture) withObject:self afterDelay:0.1];
-    
-    
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //NSLog(@" GET VOLUME= [%@]", [NSNumber numberWithDouble:[[MPMusicPlayerController applicationMusicPlayer] volume]]);
+        [[MPMusicPlayerController applicationMusicPlayer] setVolume:launchVolume];
+        //NSLog(@" SET VOLUME TO = [%@]", [NSNumber numberWithDouble:launchVolume]);
+        //NSLog(@" GET VOLUME= [%@]", [NSNumber numberWithDouble:[[MPMusicPlayerController applicationMusicPlayer] volume]]);
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self initializeVolumeButtonCapture];
+        });
+    });
+
+
     if( self.downBlock )
     {
         self.downBlock();
@@ -77,17 +87,26 @@ void volumeListenerCallback (
 -(void)volumeUp
 {
     AudioSessionRemovePropertyListenerWithUserData(kAudioSessionProperty_CurrentHardwareOutputVolume, volumeListenerCallback, self);
-    
-    [[MPMusicPlayerController applicationMusicPlayer] setVolume:launchVolume];
-    
-    [self performSelector:@selector(initializeVolumeButtonCapture) withObject:self afterDelay:0.1];
-    
-    
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //NSLog(@" GET VOLUME= [%@]", [NSNumber numberWithDouble:[[MPMusicPlayerController applicationMusicPlayer] volume]]);
+        [[MPMusicPlayerController applicationMusicPlayer] setVolume:launchVolume];
+        //NSLog(@" SET VOLUME TO = [%@]", [NSNumber numberWithDouble:launchVolume]);
+        //NSLog(@" GET VOLUME= [%@]", [NSNumber numberWithDouble:[[MPMusicPlayerController applicationMusicPlayer] volume]]);
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self initializeVolumeButtonCapture];
+        });
+    });
+
+    //[[MPMusicPlayerController applicationMusicPlayer] setVolume:launchVolume];
+    //[self performSelector:@selector(initializeVolumeButtonCapture) withObject:self afterDelay:0.05];
+
     if( self.upBlock )
     {
         self.upBlock();
     }
-    
+
 }
 
 -(id)init
@@ -98,15 +117,15 @@ void volumeListenerCallback (
         self.isCapturingVolumeButtons = NO;
         self.suspended = NO;
         callbackHolder = nil;
-        
+
         [self setKeyCaptureCallbacks:[NSMutableDictionary new]];
-        
+
         self.upBlock = ^{
             id<IMethodResult> cb = [keyCaptureCallbacks objectForKey:keyUp];
             if ( cb != nil)
             {
                 NSMutableDictionary *res = [[NSMutableDictionary alloc] init];
-                [res setObject:[NSNumber numberWithInt:IPHONE_VOLUME_UP] forKey:HK_KEY_VALUE];
+                [res setObject:IPHONE_VOLUME_UP forKey:HK_KEY_VALUE];
                 [cb setResult:res];
             }
         };
@@ -115,7 +134,7 @@ void volumeListenerCallback (
             if ( cb != nil)
             {
                 NSMutableDictionary *res = [NSMutableDictionary new];
-                [res setObject:[NSNumber numberWithInt:IPHONE_VOLUME_DOWN] forKey:HK_KEY_VALUE];
+                [res setObject:IPHONE_VOLUME_DOWN forKey:HK_KEY_VALUE];
                 [cb setResult:res];
             }
         };
@@ -123,55 +142,57 @@ void volumeListenerCallback (
     return self;
 }
 
+
 -(void)startCapturingVolumeButtonEvents
 {
     NSAssert([[NSThread currentThread] isMainThread], @"This must be called from the main thread");
-    
+
     if(self.isCapturingVolumeButtons) {
         return;
     }
-    
+
     self.isCapturingVolumeButtons = YES;
-    
+
     AudioSessionInitialize(NULL, NULL, NULL, NULL);
     AudioSessionSetActive(YES);
-    
+
     launchVolume = [[MPMusicPlayerController applicationMusicPlayer] volume];
-    hadToLowerVolume = launchVolume == 1.0;
-    hadToRaiseVolume = launchVolume == 0.0;
-    
+    savedLaunchVolume = launchVolume;
+    hadToLowerVolume = launchVolume > 0.8750;
+    hadToRaiseVolume = launchVolume < 0.1250;
+
     // Avoid flashing the volume indicator
     if (hadToLowerVolume || hadToRaiseVolume)
     {
         dispatch_async(dispatch_get_current_queue(), ^{
             if( hadToLowerVolume )
             {
-                [[MPMusicPlayerController applicationMusicPlayer] setVolume:0.95];
-                launchVolume = 0.95;
+                [[MPMusicPlayerController applicationMusicPlayer] setVolume:0.8750];
+                launchVolume = 0.8750;
             }
-            
+
             if( hadToRaiseVolume )
             {
-                [[MPMusicPlayerController applicationMusicPlayer] setVolume:0.05];
-                launchVolume = 0.05;
+                [[MPMusicPlayerController applicationMusicPlayer] setVolume:0.1250];
+                launchVolume = 0.1250;
             }
         });
     }
-    
+
     CGRect frame = CGRectMake(0, -100, 10, 0);
     self.volumeView = [[[MPVolumeView alloc] initWithFrame:frame] autorelease];
     [self.volumeView sizeToFit];
     [[[[UIApplication sharedApplication] windows] objectAtIndex:0] addSubview:self.volumeView];
-    
+
     [self initializeVolumeButtonCapture];
-    
+
     if (!self.suspended)
     {
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(suspendCapturingVolumeButtonEvents:)
                                                      name:UIApplicationWillResignActiveNotification     // -> Inactive
                                                    object:nil];
-        
+
         // Observe notifications that trigger resume
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(resumeCapturingVolumeButtonEvents:)
@@ -201,35 +222,37 @@ void volumeListenerCallback (
 -(void)stopCapturingVolumeButtonEvents
 {
     NSAssert([[NSThread currentThread] isMainThread], @"This must be called from the main thread");
-    
+
     if(!self.isCapturingVolumeButtons)
     {
         return;
     }
-    
+
     // Stop observing all notifications
     if (!self.suspended)
     {
         [[NSNotificationCenter defaultCenter] removeObserver:self];
     }
-    
+
     AudioSessionRemovePropertyListenerWithUserData(kAudioSessionProperty_CurrentHardwareOutputVolume, volumeListenerCallback, self);
-    
+
+
+    [[MPMusicPlayerController applicationMusicPlayer] setVolume:savedLaunchVolume];
+
     if( hadToLowerVolume )
     {
-        [[MPMusicPlayerController applicationMusicPlayer] setVolume:1.0];
+        //[[MPMusicPlayerController applicationMusicPlayer] setVolume:1.0];
     }
-    
     if( hadToRaiseVolume )
     {
-        [[MPMusicPlayerController applicationMusicPlayer] setVolume:0.0];
+        //[[MPMusicPlayerController applicationMusicPlayer] setVolume:0.0];
     }
-    
+
     [self.volumeView removeFromSuperview];
     self.volumeView = nil;
-    
+
     AudioSessionSetActive(NO);
-    
+
     self.isCapturingVolumeButtons = NO;
 }
 
@@ -237,15 +260,15 @@ void volumeListenerCallback (
 {
     self.suspended = NO;
     [self stopCapturingVolumeButtonEvents];
-    
+
     [keyCaptureCallbacks removeObjectForKey:keyUp];
     [keyCaptureCallbacks removeObjectForKey:keyDown];
     [self setKeyCaptureCallbacks:nil];
 
-    
+
     self.upBlock = nil;
     self.downBlock = nil;
-    
+
     [super dealloc];
 }
 
@@ -264,7 +287,7 @@ void volumeListenerCallback (
 }
 
 -(void) captureKey:(BOOL)dispatch keyValue:(NSString*)keyValue methodResult:(id<IMethodResult>)methodResult {
-    
+
     if ([keyValue caseInsensitiveCompare:@"all"]==NSOrderedSame)
     {
         if ([methodResult hasCallback])
@@ -279,26 +302,16 @@ void volumeListenerCallback (
         }
     }
     else
-    {        
-        int outVal = 0;
-        NSScanner* intScanner = [NSScanner scannerWithString:keyValue];
-        if (!([intScanner scanInt:&outVal] && [intScanner isAtEnd]))
-        {
-            NSScanner* hexScanner = [NSScanner scannerWithString:keyValue];
-            if (!([hexScanner scanHexInt:&outVal]  && [hexScanner isAtEnd]))
-            {
-                outVal = 0;
-            }
-        }
-        
+    {
+
         NSString* key = @"";
-        
-        if (outVal==IPHONE_VOLUME_UP)
+
+        if ( [keyValue caseInsensitiveCompare:IPHONE_VOLUME_UP]==NSOrderedSame )
         {
             key = keyUp;
         }
         else
-        if (outVal==IPHONE_VOLUME_DOWN)
+        if ( [keyValue caseInsensitiveCompare:IPHONE_VOLUME_DOWN]==NSOrderedSame )
         {
             key = keyDown;
         }
@@ -314,7 +327,7 @@ void volumeListenerCallback (
             }
         }
     }
-    
+
     if ([keyCaptureCallbacks count] > 0)
     {
         if (!self.isCapturingVolumeButtons)
@@ -345,4 +358,4 @@ void volumeListenerCallback (
 
 
 
-@end
+@end