rhodes 7.4.1 → 7.6.0

data/lib/commonAPI/barcode/ext.yml

@@ -10,14 +10,11 @@ android:
   exttype: rakefile
   sdk_addons: ['EMDK']
   maven_deps:
-    - 'com.google.android.gms:play-services-vision:9.4.0'
-    - 'com.android.support:support-v4:25.2.0'
-    - 'com.android.support:design:25.2.0'
-   # - 'com.android.support:support-compat:25.2.0'
-   # - 'com.android.support:support-core-ui:25.2.0'
-   # - 'com.android.support:support-media-compat:25.2.0'
-   # - 'com.android.support:support-fragment:25.2.0'
-   # - 'com.android.support:support-core-utils:25.2.0'
+    - 'com.google.android.gms:play-services-vision:20.1.3'
+    - 'androidx.core:core:1.5.0'
+    - 'androidx.appcompat:appcompat:1.3.0'
+    - 'androidx.lifecycle:lifecycle-common:2.3.1'
+    - 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
   
 sailfish:
   proerb: ext/platform/qt/Barcode.pro.erb

data/lib/commonAPI/bluetooth/ext/platform/qt/Bluetooth.pro

@@ -7,7 +7,7 @@ equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6): {
         QT += dbus
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n
+        CONFIG += auroraapp c++14 auroraapp_i18n
     }
     greaterThan(QT_MINOR_VERSION, 7): {
         CONFIG += c++14

data/lib/commonAPI/bluetooth/ext/platform/qt/Bluetooth.pro.erb

@@ -1,6 +1,6 @@
 QT += core bluetooth gui quick dbus
 DEFINES += OS_SAILFISH OS_LINUX
-CONFIG += sailfishapp c++14 sailfishapp_i18n
+CONFIG += auroraapp c++14 auroraapp_i18n
 
 TARGET = bluetooth
 TEMPLATE = lib

data/lib/commonAPI/bluetooth/ext/platform/qt/src/bluetooth/bluetoothhelper.h

@@ -58,7 +58,7 @@ public:
     QString getLastError() const{return lastError;}
     QString getDeviceName(){
         if (hostInfo.name().isEmpty()){
-            hostInfo.setName("nemo");
+            hostInfo.setName("defaultuser");
         }
         return hostInfo.name();
 

data/lib/commonAPI/coreapi/RhoSystemApi.rb

@@ -28,4 +28,10 @@ class System
        return false if res == 'false'
        res
    end
+
+   def self.clear_start_params
+    if Rho::System.platform == 'ANDROID'
+        Rho::Intent.cleanStartParameters
+    end
+   end
 end

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

@@ -155,6 +155,10 @@ Notice that this looks very similar to a standard AndroidManifest.XML file secti
             <METHOD name="stopListening" hasCallback="none" productException="">
                 <DESC>Stop listening for custom intents.</DESC>
             </METHOD>
+            <METHOD name="cleanStartParameters" hasCallback="none" productException="">
+                <PLATFORM>Android</PLATFORM>
+                <DESC>Stop listening for custom intents.</DESC>
+            </METHOD>
         </METHODS>
         <REMARKS>
             <REMARK title="Registering Intent Receiver">

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

@@ -50,8 +50,6 @@ 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')
-
 cd '../../..'
 
 namespace 'config' do
@@ -123,16 +121,6 @@ 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'))
-
-    if v4jar.size != 1
-      puts "Cannot locate android-support-v4.jar, check Android SDK (#{v4jar})" if v4jar.size != 1
-    else
-      v4jar = v4jar.first
-      cp v4jar, TARGETDIR
-    end
-end
 
 namespace 'arch' do
   task :arm => [TARGETLIB_ARM]

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/intent/IntentSingleton.java

@@ -25,6 +25,7 @@ import com.rhomobile.rhodes.extmanager.IRhoExtManager;
 import com.rhomobile.rhodes.extmanager.IRhoListener;
 import com.rhomobile.rhodes.extmanager.RhoExtManager;
 import com.rhomobile.rhodes.util.ContextFactory;
+import com.rhomobile.rhodes.RhodesApplication;
 
 public class IntentSingleton extends AbstractRhoListener implements IIntentSingleton, IIntentFactory, IRhoListener {
     private static final String TAG = IntentSingleton.class.getSimpleName();
@@ -442,6 +443,11 @@ public class IntentSingleton extends AbstractRhoListener implements IIntentSingl
             result.set(params);
         }
     }
+    @Override
+    public void cleanStartParameters(IMethodResult result){
+        RhodesApplication.setStartParametersApp("");
+    
+    }
 
 
 }

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

