rhodes 6.2.0 → 7.1.17

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java

@@ -440,7 +440,7 @@ public class RhoExtManagerImpl implements IRhoExtManager {
         synchronized( mExtensions ) {
             boolean res = false;
             for (Map.Entry<String, IRhoExtension> extEntry : mExtensions.entrySet()) {
-                Logger.T(TAG, "onBeforeNavigate: " + extEntry.getKey());
+                Logger.T(TAG, "onLoadResource: " + extEntry.getKey());
                 res = extEntry.getValue().onLoadResource(this, url, rhoWebView, res);
             }
         }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -67,12 +67,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.AbsoluteLayout;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.rhomobile.rhodes.webview.RhoWebViewClient;
+import com.rhomobile.rhodes.SecurityTokenGenerator;
+
 public class SimpleMainView implements MainView {
 
 	private final static String TAG = "SimpleMainView";	
@@ -106,7 +110,8 @@ public class SimpleMainView implements MainView {
 			
 		if (al instanceof WebView) {
 			// we have android WebView
-			
+			((WebView)al).getSettings().setUserAgentString(SecurityTokenGenerator.getInstance().getSecureAgent());
+
 			// check for exist developer extension
 			try {
 				Class<?> dev_class = Class.forName("com.rho.development.Development");
@@ -687,7 +692,9 @@ public class SimpleMainView implements MainView {
     public void back(int index) {
         restoreWebView();
         
-        String startUrl = RhoConf.getString("start_path");
+		String startUrl = RhoConf.getString("start_path");
+		
+		if(webView == null) return;
 
         boolean bStartPage = startUrl.equals(webView.getUrl());
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java

@@ -29,6 +29,7 @@ package com.rhomobile.rhodes.osfunctionality;
 import android.content.Context;
 import android.webkit.WebView;
 
+import android.app.Notification.Builder;
 
 public interface AndroidFunctionality {
     final String TAG = AndroidFunctionality.class.getSimpleName();
@@ -48,4 +49,6 @@ public interface AndroidFunctionality {
     int getScreenOrientation(Context context);
 
     void pauseWebView( WebView view, boolean doPause );
+
+    Builder getNotificationBuilder( Context ctx, String channelID, String channelName );
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java

@@ -36,6 +36,8 @@ import android.view.WindowManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
+import android.app.Notification.Builder;
+
 // Android 1.0
 class AndroidFunctionality01 implements AndroidFunctionality {
 
@@ -84,4 +86,9 @@ class AndroidFunctionality01 implements AndroidFunctionality {
             }
         }
     }
+
+    @Override
+    public Builder getNotificationBuilder( Context ctx, String channelID, String channelName ) {
+        throw new UnsupportedOperationException();
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality11.java

@@ -30,10 +30,15 @@ import com.rhomobile.rhodes.Logger;
 
 import android.webkit.WebView;
 
+import android.app.Notification.Builder;
+import android.content.Context;
+
 
 //Android 3.0.x
 class AndroidFunctionality11 extends AndroidFunctionality10 implements AndroidFunctionality {
 
+	private static final int PRIORITY_HIGH = 0x00000001;
+
     @Override
     public void pauseWebView( WebView view, boolean doPause ) {
 	if ( doPause ) {	    
@@ -43,5 +48,12 @@ class AndroidFunctionality11 extends AndroidFunctionality10 implements AndroidFu
 	    view.onResume();
 	    Logger.I(TAG, "Resume WebView");
 	}
-    }  
+    }
+
+	@Override
+	public Builder getNotificationBuilder( Context ctx, String channelID, String channelName ) {
+		Builder builder = new android.app.Notification.Builder(ctx);
+		builder.setPriority(PRIORITY_HIGH);
+		return builder;
+	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality26.java

@@ -0,0 +1,105 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, 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://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+import android.support.annotation.RequiresApi;
+import android.app.Notification.Builder;
+import android.content.Context;
+import android.app.NotificationManager;
+import com.rhomobile.rhodes.Logger;
+import android.os.Build.VERSION;
+
+
+@RequiresApi(26)
+class AndroidFunctionality26 extends AndroidFunctionality11 implements AndroidFunctionality {
+
+    private static final String TAG = AndroidFunctionality26.class.getSimpleName();
+    private static final int IMPORTANCE_HIGH = 0x00000004;
+    private static final int PRIORITY_HIGH = 0x00000001;
+
+    @Override
+    public Builder getNotificationBuilder( Context ctx, String channelID, String channelName ) {
+
+        Builder builder = null;
+
+        try { 
+            NotificationManager notificationManager = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE);
+
+            Class ncClass = Class.forName("android.app.NotificationChannel");
+            java.lang.reflect.Constructor ncCtor = ncClass.getConstructor( String.class, CharSequence.class, int.class );
+
+            java.lang.reflect.Method getNCMethod = notificationManager.getClass().getMethod("getNotificationChannel", String.class);
+            java.lang.reflect.Method createNCMethod = notificationManager.getClass().getMethod("createNotificationChannel", ncClass);
+
+            java.lang.reflect.Method enableVibrationMethod = ncClass.getMethod("enableVibration", boolean.class);
+            java.lang.reflect.Method setVibrationMethod = ncClass.getMethod("setVibrationPattern", long[].class);
+
+            Object channel = getNCMethod.invoke(notificationManager,channelID);
+
+            if (channel == null) {
+                channel = ncCtor.newInstance( channelID, channelName, 4 );
+
+                enableVibrationMethod.invoke(channel,true);
+                setVibrationMethod.invoke(channel,new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400});
+              
+                createNCMethod.invoke(notificationManager,channel);
+            }
+
+            java.lang.reflect.Constructor nbCtor = android.os.Build.VERSION.SDK_INT >= 26 ? 
+                Builder.class.getConstructor( Context.class, String.class ) :
+                Builder.class.getConstructor( Context.class );
+
+            builder = android.os.Build.VERSION.SDK_INT >= 26 ? 
+                 (Builder)nbCtor.newInstance( ctx, channelID ) : 
+                 (Builder)nbCtor.newInstance( ctx );
+
+            java.lang.reflect.Method setPriorityMethod = ncClass.getMethod("setPriority", Integer.class);
+
+            if(android.os.Build.VERSION.SDK_INT >= 26)
+            {
+                java.lang.reflect.Method setShowBadgeMethod = ncClass.getMethod("setShowBadge", boolean.class);
+                setShowBadgeMethod.invoke(channel, true);
+                setPriorityMethod.invoke(builder, IMPORTANCE_HIGH);
+            }
+            else
+            {
+                setPriorityMethod.invoke(builder, PRIORITY_HIGH);
+                //builder.setVisibility(android.app.Notification.VISIBILITY_PUBLIC);
+            }
+
+        } catch( Exception e ) {
+            Logger.E( TAG, "Error initializing notification channel. Will create default builder" );
+            Logger.E( TAG, e.toString() );
+        }
+
+        if ( null == builder ) {
+            builder = super.getNotificationBuilder( ctx, channelID, channelName );
+        }
+
+        return builder;
+    }    
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

@@ -40,7 +40,10 @@ public class AndroidFunctionalityManager {
 	public static AndroidFunctionality getAndroidFunctionality() {
 		if (ourFunctionality == null) {
 			int sdkVersion = Build.VERSION.SDK_INT;
-			if (sdkVersion >= Build.VERSION_CODES.HONEYCOMB) { // 3.0.x - 11
+
+			if (sdkVersion >= 26) {
+				ourFunctionality = new AndroidFunctionality26();
+			}else if (sdkVersion >= Build.VERSION_CODES.HONEYCOMB) { // 3.0.x - 11
 				ourFunctionality = new AndroidFunctionality11();
 			}
 			else if (sdkVersion == Build.VERSION_CODES.GINGERBREAD_MR1) { // 2.3.3 and above - 10

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

@@ -54,6 +54,7 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
+import android.net.http.X509TrustManagerExtensions;
 
 import android.util.Base64;
 
@@ -108,11 +109,15 @@ public class SSLImpl {
 	
 	private static class MySecureTrustManager implements X509TrustManager {
 		private X509TrustManager mSysTrustManager;
-		private X509TrustManager mCustomTrustManager;
+        private X509TrustManager mCustomTrustManager;
+        private X509TrustManagerExtensions mSysTrustManagerEx;
+		private X509TrustManagerExtensions mCustomTrustManagerEx;
 		
 		public MySecureTrustManager( X509TrustManager sysTrustManager, X509TrustManager customTrustManager ) {
-			mSysTrustManager = sysTrustManager;
-			mCustomTrustManager = customTrustManager;
+			mSysTrustManager =  sysTrustManager;
+            mCustomTrustManager = customTrustManager;
+            mSysTrustManagerEx =  new X509TrustManagerExtensions(sysTrustManager);
+            mCustomTrustManagerEx = new X509TrustManagerExtensions(customTrustManager);
 		}
 
 		@Override
@@ -140,7 +145,22 @@ public class SSLImpl {
 				}
 			}
 			
-		}
+        }
+        
+        public List<X509Certificate> checkServerTrusted(X509Certificate[] chain, String authType, String host) throws CertificateException
+        {
+            try {
+				if ( mCustomTrustManager != null ) {
+					return mCustomTrustManagerEx.checkServerTrusted(chain, authType, host);
+				}
+			} catch ( CertificateException e ) {
+				if ( mSysTrustManager != null ) {
+					return mSysTrustManagerEx.checkServerTrusted(chain, authType, host);
+				}
+			}
+                
+            return null;
+        }
 
 		@Override
 		public X509Certificate[] getAcceptedIssuers() {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java

@@ -27,6 +27,8 @@ import android.webkit.WebBackForwardList;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebViewClient;
+import android.webkit.CookieManager;
+
 
 public class GoogleWebView implements IRhoWebView {
     private static final String TAG = GoogleWebView.class.getSimpleName(); 
@@ -84,7 +86,24 @@ public class GoogleWebView implements IRhoWebView {
                 mWebView.setVerticalScrollbarOverlay(true);
                 mWebView.setHorizontalScrollbarOverlay(true);
                 mWebView.setFocusableInTouchMode(true);
-		int sdkVersion = Build.VERSION.SDK_INT;
+                int sdkVersion = Build.VERSION.SDK_INT;
+                
+                if ( sdkVersion >= 21 ) {
+                    Logger.I(TAG, "Enabling third-party cookies");
+                    CookieManager cm = CookieManager.getInstance();
+                    try {
+                        java.lang.reflect.Method mtdAllow3Party = cm.getClass().getMethod("setAcceptThirdPartyCookies", android.webkit.WebView.class, boolean.class);
+                        mtdAllow3Party.invoke(cm,mWebView,true);
+                        Logger.I(TAG, "Enabling third-party cookies done");
+                    } catch (SecurityException e) { 
+                        Logger.W(TAG, "Can't allow third-party cookies explicily due to SecurityException");
+                    } catch (NoSuchMethodException e) { 
+                        Logger.W(TAG, "Can't allow third-party cookies explicily due to NoSuchMethodException");
+                    } catch ( Exception e ) {
+                        Logger.E(TAG, "Can't allow third-party cookies explicily due to exception: " + e.toString() );
+                    }
+                }
+                
     		  /*  if(sdkVersion <19){
     		    	  mWebView.getSettings().setLoadWithOverviewMode(true);
     		    	  mWebView.getSettings().setUseWideViewPort(true);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java

@@ -27,6 +27,11 @@
 package com.rhomobile.rhodes.webview;
 
 import java.io.File;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.io.IOException;
+import java.util.Map;
 
 import com.rhomobile.rhodes.LocalFileProvider;
 import com.rhomobile.rhodes.Logger;
@@ -250,6 +255,11 @@ public class RhoWebViewClient extends WebViewClient
             handler.cancel();
         }
     }
+
+    //@Override
+    //public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+    //    return null;
+    //}
     
     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {

data/platform/android/build/Rakefile

@@ -54,25 +54,29 @@ 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)
 
 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)
 
 SHAREDLIB_ARM = File.join(TARGETDIR_ARM,SHAREDLIB)
 SHAREDLIB_x86 = File.join(TARGETDIR_x86,SHAREDLIB)
 SHAREDLIB_MIPS = File.join(TARGETDIR_MIPS,SHAREDLIB)
+SHAREDLIB_AARCH64 = File.join(TARGETDIR_AARCH64,SHAREDLIB)
 
 namespace 'config' do
   task :arm do
@@ -86,14 +90,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))
@@ -104,6 +114,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')
@@ -129,6 +140,12 @@ 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
+
 file SHAREDLIB_ARM => [TARGETDIR_ARM, FileList.new(LINKDEPS)].flatten do |t|
     Rake::Task["config:arm"].invoke
     cc_link(t.name, OBJ_ARM, LINKARGS + get_stl_link_args('armeabi'), LINKDEPS) or raise "\e[31mLinking library failed: #{t.name}\e[0m"
@@ -155,24 +172,36 @@ file SHAREDLIB_MIPS => [TARGETDIR_MIPS, FileList.new(LINKDEPS)].flatten do |t|
     end
 end
 multitask SHAREDLIB_MIPS => OBJ_MIPS
+
+file SHAREDLIB_AARCH64 => [TARGETDIR_AARCH64, FileList.new(LINKDEPS)].flatten do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_link(t.name, OBJ_AARCH64, LINKARGS + get_stl_link_args('aarch64'), LINKDEPS) or raise "\e[31mLinking library failed: #{t.name}\e[0m"
+    unless $debug
+    cc_run($stripbin, [t.name])
+    end
+end
+multitask SHAREDLIB_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
   
 namespace 'link' do
   task :arm => SHAREDLIB_ARM
   task :x86 => SHAREDLIB_x86
   task :mips => SHAREDLIB_MIPS
+  task :aarch64 => SHAREDLIB_AARCH64
 end
 
 task :default => ["build:arm", "build:x86"]