rhodes 5.5.0.3 → 5.5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fefb632e42b9675b28aa6a3a099b8cbf67e76a7
-  data.tar.gz: e76d92596810baaeb2c52cb82d2c37aff0fd709e
+  metadata.gz: 4b6a8fe4921a90ac277e6260888c303d0be2894d
+  data.tar.gz: f40242f22db04f9cad0845e3c6c3bd937ca8be79
 SHA512:
-  metadata.gz: 7558439b9d27ba3f40ccea3fbe90c57649258a33d299fb8c6539e8be7ea1a331787255d3bae489b71d5a100eab409638b68f482e84b0588412dc6978a9caee84
-  data.tar.gz: 775316f2f7e9ff1723dbc58dcb91204ca7e5004c4fb2df49f663d854054b07f358026e47f35e7b8b029570ebf907b3b321562b36e4b9469b0661d949f7f63a83
+  metadata.gz: 16e08d6a447f5df244cf071ff824b7b5178cc8ee33002236e4e83b7840e54bc74520ecb958c548c9cbd88a82e39a09e5fada56fa6a21c439ab56b1cd92132429
+  data.tar.gz: 5eaa670bce2d1496314a456f4c651973694002bf4c291e6fb7e4ebd73d3a397fcb5e6249c68c65a8fb6d0189d57a3af197495c20304ce7d4656263543baf5308

data/README.md