@@ -320,7 +320,9 @@ public class Notification {
         }
 
         builder.setSmallIcon(R.drawable.ic_notification);
-        builder.setContentIntent(PendingIntent.getActivity(ctx, id, new Intent(ctx, RhodesActivity.class), PendingIntent.FLAG_UPDATE_CURRENT));
+
+        builder.setContentIntent(PendingIntent.getActivity(ctx, id, new Intent(ctx, RhodesActivity.class), 
+        /* PendingIntent.FLAG_UPDATE_CURRENT |*/ PendingIntent.FLAG_IMMUTABLE));
 
         builder.setDefaults(android.app.Notification.DEFAULT_VIBRATE | android.app.Notification.DEFAULT_SOUND);
 
@@ -347,7 +349,8 @@ public class Notification {
                     resId = R.drawable.ic_action_cancel;
                 }
                 
-                builder.addAction(resId, action.title, PendingIntent.getService(ctx, id, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+                builder.addAction(resId, action.title, PendingIntent.getService(ctx, id, actionIntent, 
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
             }
         }
         

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

@@ -18,8 +18,8 @@ import com.rhomobile.rhodes.Logger;
 import android.os.SystemClock;
 
 import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
 import android.media.RingtoneManager;
 import android.content.SharedPreferences;
 
@@ -175,7 +175,7 @@ public class NotificationScheduler {
 
         Intent new_intent = new Intent(context, cls);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, RHO_NOTIFICATION_CODE, new_intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         AlarmManager am = (AlarmManager) context.getSystemService(ALARM_SERVICE);
 
         if (interval < 0) {
@@ -219,7 +219,7 @@ public class NotificationScheduler {
 
         Intent new_intent = new Intent(context, cls);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, RHO_NOTIFICATION_CODE, new_intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         AlarmManager am = (AlarmManager) context.getSystemService(ALARM_SERVICE);
         am.cancel(pendingIntent);
         pendingIntent.cancel();

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

@@ -20,7 +20,7 @@ import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.MediaPlayer;
 import android.os.Vibrator;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.View;

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/webview/WebViewSingleton.java

@@ -31,12 +31,12 @@ import java.util.Map;
 public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
 
     private static final String TAG = WebViewSingleton.class.getSimpleName();
-    
+
     private static final String DISABLE_PAGE_LOADING_INDICATION = "disable_loading_indication";
     private static final String ENABLE_ZOOM = "enable_screen_zoom";
     private static final String ENABLE_WEB_PLUGINS = "enable_web_plugins";
     private static final String ENABLE_CACHE = "WebView.enableCache";
-    private static final String DISABLE_SCANNER_NAVIGATION = "disable_scanner_during_navigation";    
+    private static final String DISABLE_SCANNER_NAVIGATION = "disable_scanner_during_navigation";
     private static final String ENABLE_MEDIA_PLAYBACK_WITHOUT_GESTURE = "enable_media_playback_without_gesture";
     private WebViewConfig mConfig = new WebViewConfig();
 
@@ -57,9 +57,9 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
         originalProxyHost = Proxy.getDefaultHost();
         originalProxyPort = Proxy.getDefaultPort();
 
-        readRhoConfig(extManager.getConfig("rhoconfig"));        
+        readRhoConfig(extManager.getConfig("rhoconfig"));
     }
-    
+
     @Override
     public void getFramework(IMethodResult result) {
         result.set(RhodesActivity.safeGetInstance().getMainView().getWebView(-1).getEngineId());
@@ -373,7 +373,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
     @Override
     public boolean onWebViewCreated(IRhoExtManager extManager, IRhoWebView ext, boolean res) {
         Logger.I(TAG, "Set config initially: " + (mConfig != null));
-        ext.setConfig(mConfig);        
+        ext.setConfig(mConfig);
 
         return res;
     }
@@ -404,9 +404,9 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
 
 
         if ( haveOriginalProxy ) {
-            //we have system/rhoelements proxy settings so decide what to do with URL            
+            //we have system/rhoelements proxy settings so decide what to do with URL
             if ( isLocalUrl ) {
-                //local URL, we don't need proxy                
+                //local URL, we don't need proxy
                 dropProxySettings();
             } else {
                 //set original proxy setting
@@ -426,7 +426,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
 
         if ( haveOriginalProxy ) {
             Logger.I( TAG, "Restoring proxy settings: " + originalProxyHost + ":" + String.valueOf(originalProxyPort) );
-            ProxySettings.setProxy(ContextFactory.getAppContext(),originalProxyHost,originalProxyPort);            
+            ProxySettings.setProxy(ContextFactory.getAppContext(),originalProxyHost,originalProxyPort);
         }
     }
 
@@ -485,6 +485,19 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
         return res;
     }
 
+    @Override
+    public boolean onGoBack(IRhoExtManager extManager, String current_url, String back_url, IRhoWebView ext, boolean res) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean onGoForward(IRhoExtManager extManager, String current_url, String forward_url, IRhoWebView ext, boolean res) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+
     @Override
     public boolean onAlert(IRhoExtManager extManager, String message, IRhoWebView ext, IAlertResult alertResult, boolean res) {
         return res;
@@ -561,23 +574,23 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
     @Override
     public boolean onNewConfig(IRhoExtManager extManager, IRhoConfig config, String name, boolean res) {
 
-        if(name.equalsIgnoreCase("rhoelementsext")) {
+        /*if(name.equalsIgnoreCase("rhoelementsext")) {
             readRhoelementsConfig(config);
-            RhodesApplication.runWhen(RhodesApplication.AppState.AppActivated, new RhodesApplication.StateHandler(true) {
-                @Override public void run() {
+            RhodesApplication.runWhen(RhodesApplication.AppState.AppActivated, new RhodesApplication.StateHandlerInUIThread(true) {
+                @Override public void runInUI() {
                     MainView mainView = RhodesActivity.safeGetInstance().getMainView();
                     for (int i = 0; i < mainView.getTabsCount(); ++i) {
                         Logger.T(TAG, "Set WebView config: tab " + i);
                         mainView.getWebView(i).setConfig(mConfig);
                     }
                 }});
-        } else
+        } else*/
         if (name.equalsIgnoreCase("rhoconfig")) {
-            
+
             readRhoConfig(config);
 
-            RhodesApplication.runWhen(RhodesApplication.AppState.AppActivated, new RhodesApplication.StateHandler(true) {
-                @Override public void run() {
+            RhodesApplication.runWhen(RhodesApplication.AppState.AppActivated, new RhodesApplication.StateHandlerInUIThread(true) {
+                @Override public void runInUI() {
                     MainView mainView = RhodesActivity.safeGetInstance().getMainView();
                     for (int i = 0; i < mainView.getTabsCount(); ++i) {
                         Logger.T(TAG, "Set WebView config: tab " + i);
@@ -593,7 +606,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
     public String onGetProperty(IRhoExtManager extManager, String name) {
         return null;
     }
-    
+
     private void readRhoelementsConfig(IRhoConfig config) {
         if (config.isExist("enablezoom")) {
            // mConfig.set(WebViewConfig.ENABLE_ZOOM, config.getBool("enable_screen_zoom", WebViewConfig.ENABLE_ZOOM_DEF));
@@ -605,7 +618,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
             double zoomValue = config.getDouble("pagezoom");
             mConfig.set(WebViewConfig.PAGE_ZOOM, zoomValue);
         }
-        
+
         if (config.isExist("cache")) {
             String cache = config.getString("cache");
             cache=cache.toLowerCase();
@@ -614,17 +627,17 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
             if(endString==-1)
             	endString=cache.indexOf("kb");
             int cacheInt =Integer.parseInt(cache.substring(0,endString ).toString());
-         
+
             mConfig.set(WebViewConfig.ENABLE_CACHE, cacheInt!=0);
         }
-        
+
         if(config.isExist("splashscreenpath")){
         	String splashscreenpathValue = config.getString("splashscreenpath");
         	if(splashscreenpathValue != null){
         		mConfig.set(WebViewConfig.SETTING_SPLASHSCREEN_PATH, splashscreenpathValue);
         	}
         }
-        
+
         if(config.isExist("splashscreenduration")){
         	String splashscreendurationValue = config.getString("splashscreenduration");
         	if(splashscreendurationValue != null){
@@ -643,7 +656,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
 
                     originalProxyHost = hostURL;
                     originalProxyPort = port;
-		    		
+
 		    		ProxySettings.setProxy(RhodesActivity.getContext(),hostURL,port);
 		  		}
 	    	}
@@ -653,14 +666,14 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
     		if(httpsProxy.length()!=0){
 	    		int index = httpsProxy.lastIndexOf(":");
 	    		if(index > -1)
-	    		{	      		
+	    		{
 	    			String portNumber = httpsProxy.substring(index + 1, httpsProxy.length());
 	    			String hostURL = httpsProxy.substring(0, index);
 	    			int port = Integer.parseInt(portNumber);
 
                     originalProxyHost = hostURL;
                     originalProxyPort = port;
-	    		
+
 	    			ProxySettings.setProxy(RhodesActivity.getContext(),hostURL,port);
 	    		}
 	    	}
@@ -692,7 +705,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
     					}
     			}
     	}
-    	
+
     	if(config.isExist("usedwforscanning")){
     	        String _usedwforscanning = config.getString("usedwforscanning");
     	        if(_usedwforscanning != null){
@@ -708,12 +721,12 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
             mConfig.set(WebViewConfig.ENABLE_MEDIA_PLAYBACK_WITHOUT_GESTURE, false);
         }
     }
-    
+
     private void readRhoConfig(IRhoConfig config) {
         if (RhoConf.isExist(DISABLE_PAGE_LOADING_INDICATION))
             mConfig.set(WebViewConfig.ENABLE_PAGE_LOADING_INDICATION, !RhoConf.getBool(DISABLE_PAGE_LOADING_INDICATION));
 
-        
+
         if (RhoConf.isExist(ENABLE_ZOOM))
             mConfig.set(WebViewConfig.ENABLE_ZOOM, RhoConf.getBool(ENABLE_ZOOM));
 
@@ -722,7 +735,7 @@ public class WebViewSingleton implements IWebViewSingleton, IRhoExtension {
 
         if (RhoConf.isExist(ENABLE_CACHE))
             mConfig.set(WebViewConfig.ENABLE_CACHE, RhoConf.getBool(ENABLE_CACHE));
-            
+
         if (RhoConf.isExist(DISABLE_SCANNER_NAVIGATION))
             mConfig.set(WebViewConfig.DISABLE_SCANNER_ON_NAVIGATION, RhoConf.getString(DISABLE_SCANNER_NAVIGATION));
         if (RhoConf.isExist("iswindowskey"))

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

@@ -17,6 +17,8 @@
 #include "unzip/zip.h"
 #include "db/DBAdapter.h"
 
+#import "../impl/NotificationSingleton.h"
+
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "System"
@@ -438,13 +440,10 @@ extern "C" void Init_System()
 {
     rho::CSystemFactoryBase::setInstance( new rho::CSystemImplIphoneAccessFactory() );
     Init_System_API();
-    
+
+    [NotificationSingleton init_notification_object];
+
 #ifndef RHO_NO_RUBY_API
     RHODESAPP().getExtManager().requireRubyFile("RhoSystemApi");
 #endif
 }
-
-
-
-
-

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/Intent.h

@@ -5,7 +5,7 @@
 @interface Intent : IntentBase<IIntent> {
 }
 
-
+-(void) cleanStartParameters:(id<IMethodResult>)methodResult;
 
 
 @end

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/Intent.m

@@ -6,7 +6,9 @@
 
 
 
-
+-(void) cleanStartParameters:(id<IMethodResult>)methodResult{
+    
+}
 
 
 @end

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NotificationSingleton.h

@@ -18,7 +18,8 @@
 -(void) vibrate:(int)duration methodResult:(id<IMethodResult>)methodResult;
 -(void) setScheduler:(NSDictionary*)propertyMap methodResult:(id<IMethodResult>)methodResult;
 
++(void) init_notification_object;
 
 
+@end
 
-@end

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NotificationSingleton.m

@@ -9,6 +9,7 @@
 
 #include "common/RhodesApp.h"
 #include "logging/RhoLog.h"
+#import "common/RhoConf.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Alert"
@@ -510,4 +511,13 @@ static NotificationReminder* reminder = nil;
     [Rhodes performOnUiThread:runnable wait:NO];
 }
 
+
++(void) init_notification_object {
+    if (rho_conf_is_property_exists("ios_request_notification_permission_on_start")!=0) {
+        if (rho_conf_getBool("ios_request_notification_permission_on_start")!=0 ) {
+            NotificationReminder* rem = [NotificationReminder instance];
+        }
+    }
+}
+
 @end

data/lib/commonAPI/coreapi/ext/platform/wm/src/IntentImpl.cpp

@@ -40,6 +40,9 @@ namespace rho {
 		virtual void stopListening(apiGenerator::CMethodResult& oResult) {
 			stopApplicationMessageNotifications(oResult);
 		} 
+		virtual void cleanStartParameters(rho::apiGenerator::CMethodResult& oResult){
+			
+		}
 
 	private:
 		void sendApplicationMessage(const String& appName, const String& params, apiGenerator::CMethodResult& oResult) {

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

@@ -15,8 +15,11 @@ For FCM:
     :::ruby
     capabilities: ["push"]
     extensions: ["fcm-push"]
-    fcmSenderID: 'your_fcm_sender_id'
-    fcmAppID: 'your_fcm_app_id'
+    fcm:
+        mobilesdk_app_id: "mobilesdk_app_id from google-services.json"
+        project_number: "project_number from google-services.json"
+        current_key: "current_key from google-services.json"
+        project_id: "project_id from google-services.json"
 
 **Supporting FCM Push on iOS** Download GoogleService-Info.plist and put it into the root of your application. Please read guide [Add Firebase to your iOS project](https://firebase.google.com/docs/ios/setup) for more details.
 

data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp

@@ -170,6 +170,19 @@ void CSystemImplBase::setLocalServerPort( int value, CMethodResult& oResult)
     //Local port can be set only in confuguration file
 }
 
+
+void CSystemImplBase::getRubyLocalServerURL(CMethodResult& oResult)
+{
+    oResult.set( RHODESAPP().getRubyHomeURL() );
+}
+
+void CSystemImplBase::setRubyLocalServerURL( const rho::String& value, CMethodResult& oResult)
+{
+    //Local port can be set only in confuguration file
+}
+
+
+
 void CSystemImplBase::getNodejsServerPort(CMethodResult& oResult)
 {
     oResult.set( atoi(RHODESAPP().getNodeJSListeningPort()) );

data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.h

@@ -19,6 +19,8 @@ public:
     virtual void getIsSymbolDevice(CMethodResult& oResult);
     virtual void getLocalServerPort(CMethodResult& oResult);
     virtual void setLocalServerPort( int value, CMethodResult& oResult);
+    virtual void getRubyLocalServerURL(CMethodResult& oResult);
+    virtual void setRubyLocalServerURL( const rho::String& value, CMethodResult& oResult);
     virtual void getNodejsServerPort(CMethodResult& oResult);
     virtual void setNodejsServerPort( int value, CMethodResult& oResult);
     virtual void getFreeServerPort(rho::apiGenerator::CMethodResult& oResult);

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

@@ -174,6 +174,9 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
             <PROPERTY name="localServerPort" type="INTEGER" default="8080" readOnly="true">
                 <DESC>Port of the local (embedded) HTTP server. This parameter is mainly for debug purposes. If not specified, the platform will detect a free port on the device and use that one.</DESC>
             </PROPERTY>
+            <PROPERTY name="RubyLocalServerURL" type="STRING" readOnly="true">
+                <DESC>Local server full URL prefix://ip:port</DESC>
+            </PROPERTY>
             <PROPERTY name="NodejsServerPort" type="INTEGER" default="3000" readOnly="true">
                 <DESC>Port of the local (embedded) Node.js HTTP server if it started (only for Node.js type applications).</DESC>
             </PROPERTY>

data/lib/commonAPI/mediacapture/ext/camera.xml

@@ -219,11 +219,6 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                 <PLATFORM>WM, CE</PLATFORM>
                 <DESC>In cases where the resident camera application on the device is not used this API is used to control the position of the viewfinder preview window when taking a photo.</DESC>
             </PROPERTY>
-            <PROPERTY name="useSystemViewfinder" type="BOOLEAN" default="true">
-                <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
-                <PLATFORM>Android</PLATFORM>
-                <DESC>Setting the value of this property to "true", shall open the System ViewFinder with its properties. Applicable to takePicture() and choosePicture() both. None of the Rho camera properties shall be applicable except desiredWidth and desiredHeight (desired size aplly if useRealBitmapResize enabled).</DESC>
-            </PROPERTY>
             <PROPERTY name="useRealBitmapResize" type="BOOLEAN" default="true">
                 <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
                 <PLATFORM>Android</PLATFORM>
@@ -322,15 +317,15 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                             <DESC>If the specified 'outputFormat' was 'image' then this field is the URI to the taken image stored on the device.On wp8,wm when 'outputFormat' is 'image' then imageUri shall have only Image name with \ sign, on WP8 ImageName shall be suffixed by DTF when 'outputFormat' is 'image', this image will have an auto-generated name. If the specified 'outputFormat' was 'dataUri' then this field will be the image encoded as a Data URI, In Wp8 dataUri shall provide the thumbnail for the picture taken, It is recommended to use Image over dataUri. If the specified 'outputFormat' was 'imagePath' then this field will have the image path on the device. User can use image path to transfer image over http. </DESC>
 							          </PARAM>
                         <PARAM name="image_height" type="INTEGER" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS, WP8</PLATFORM>
+						    <PLATFORM>WM, CE, iOS, WP8</PLATFORM>
                             <DESC>It is recommended to use imageHeight in preference to this parameter.</DESC>
                         </PARAM>
                         <PARAM name="image_width" type="INTEGER" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS, UWP</PLATFORM>
+						    <PLATFORM>WM, CE, iOS, UWP</PLATFORM>
                             <DESC>It is recommended to use imageWidth in preference to this parameter.</DESC>
                         </PARAM>
                         <PARAM name="image_format" type="STRING" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS</PLATFORM>
+						    <PLATFORM>WM, CE, iOS</PLATFORM>
                             <DESC>It is recommended to use imageFormat in preference to this parameter.</DESC>
                         </PARAM>
                     </PARAMS>
@@ -384,7 +379,7 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                     <PARAM name="propertyMap" type="HASH" propertyHash="true">
 					     <PLATFORM>Android, WM, CE, UWP, iOS</PLATFORM>
                         <DESC>
-                          Provide a set of properties to configure an image, for example to specify the image size or color mode. In WM/CE,Android and WP8 devices user can only specify the outputFormat in the property bag. In iOS devices user can specify next options: compressionFormat, desiredWidth, desiredHeight, outputFormat, colorModel,  enableEditing.
+                          Provide a set of properties to configure an image, for example to specify the image size or color mode. In WM/CE,Android and WP8 devices user can only specify the outputFormat in the property bag. In iOS devices user can specify next options: compressionFormat, desiredWidth, desiredHeight, outputFormat, colorModel, enableEditing.
                           In UWP dataUri shall provide the thumbnail for the picture taken, It is recommended to use Image over dataUri.On wp8, wm when 'outputFormat' is 'image' then imageUri or image_uri shall have Image name with \ sign, on WP8 ImageName shall be suffixed by DTF when 'outputFormat' is 'image'</DESC>
                         <CAN_BE_NIL>
                             <DESC>Not providing properties to this function will use the Camera's default properties, or those previously set on the Camera instance.</DESC>

data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationCameraActivity.erb

@@ -1,2 +1,2 @@
-<activity android:name="com.rho.camera.CameraActivity"/>
-<service android:name="com.rho.camera.OrientationListnerService"/>
+<activity android:name="com.rho.camera.CameraActivity" android:exported='false'/>
+<service android:name="com.rho.camera.OrientationListnerService" android:exported='false'/>

data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationFileProvider.erb

@@ -1,5 +1,5 @@
 <provider
-        android:name="android.support.v4.content.FileProvider"
+        android:name="com.rho.mediacapture.RhoCameraFileProvider"
         android:authorities="<%= @appPackageName %>.fileprovider"
         android:exported="false"
         android:grantUriPermissions="true">

data/lib/commonAPI/mediacapture/ext/platform/android/ext_java.files

@@ -1,21 +1,14 @@
 ext/platform/android/src/com/rho/mediacapture/RhoListener.java
+ext/platform/android/src/com/rho/mediacapture/RhoCameraFileProvider.java
 ext/platform/android/generated/src/com/rho/camera/ICamera.java
 ext/platform/android/generated/src/com/rho/camera/ICameraSingleton.java
 ext/platform/android/generated/src/com/rho/camera/ICameraFactory.java
 ext/platform/android/generated/src/com/rho/camera/CameraBase.java
 ext/platform/android/generated/src/com/rho/camera/CameraSingletonBase.java
 ext/platform/android/generated/src/com/rho/camera/CameraFactorySingleton.java
-ext/platform/android/src/com/rho/camera/CameraActivity.java
 ext/platform/android/src/com/rho/camera/OrientationListnerService.java
-ext/platform/android/src/com/rho/camera/CameraPreview.java
-ext/platform/android/src/com/rho/camera/ICameraObject.java
-ext/platform/android/src/com/rho/camera/ICameraSingletonObject.java
 ext/platform/android/src/com/rho/camera/CameraObject.java
-ext/platform/android/src/com/rho/camera/CameraEclair.java
-ext/platform/android/src/com/rho/camera/CameraGingerbread.java
-ext/platform/android/src/com/rho/camera/CameraSingletonObject.java
-ext/platform/android/src/com/rho/camera/CameraSingletonEclair.java
-ext/platform/android/src/com/rho/camera/CameraSingletonGingerbread.java
+ext/platform/android/src/com/rho/camera/CameraSingleton.java
 ext/platform/android/src/com/rho/camera/CameraFactory.java
 ext/platform/android/src/com/rho/camera/CameraExtension.java
 ext/platform/android/src/com/rho/camera/CameraRhoListener.java

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraExtension.java

@@ -8,8 +8,6 @@ public class CameraExtension extends AbstractRhoExtension implements IRhoExtensi
     
     private static final String TAG = CameraExtension.class.getSimpleName();
     
-    static final String INTENT_EXTRA_PREFIX = "com.rho.camera.";
-
     @Override
     public String onGetProperty(IRhoExtManager extManager, String name) {
         if (name.equalsIgnoreCase("has_camera")) {