tauplatform 1.0.2 → 1.0.3

data/lib/extensions/barcode-old/ext/barcode/platform/iphone/Rakefile

@@ -41,7 +41,7 @@ namespace "build" do
 
   task :all => :config do
 
-    iphone_path = ENV['RHO_ROOT'] + '/lib/extensions/barcode/ext/barcode/platform/iphone'
+    iphone_path = ENV['RHO_ROOT'] + '/lib/extensions/barcode-old/ext/barcode/platform/iphone'
 
 
     simulator = $sdk =~ /iphonesimulator/

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'
   end
-  
+
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'
   end
-end
+end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'
   end
-  
+
 end

data/platform/android/Rhodes/jni/src/sslimpl.cpp

@@ -102,7 +102,7 @@ SSLImpl::SSLImpl()
     if (!cls) return;
     midConstructor = getJNIClassMethod(env, cls, "<init>", "()V");
     if (!midConstructor) return;
-    midConnect = getJNIClassMethod(env, cls, "connect", "(IZ)Z");
+    midConnect = getJNIClassMethod(env, cls, "connect", "(IZLjava/lang/String;)Z");
     if (!midConnect) return;
     midShutdown = getJNIClassMethod(env, cls, "shutdown", "()V");
     if (!midShutdown) return;
@@ -133,7 +133,12 @@ CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, int ssl_verify
     if (!storage) return CURLE_SSL_CONNECT_ERROR;
 
     jobject obj = (jobject)storage;
-    jboolean result = jnienv()->CallBooleanMethod(obj, midConnect, sockfd, (jboolean)ssl_verify_peer);
+
+    JNIEnv* env = jnienv();
+    jhstring jHostname = rho_cast<jstring>(env, host_name);
+
+
+    jboolean result = jnienv()->CallBooleanMethod(obj, midConnect, sockfd, (jboolean)ssl_verify_peer, (jstring)jHostname.get());
     if (!result)
         return CURLE_SSL_CONNECT_ERROR;
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java

@@ -61,6 +61,8 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.file.RhoFileApi;
 
