rhodes 7.5.1 → 7.6.0

data/extensions/instrumentation/ext/platform/android/src/com/rho/instrumentation/Instrumentation.java

@@ -31,10 +31,10 @@ import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 public class Instrumentation extends InstrumentationBase implements IInstrumentation, IRhoExtension {
 	private static final String TAG = "Rho::Instrumentation";
-	
+
     public Instrumentation(String id) {
         super(id);
-        RhoExtManager.getInstance().registerExtension("instrumentation", this); 
+        RhoExtManager.getInstance().registerExtension("instrumentation", this);
     }
 
 	@Override
@@ -65,7 +65,7 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 
 	@Override
 	public void simulate_touch_event(final int event_type, final int x, final int y, IMethodResult result)
-	{		
+	{
 		new Thread(new Runnable()
 		{
 			public void run()
@@ -130,7 +130,7 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 	public void get_allocated_memory(IMethodResult result) {
 		Debug.MemoryInfo memoryInfo = new Debug.MemoryInfo();
 		Debug.getMemoryInfo(memoryInfo);
-		
+
 		result.set(memoryInfo.getTotalPss());
 	}
 
@@ -138,12 +138,12 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 	public void delete_file(String fileName, IMethodResult result) {
 		int res = 0;
 		final String basePath = Environment.getExternalStorageDirectory().getAbsolutePath();
-		
+
 		if ( (fileName == null) || (fileName.equals("")) ) {
 			result.set(-1);
 		    return;
 		}
-		
+
 		fileName = fileName.replaceAll("\\\\", "/");
 		try
 		{
@@ -157,21 +157,21 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 		{
 		    res = -1;
 		}
-		
+
 		result.set(res);
-		
+
 	}
 
 	@Override
 	public void file_exists(String fileName, IMethodResult result) {
 		int res = 0;
 		final String basePath = Environment.getExternalStorageDirectory().getAbsolutePath();
-		
+
 		if ( (fileName == null) || (fileName.equals("")) ) {
 			result.set(-1);
 		    return;
 		}
-		
+
 		fileName = fileName.replaceAll("\\\\", "/");
 		try
 		{
@@ -185,9 +185,9 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 		{
 		    res = -1;
 		}
-		
+
 		result.set(res);
-		
+
 	}
 
 	@Override
@@ -228,7 +228,7 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 				}
 			}
 		});
-		
+
 	}
 
 	@Override
@@ -272,7 +272,7 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 		// TODO Auto-generated method stub
 		return false;
 	}
-	
+
 	@Override
 	public boolean onNavigateStarted(IRhoExtManager extManager, String url,
 		IRhoWebView ext, boolean res) {
@@ -301,6 +301,20 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 		return false;
 	}
 
+	@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 onSelect(IRhoExtManager extManager, String[] items,
 			int selected, IRhoWebView ext, boolean res) {
@@ -351,7 +365,7 @@ public class Instrumentation extends InstrumentationBase implements IInstrumenta
 	@Override
 	public void onAppActivate(IRhoExtManager extManager, boolean bActivate) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override

data/extensions/rhoconnect-push/ext/rhoconnect-push/platform/android/src/com/rhomobile/rhoelements/ans/ANSManager.java

@@ -96,7 +96,7 @@ public class ANSManager {
 
         // The pending intent provides a spoof-proof way to pass the
         // package-name string
-        intent.putExtra("app", PendingIntent.getBroadcast(context, 0, new Intent(), 0));
+        intent.putExtra("app", PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_IMMUTABLE));
         // The sender ID needs to be passed along for identification purposes
         intent.putExtra(ANSConstants.ANS_EXTRA_APP_NAME, appName);
         intent.putExtra(ANSConstants.ANS_EXTRA_USER_NAME, userName);

data/extensions/rhoelementsext/ext/rhoelementsext/platform/android/rhoelements_temp/src/com/rho/rhoelements/ElementsCore.java

@@ -2112,15 +2112,18 @@ public class ElementsCore implements IActivityListener, IElementsCore,
 					} catch (IOException e) {
 						e.printStackTrace();
 					}
-                    doc.getDocumentElement().normalize();
-                    NodeList nList = doc.getElementsByTagName("IntentAction");
-                    for (int temp = 0; temp < nList.getLength(); temp++) {
-                    	intentfilter.addAction(nList.item(temp).getAttributes().getNamedItem("value").getTextContent());
-                    }
-                    NodeList nList_cat = doc.getElementsByTagName("IntentCategory");
-                    for (int i = 0; i < nList_cat.getLength(); i++) {
-                    	intentfilter.addCategory(nList_cat.item(i).getAttributes().getNamedItem("value").getTextContent());
-                	}
+					if ( doc != null )
+					{
+						doc.getDocumentElement().normalize();
+						NodeList nList = doc.getElementsByTagName("IntentAction");
+						for (int temp = 0; temp < nList.getLength(); temp++) {
+							intentfilter.addAction(nList.item(temp).getAttributes().getNamedItem("value").getTextContent());
+						}
+						NodeList nList_cat = doc.getElementsByTagName("IntentCategory");
+						for (int i = 0; i < nList_cat.getLength(); i++) {
+							intentfilter.addCategory(nList_cat.item(i).getAttributes().getNamedItem("value").getTextContent());
+						}
+					}
 			RhodesActivity.getContext().registerReceiver(mReceiver, intentfilter);
                     	RECEIVER_REGISTER_STATUS = 1;
 				}