@@ -1,3 +1,13 @@
+# Current state of Rhomobile solution
+
+Currently Rhomobile solution supported and improved by TAU Technologies (partner of Zebra Technologies).
+For questions on commercial support contact [contact mail](mailto:info@tau-technologies.com) or reach out to the [TAU Technologies website](http://www.tau-technologies.com).
+
+Current actual version is Rhomobile Suite 5.5. [Download RMS 5.5](http://rhomobile.tau-technologies.com/index.html)
+
+Actual documentation located on [RMS 5.5 documentation](http://docs.tau-technologies.com/en/5.5/home)
+
+
 # RhoMobile Open Source Documentation
 
 This page contains links to documentation and source-code repositories for the RhoMobile Suite, which has been released by Zebra Technologies to the open source community. 

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationSingleton.java

@@ -37,6 +37,7 @@ import com.rho.notification.INotificationSingleton;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.R;
 import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.api.IMethodResult;
 import com.rhomobile.rhodes.api.MethodResult;
@@ -212,15 +213,26 @@ public class NotificationSingleton implements INotificationSingleton
         
         if (duration != 0)
         {
-            Activity activity = RhodesActivity.safeGetInstance();
-            if(vibrator != null) vibrator.cancel();
-            vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
-            
-            if ( duration > 15000 ) {
-                duration = 15000;
+            Context context = null;
+            try {
+                context = RhodesService.getContext();
+            }
+            catch (IllegalStateException e) {
+                context = null;
+                Logger.D(TAG, "Rhodes main Service (com.rhomobile.rhodes.RhodesService) is not run !!!");
+            }
+            if (context != null) {
+                if(vibrator != null) vibrator.cancel();
+                vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+
+                if ( duration > 15000 ) {
+                    duration = 15000;
+                }
+                vibrator.vibrate(duration > 0 ? duration : 1000);
+            }
+            else {
+                Logger.D(TAG, "Can not vibrate, because can not get Rhodes main Context !!!");
             }
-            
-            vibrator.vibrate(duration > 0 ? duration : 1000);
         }
     }
 

data/lib/commonAPI/coreapi/ext/platform/iphone/cpp_based_impl/SystemImpl.mm

@@ -138,8 +138,7 @@ namespace rho {
     
     void SystemImplIphone::getPhoneId(rho::apiGenerator::CMethodResult& result)
     {
-        //getIphoneProperty("phone_id", result);
-        result.set("");
+        getIphoneProperty("phone_id", result);
     }
     
     void SystemImplIphone::getDeviceName(rho::apiGenerator::CMethodResult& result)

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

@@ -98,7 +98,7 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
             </PROPERTY>
             <PROPERTY name="phoneId" type="STRING" readOnly="true">
                 <DESC>Hardware based ID. It depends on capabilities configured for an application and has to remain same even across application uninstall/install.</DESC>
-                <PLATFORM>WM, CE, Android</PLATFORM>
+                <PLATFORM>WM, CE, iOS, Android</PLATFORM>
             </PROPERTY>
             <PROPERTY name="deviceName" type="STRING" readOnly="true">
                 <DESC>Name of device application running on. Examples: '9000' (BB), 'iPhone', 'dream' (Android). In Consumer Android device, name of the Industrial Design along with manufacturer name shall be shown. </DESC>

data/platform/android/build/android.rake

@@ -1901,6 +1901,7 @@ namespace "build" do
           #next
         end
 
+        next if ((!package) or (package.empty?))
 
         r_dir = File.join $tmpdir, 'gen', package.split('.')
         mkdir_p r_dir

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -48,6 +48,8 @@
 #import "common/app_build_configs.h"
 
 #include <sys/xattr.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -419,8 +421,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             }
         }
 	}
-    
+    NSLog(@"Create rhodes logging and rhoconfig.txt loading");
 	rho_logconf_Init_with_separate_user_path(rho_native_rhopath(), rho_native_rhopath(), "", rho_native_rhouserpath());
+    NSLog(@"Create rhodes app");
 	rho_rhodesapp_create_with_separate_user_path(rho_native_rhopath(), rho_native_rhouserpath());
 	RAWLOG_INFO("Rhodes started");
 }
@@ -765,6 +768,8 @@ static const double RHO_IPHONE4_PPI = 326.0;
 // http://www.apple.com/ipad/specs/
 static const double RHO_IPAD_PPI = 132.0;
 static const double RHO_NEW_IPAD_PPI = 264.0;
+static const double RHO_IPAD_MINI_PPI = 163.0;
+static const double RHO_IPAD_MINI_RETINA_PPI = 326.0;
 
 static float get_scale() {
     float scales = 1;//[[UIScreen mainScreen] scale];
@@ -787,6 +792,24 @@ int rho_sysimpl_get_property_iphone(char* szPropName, NSObject** resValue)
 {
     if (strcasecmp("platform", szPropName) == 0)
     {*resValue = [NSString stringWithUTF8String:"APPLE"]; return 1;}
+    else if (strcasecmp("phone_id", szPropName) == 0){
+        NSString* uniqueIdentifier = nil;
+        if( [UIDevice instancesRespondToSelector:@selector(identifierForVendor)] ) {
+            // iOS 6+
+            uniqueIdentifier = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
+        } else {
+            // before iOS 6, so just generate an identifier and store it
+            uniqueIdentifier = [[NSUserDefaults standardUserDefaults] objectForKey:@"identiferForVendor"];
+            if( !uniqueIdentifier ) {
+                CFUUIDRef uuid = CFUUIDCreate(NULL);
+                uniqueIdentifier = (NSString*)CFUUIDCreateString(NULL, uuid);
+                CFRelease(uuid);
+                [[NSUserDefaults standardUserDefaults] setObject:uniqueIdentifier forKey:@"identifierForVendor"];
+            }
+        }
+        *resValue = uniqueIdentifier;
+        return 1;
+    }
     else if (strcasecmp("locale", szPropName) == 0)
     {*resValue = rho_sys_get_locale_iphone(); return 1; }
     else if (strcasecmp("country", szPropName) == 0) {
@@ -835,8 +858,26 @@ int rho_sysimpl_get_property_iphone(char* szPropName, NSObject** resValue)
              strcasecmp("ppi_y", szPropName) == 0) {
 #ifdef __IPHONE_3_2
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-            if (get_scale() > 1.2) {
-                *resValue = [NSNumber numberWithDouble:RHO_NEW_IPAD_PPI];
+			
+			//Fix DPI issue on Ipad Mini
+			//get the device model name
+			size_t size;
+			sysctlbyname("hw.machine", NULL, &size, NULL, 0);
+			char *machine = malloc(size);
+			sysctlbyname("hw.machine", machine, &size, NULL, 0);
+			NSString *platform = [NSString stringWithUTF8String:machine];
+			free(machine);
+				
+			// IPad Mini
+			if([platform isEqualToString:@"iPad2,5"] || [platform isEqualToString:@"iPad2,6"] || [platform isEqualToString:@"iPad2,7"]){
+				*resValue = [NSNumber numberWithDouble:RHO_IPAD_MINI_PPI];
+			}
+            // IPad Mini Retina
+            else if ([platform isEqualToString:@"iPad4,4"] || [platform isEqualToString:@"iPad4,5"] || [platform isEqualToString:@"iPad4,6"] || [platform isEqualToString:@"iPad4,7"] || [platform isEqualToString:@"iPad4,8"] || [platform isEqualToString:@"iPad4,9"] || [platform isEqualToString:@"iPad5,1"] || [platform isEqualToString:@"iPad5,2"]) {
+                *resValue = [NSNumber numberWithDouble:RHO_IPAD_MINI_RETINA_PPI];
+            }
+		    else if (get_scale() > 1.2) {
+		        *resValue = [NSNumber numberWithDouble:RHO_NEW_IPAD_PPI];
             }
             else {
                 *resValue = [NSNumber numberWithDouble:RHO_IPAD_PPI];

data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm

@@ -269,8 +269,9 @@ static RhoNativeViewManagerOC *instance = NULL;
 	[sharedInstance.mProviders removeObjectForKey:viewType];
 }
 
-+(UIWebView*)getWebViewObject:(int)tab_index {
-	return [[[Rhodes sharedInstance] mainView] getWebView:tab_index];
+// UIView* for iPhone - ATTENTION !!! Now method return CONTAINER VIEW for WebView. For UIWebView is [UIWebView scrollView]. For WkWebView is [WKWebView scrollView] !!!
++(UIView*)getWebViewObject:(int)tab_index {
+	return [[[[Rhodes sharedInstance] mainView] getRhoWebView:tab_index] containerView];
 }
 
 
@@ -428,7 +429,7 @@ void RhoNativeViewManager::unregisterViewType(const char* viewType) {
 }
 
 // that function return native object used for display Web content :
-// UIWebView* for iPhone
+// // UIView* for iPhone - ATTENTION !!! Now method return CONTAINER VIEW for WebView. For UIWebView is [UIWebView scrollView]. For WkWebView is [WKWebView scrollView] !!!
 // jobject for Android - jobect is android.webkit.WebView class type
 // HWND for Windows Mobile 
 void* RhoNativeViewManager::getWebViewObject(int tab_index) {

data/platform/iphone/Classes/NativeView/RhoNativeViewManagerOC.h

@@ -66,7 +66,7 @@
 
 +(void)registerViewType:(NSString*)viewType factory:(id)factory;
 +(void)unregisterViewType:(NSString*)viewType;
-+(UIWebView*)getWebViewObject:(int)tab_index;
++(UIView*)getWebViewObject:(int)tab_index;
 
 +(int)create_native_view:(NSString*)viewType tab_index:(int)tab_index params:(VALUE)params;
 +(void)navigate_native_view:(int)nv_id message:(NSString*)message;

data/platform/iphone/Classes/RhoMainView.h

@@ -25,12 +25,18 @@
 *------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>
+#import "RhoWebView.h"
+
+
+#define RHO_TAG_WEBVIEW 1
+#define RHO_TAG_TOOLBAR 2
+#define RHO_TAG_NAVBAR 3
 
 @protocol RhoMainView
 
 - (UIView*)view;
 
-- (UIWebView*)detachWebView;
+- (id<RhoWebView,NSObject>)detachRhoWebView;
 
 - (void)loadHTMLString:(NSString*)data;
 
@@ -51,7 +57,7 @@
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
 - (void)removeNavBar;
 
-- (UIWebView*)getWebView:(int)tab_index;
+- (id<RhoWebView,NSObject>)getRhoWebView:(int)tab_index;
 
 -(void)openNativeView:(UIView*)nv_view tab_index:(int)tab_index;
 -(void)closeNativeView:(int)tab_index;

data/platform/iphone/Classes/RhoUIWebView.h

@@ -0,0 +1,75 @@
+/*------------------------------------------------------------------------
+ * (The MIT License)
+ *
+ * Copyright (c) 2008-2016 TAU Technologies, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * http://tau-technologies.com
+ *------------------------------------------------------------------------*/
+
+#import <UIKit/UIKit.h>
+#import "RhoWebView.h"
+
+@interface RhoUIWebView : NSObject<RhoWebView, UIWebViewDelegate> {
+    UIWebView *webview;
+    id<RhoWebViewDelegate,NSObject> delegate;
+}
+
+@property (nonatomic,retain) UIWebView *webview;
+@property (nonatomic,retain) id<RhoWebViewDelegate,NSObject> delegate;
+
+- (id)initWithFrame:(CGRect)frame;
+
+- (void) setupDelegate:(id<RhoWebViewDelegate,NSObject>)delegate;
+
+- (UIView*)view;
+
+- (UIView*)containerView;
+
+- (NSString*)currentLocation;
+
+// UIWebView
+
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+
+- (void)loadRequest:(NSURLRequest *)request;
+
+- (void)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL;
+
+- (void)stopLoading;
+
+- (void)reload;
+
+- (void)goBack;
+
+- (void)goForward;
+
+
+// UIWebViewDelegate
+
+- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType;
+
+- (void)webViewDidStartLoad:(UIWebView *)webView;
+
+- (void)webViewDidFinishLoad:(UIWebView *)webView;
+
+- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error;
+
+@end

data/platform/iphone/Classes/RhoUIWebView.m

@@ -0,0 +1,142 @@
+/*------------------------------------------------------------------------
+ * (The MIT License)
+ *
+ * Copyright (c) 2008-2016 TAU Technologies, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * http://tau-technologies.com
+ *------------------------------------------------------------------------*/
+
+#import "RhoUIWebView.h"
+#import "RhoMainView.h"
+
+#include "logging/RhoLog.h"
+#include "common/RhoConf.h"
+
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoUIWebView"
+
+
+@implementation RhoUIWebView
+
+@synthesize webview, delegate;
+
+
+- (id)initWithFrame:(CGRect)frame {
+    [self init];
+    UIWebView* w = [[UIWebView alloc] initWithFrame:frame];
+    w.scalesPageToFit = YES;
+    if ( !rho_conf_getBool("WebView.enableBounce") )
+        [[w scrollView] setBounces:NO];
+    w.userInteractionEnabled = YES;
+    w.multipleTouchEnabled = YES;
+    w.clipsToBounds = NO;
+    w.dataDetectorTypes = UIDataDetectorTypeNone;
+    w.delegate = self;
+    w.autoresizesSubviews = YES;
+    //w.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    w.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    w.tag = RHO_TAG_WEBVIEW;
+    //assert([w retainCount] == 1);
+    self.webview = w;
+    
+    
+    
+    return self;
+}
+
+- (UIView*)view {
+    return self.webview;
+}
+
+- (NSString*)currentLocation {
+    return [[webview.request mainDocumentURL] absoluteString];
+}
+
+- (void) setupDelegate:(id<RhoWebViewDelegate,NSObject>)delegate {
+    self.delegate = delegate;
+}
+
+- (UIView*)containerView {
+    return self.webview.scrollView;
+}
+
+
+
+
+//UIWebView
+
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script {
+    return [webview stringByEvaluatingJavaScriptFromString:script];
+}
+
+- (void)loadRequest:(NSURLRequest *)request {
+    [webview loadRequest:request];
+}
+
+- (void)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL {
+    [webview loadHTMLString:string baseURL:baseURL];
+}
+
+- (void)stopLoading {
+    [webview stopLoading];
+}
+
+- (void)reload {
+    [webview reload];
+}
+
+- (void)goBack {
+    [webview goBack];
+}
+
+- (void)goForward {
+    [webview goForward];
+}
+
+
+
+
+
+
+
+// UIWebViewDelegate
+
+- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
+    if (delegate != nil) {
+        return [delegate shouldStartLoadWithRequest:self request:request navigationType:navigationType];
+    }
+    return YES;
+}
+
+- (void)webViewDidStartLoad:(UIWebView *)webView {
+    [delegate webViewDidStartLoad:self];
+}
+
+- (void)webViewDidFinishLoad:(UIWebView *)webView {
+    [delegate webViewDidFinishLoad:self];
+}
+
+- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
+    [delegate didFailLoadWithError:self error:error];
+}
+
+@end