+import java.util.StringTokenizer;
+
 
 public class SSLImpl {
 	
@@ -342,7 +344,7 @@ public class SSLImpl {
         Logger.I(TAG, "Secure SSL factory initialization completed");
         
         return (SSLSocketFactory)context.getSocketFactory();
-        
+
     }
     	
 	private static SSLSocketFactory getFactory(boolean verify) throws NoSuchAlgorithmException, KeyManagementException, CertificateException, KeyStoreException, IOException, UnrecoverableKeyException {
@@ -357,18 +359,23 @@ public class SSLImpl {
 			SSLContext context = SSLContext.getInstance("TLS");
 			TrustManager[] managers = {new MyTrustManager()};
 			context.init(null, managers, new SecureRandom());
-			factory = context.getSocketFactory();
+            factory = context.getSocketFactory();
 		}
 		return factory;
 	}
 	
-	public boolean connect(int fd, boolean sslVerifyPeer) {
+	public boolean connect(int fd, boolean sslVerifyPeer, String hostname ) {
 		try {
+            Logger.I(TAG, "SSL connect to " + hostname);
+
             RhoSockAddr remote = getRemoteSockAddr(fd);
             Socket s = new RhoSocket(fd, remote);
             SSLSocketFactory f = getFactory(sslVerifyPeer);
 
-            SSLSocket aSock = (SSLSocket)f.createSocket(s, remote.host.toString(), remote.port, true);
+            StringTokenizer st = new StringTokenizer( hostname, ":" );
+            String host = st.nextToken();
+
+            SSLSocket aSock = (SSLSocket)f.createSocket(s, host, remote.port, true);
             aSock.setUseClientMode(true);
 
             synchronized (this) {

data/platform/android/build/android.rake

@@ -1932,6 +1932,12 @@ namespace "build" do
           classpath += $path_separator + jar
       end
 
+      javalibsdir = Jake.get_absolute("platform/android/lib")
+
+      Dir.glob( File.join(javalibsdir,"*.jar" )) do |filepath|
+        classpath += $path_separator + filepath
+      end      
+
       $ext_android_additional_sources.each do |extpath, list|
         ext = File.basename(extpath)
         ext_classpath = classpath

data/platform/iphone/Classes/SimpleMainView.m

@@ -342,6 +342,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
     }
     
     [toolbar removeFromSuperview];
+    
     //MOHUS
     //assert(!toolbar || [toolbar retainCount] == 1);
     self.toolbar = nil;
@@ -359,11 +360,15 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	wFrame.origin.y = 0;
     
     toolbar = [self newToolbar:bar_info frame:wFrame];
-    assert([toolbar retainCount] == 1);
+    
+    //MOHUS
+    //assert([toolbar retainCount] == 1);
     toolbar.tag = RHO_TAG_TOOLBAR;
     UIView* root = self.view;
     [root addSubview:toolbar];
-    assert([toolbar retainCount] == 2);
+    
+    //MOHUS
+    //assert([toolbar retainCount] == 2);
     
     CGRect tbFrame = toolbar.frame;
 	wFrame = [self getContentRect];
@@ -503,7 +508,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
     self.view = root;
 	
     [root release];
-    assert([root retainCount] == 1);
+    //assert([root retainCount] == 1);
 }
 
 - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.m

@@ -206,7 +206,7 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 - (CRhoURLResponse*) makeDirectHttpRequest:(NSURL*)theUrl
 {
-  NSLog(@"Will make local request to %@", [theUrl absoluteString]);
+  //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
   
   const char* uri = [[theUrl path] UTF8String];
   const char* method = [[[self request] HTTPMethod] UTF8String];

data/platform/shared/common/RhodesApp.cpp

@@ -2932,6 +2932,10 @@ void rho_rhodesapp_setStartParametersOriginal(const char* szParams)
     RHODESAPP().setStartParametersOriginal(szParams? szParams:"");
 }
     
+int rho_rhodesapp_is_application_active() {
+    return RHODESAPP().isApplicationActive() ? 1 : 0;
+}
+    
 int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 {
     String strCmdLineSecToken;

data/platform/shared/common/RhodesApp.h

@@ -112,6 +112,7 @@ namespace common {
         virtual bool onReinstallConfigUpdate(const HashtablePtr<String,Vector<String>* >& conflicts) = 0;
         virtual bool onMigrateSource() = 0;
         virtual bool onDeviceScreenEvent(const int newState) = 0;
+        virtual bool isApplicationActive() = 0;
     };
     
     class ApplicationEventReceiver : public IApplicationEventReceiver
@@ -132,6 +133,8 @@ namespace common {
         
         virtual bool isCallbackSet();
         virtual void setCallback(apiGenerator::CMethodResult& oResult);
+        
+        virtual bool isApplicationActive() { return m_app_state == applicationStateActivated; }
     };
 
 class CRhodesApp : public CRhodesAppBase
@@ -290,6 +293,8 @@ public:
     #ifdef OS_WINCE
     bool isWebkitOutofProcess();
     #endif
+    
+    virtual bool isApplicationActive() { return getApplicationEventReceiver()->isApplicationActive(); }
 
 protected:
     virtual void run();
@@ -410,6 +415,9 @@ void rho_platform_restart_application();
 void rho_sys_set_network_status_notify(const char* url, int poll_interval);
 void rho_sys_clear_network_status_notify();
     
+int rho_rhodesapp_is_application_active();
+    
+    
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/net/CURLNetRequest.cpp

@@ -673,9 +673,11 @@ curl_slist *CURLNetRequest::CURLHolder::set_options(const char *method, const St
     // could repeated twice or more times
     if (RHODESAPP().isBaseUrl(strUrl))
 	{
-        curl_easy_setopt(m_curl, CURLOPT_CONNECTTIMEOUT, 10*24*60*60);
-		curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, 10*24*60*60);
+        timeout = 10*24*60*60;
+        curl_easy_setopt(m_curl, CURLOPT_CONNECTTIMEOUT, timeout);
+        curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, timeout);
 	}
+
     
     curl_slist *hdrs = NULL;
     // Disable "Expect: 100-continue"

data/platform/shared/net/HttpServer.cpp

@@ -302,8 +302,8 @@ CHttpServer::CHttpServer(int port, String const &root, String const &user_root,
     , m_localResponseWriter(0)
     , m_pQueue(0)
 #endif
-{
-    m_enable_external_access = false;
+{    
+    m_enable_external_access = RHOCONF().getBool("enable_external_server_access");
     m_started_as_separated_simple_server = false;
     m_root = CFilePath::normalizePath(root);
 #ifdef RHODES_EMULATOR

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -258,7 +258,7 @@ void RhoRubyStart()
 //#endif
 
 #if defined(WINDOWS_PLATFORM) && !defined(RHODES_EMULATOR) && !defined(RHODES_QT_PLATFORM)
-    //init_rhoext_Signature();
+    init_rhoext_Signature();
 #else
     //Init_SignatureCapture();
 #endif

data/res/generators/templates/iphone_project/Bremen7.xcodeproj/project.pbxproj

@@ -530,6 +530,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_BITCODE = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -572,6 +573,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = YES;
+				ENABLE_BITCODE = NO;
 				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
@@ -629,6 +631,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = YES;
+				ENABLE_BITCODE = NO;
 				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;

data/version

@@ -1 +1 @@
-1.0.2
+1.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tauplatform
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - TAU Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: templater