data/extensions/rhoelementsext/ext/rhoelementsext/platform/android/rhoelements_temp/src/com/rho/rhoelements/graphics/BatteryIndicator.java

@@ -381,7 +381,7 @@ public class BatteryIndicator extends Indicator
 		    display = ((WindowManager)RhodesActivity.safeGetInstance().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
 		}
 		catch (Exception e) {
-            Logger.E(TAG, e);
+            Common.logger.add(new LogEntry(LogEntry.PB_LOG_ERROR, e.toString()));
         }
 		int width = display.getWidth();  // deprecated
 		int height = display.getHeight();  // deprecated
@@ -425,7 +425,7 @@ public class BatteryIndicator extends Indicator
 		  }
 		}
 		catch (Exception e) {
-            Logger.E(TAG, e);
+            Common.logger.add(new LogEntry(LogEntry.PB_LOG_ERROR, e.toString()));
         }
 
 	}

data/lib/commonAPI/barcode/ext/platform/qt/Barcode.pro

@@ -8,7 +8,7 @@ equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6): {
         QT += webkit quick
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n
+        CONFIG += auroraapp c++14 auroraapp_i18n
     }
     greaterThan(QT_MINOR_VERSION, 7): {
         QT += webengine webenginecore webenginewidgets multimediawidgets widgets

data/lib/commonAPI/barcode/ext/platform/qt/Barcode.pro.erb

@@ -1,6 +1,6 @@
-QT += core gui widgets multimedia network webkit widgets
+QT += core gui widgets multimedia network webkit
 DEFINES += OS_SAILFISH OS_LINUX
-CONFIG += sailfishapp c++14 sailfishapp_i18n
+CONFIG += c++14
 
 
 include(<%= @rhoRoot %>/lib/commonAPI/barcode/ext/platform/qt/src/qzxing/QZXing.pri)

data/lib/commonAPI/barcode/ext/platform/qt/src/qzxing/QZXing.pri

@@ -226,29 +226,17 @@ SOURCES += $$PWD/CameraImageWrapper.cpp \
     $$PWD/zxing/bigint/BigIntegerAlgorithms.cc \
     $$PWD/zxing/bigint/BigInteger.cc
 
-symbian {
-    TARGET.UID3 = 0xE618743C
-    TARGET.EPOCALLOWDLLDATA = 1
 
-    #TARGET.CAPABILITY = All -TCB -AllFiles -DRM
-    TARGET.CAPABILITY += NetworkServices \
-        ReadUserData \
-        WriteUserData \
-        LocalServices \
-        UserEnvironment \
-        Location
-}
-
-unix:!symbian {
-    maemo5 {
-        target.path = /opt/usr/lib
-    } else {
-        target.path = /usr/lib
-    }
+#unix:!symbian {
+#    maemo5 {
+#        target.path = /opt/usr/lib
+#    } else {
+#        target.path = /usr/lib
+#    }
 
-    DEFINES += NOFMAXL
-    INSTALLS += target
-}
+#    DEFINES += NOFMAXL
+#    INSTALLS += target
+#}
 
 win32-msvc*{
 

data/lib/commonAPI/barcode/ext.yml

@@ -11,6 +11,7 @@ android:
   sdk_addons: ['EMDK']
   maven_deps:
     - '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'

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/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,8 +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 | PendingIntent.FLAG_IMMUTABLE));
+        /* PendingIntent.FLAG_UPDATE_CURRENT |*/ PendingIntent.FLAG_IMMUTABLE));
 
         builder.setDefaults(android.app.Notification.DEFAULT_VIBRATE | android.app.Notification.DEFAULT_SOUND);
 

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

@@ -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) {

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) {