rhodes 5.5.2 → 5.5.15

data/lib/commonAPI/mediacapture/ext/shared/MediacaptureInit.cpp

@@ -1,15 +1,15 @@
 #include "common/RhodesApp.h"
 
-#ifndef OS_WP8
+#if !defined(OS_WP8) && !defined(OS_WINDOWS_DESKTOP)
 extern "C" void Init_Camera_API();
 extern "C" void Init_Videocapture();
 #endif
-#if defined(OS_WINCE) || defined(OS_WP8)
+#if defined(OS_WINCE) || defined(OS_WP8) || defined(OS_WINDOWS_DESKTOP)
 extern "C" void Init_Camera_extension();
 #endif
-extern "C" void Init_Mediacapture_extension()
-{
-#ifndef OS_WP8
+extern "C" void Init_Mediacapture_extension()
+{
+#if !defined(OS_WP8) && !defined(OS_WINDOWS_DESKTOP)
     Init_Camera_API();
 #ifndef RHO_NO_RUBY_API
     RHODESAPP().getExtManager().requireRubyFile("RhoCameraApi");
@@ -18,7 +18,7 @@ extern "C" void Init_Mediacapture_extension()
     Init_Videocapture(); 
 #endif
 
-#if defined(OS_WINCE) || defined(OS_WP8)   
-    Init_Camera_extension();
-#endif
+#if defined(OS_WINCE) || defined(OS_WP8) || defined(OS_WINDOWS_DESKTOP)
+    Init_Camera_extension();
+#endif
 }

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '5.4.0'
+    VERSION = '5.5.0'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '5.4.0'
+    VERSION = '5.5.0'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/platform/android/Rhodes/AndroidManifest.xml.erb

@@ -25,7 +25,7 @@
   <supports-screens android:smallScreens='true' android:normalScreens='true' android:largeScreens='true' android:xlargeScreens='true'/>
   <application android:name='com.rhomobile.rhodes.RhodesApplication'
                android:label='@string/app_name'
-               android:icon='@drawable/icon'
+               android:icon='@mipmap/icon'
                android:debuggable='<%= @debuggable %>'>
 
     <!-- Uses libraries -->

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -1047,8 +1047,15 @@ public class RhodesService extends Service {
             RhodesService service = getInstance();
             Context ctx = RhodesService.getContext();
 
-            Intent intent = new Intent();
-            service.resolveAppName(appName, intent);
+            Intent intent = service.getPackageManager().getLaunchIntentForPackage(appName);
+
+            try {
+            	service.resolveAppName(appName, intent);
+            } catch ( Throwable e ) {
+            	Logger.W(TAG, "Can't resolve app name, will run with default intent: " + appName);
+            	Logger.W(TAG, e);
+            }
+
             service.parseAppParams(params, intent);
 
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

@@ -35,6 +35,7 @@ import java.lang.Thread;
 
 import android.app.Activity;
 import android.content.res.AssetManager;
+import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Environment;
@@ -164,6 +165,19 @@ public class SplashScreen implements MainView{
             type++;
         }
 
+        Bitmap loading_bitmap = null;
+        try {
+            Logger.I(TAG, "Loading image try to open from resources !!!");
+            int loading_id = RhoExtManager.getResourceId("drawable.loading");
+            loading_bitmap = BitmapFactory.decodeResource(activity.getResources(), loading_id);
+            if (loading_bitmap != null) {
+                type = 55;
+            }
+        }
+        catch (Throwable e) {
+            Logger.E(TAG, e);
+        }
+
         switch (type) {
         case 0:
             try {
@@ -244,6 +258,25 @@ public class SplashScreen implements MainView{
                 mView = webView;
             }
             break;
+        case 55:
+            {
+                try {
+                    Logger.I(TAG, "Loading image from resource R.drawable.loading !");
+
+                    ImageView imageView = new ImageView(activity);
+                    imageView.setBackgroundColor(mBackgroundColor);
+                 	imageView.setImageBitmap(loading_bitmap);
+                    loading_bitmap = null;
+                    imageView.setAdjustViewBounds(true);
+                    imageView.setScaleType(mScaleType);
+                    mView = imageView;
+                    RhoExtManager.getInstance().registerExtension("SplashScreen", mDocCompleteListener = new SplashScreenExtension());
+                }
+                catch (Throwable e) {
+                    Logger.E(TAG, e);
+                }
+            }
+            break;
         default:
             {
                 mSplashScreenListener.onSplashScreenGone(this);

data/platform/android/build/android.rake

@@ -29,6 +29,7 @@ require File.dirname(__FILE__) + '/android_tools.rb'
 require File.dirname(__FILE__) + '/maven_deps_extractor.rb'
 require File.dirname(__FILE__) + '/manifest_generator.rb'
 require File.dirname(__FILE__) + '/eclipse_project_generator.rb'
+require File.dirname(__FILE__) + '/android_studio_project_generator.rb'
 require File.dirname(__FILE__) + '/../../../lib/build/BuildConfig'
 load File.dirname(__FILE__) + '/android-repack.rake'
 require 'pathname'
@@ -76,48 +77,66 @@ ANDROID_PERMISSIONS = {
 ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
 
 def set_app_icon_android
-  iconappbase = File.join $app_path, 'icon', 'icon'
-
-  {'drawable' => '',
-   'drawable-ldpi' => '36',
-   'drawable-mdpi' => '48',
-   'drawable-hdpi' => '72',
-   'drawable-xhdpi' => '96',
-   'drawable-xxhdpi' => '144',
-   'drawable-xxxhdpi' => '192'
-   }.each do |folder, size|
-    drawable = File.join $appres, folder
-    iconresname = File.join(drawable, "icon.png")
-    
-    iconapppath = iconappbase + size + '.png'
-    
-    if File.exists?(iconapppath) or File.exists?(iconresname)
-        iconapppath = iconappbase + '.png' unless File.exists? iconapppath
-        rm_f iconresname
-        mkdir_p drawable
-        cp iconapppath, iconresname if File.exist? drawable
-    end
-  end
 
-  {'drawable' => '',
-   'drawable-ldpi' => '18',
-   'drawable-mdpi' => '24',
-   'drawable-hdpi' => '36',
-   'drawable-xhdpi' => '48',
-   'drawable-xxhdpi' => '72',
-   'drawable-xxxhdpi' => '96'
-   }.each do |folder, size|
-    drawable = File.join $appres, folder
-    iconresname = File.join(drawable, "ic_notification.png")
-    
-    iconapppath = iconappbase + size + '.png'
-    
-    if File.exists?(iconapppath) or File.exists?(iconresname)
-        iconapppath = iconappbase + '.png' unless File.exists? iconapppath
-        rm_f iconresname
-        mkdir_p drawable
-        cp iconapppath, iconresname if File.exist? drawable
-    end
+  res_path = File.join($app_path, 'resources', 'android', 'res')
+  if File.exists? res_path
+     # NEW resource - just copy it to res folder
+     puts "add resources from application'sresource folder [#{res_path}] to [#{$tmpdir}]"
+     cp_r res_path, $tmpdir
+
+  else
+     # NEW resources not found - use old mechanism
+
+      iconappbase = File.join $app_path, 'icon', 'icon'
+
+      {'drawable' => '',
+       'drawable-ldpi' => '36',
+       'drawable-mdpi' => '48',
+       'drawable-hdpi' => '72',
+       'drawable-xhdpi' => '96',
+       'drawable-xxhdpi' => '144',
+       'drawable-xxxhdpi' => '192',
+       'mipmap' => '',
+       'mipmap-ldpi' => '36',
+       'mipmap-mdpi' => '48',
+       'mipmap-hdpi' => '72',
+       'mipmap-xhdpi' => '96',
+       'mipmap-xxhdpi' => '144',
+       'mipmap-xxxhdpi' => '192'
+        }.each do |folder, size|
+        drawable = File.join $appres, folder
+        iconresname = File.join(drawable, "icon.png")
+
+        iconapppath = iconappbase + size + '.png'
+
+        if File.exists?(iconapppath) or File.exists?(iconresname)
+            iconapppath = iconappbase + '.png' unless File.exists? iconapppath
+            rm_f iconresname
+            mkdir_p drawable
+            cp iconapppath, iconresname if File.exist? drawable
+        end
+      end
+
+      {'drawable' => '',
+       'drawable-ldpi' => '18',
+       'drawable-mdpi' => '24',
+       'drawable-hdpi' => '36',
+       'drawable-xhdpi' => '48',
+       'drawable-xxhdpi' => '72',
+       'drawable-xxxhdpi' => '96'
+       }.each do |folder, size|
+        drawable = File.join $appres, folder
+        iconresname = File.join(drawable, "ic_notification.png")
+
+        iconapppath = iconappbase + size + '.png'
+
+        if File.exists?(iconapppath) or File.exists?(iconresname)
+            iconapppath = iconappbase + '.png' unless File.exists? iconapppath
+            rm_f iconresname
+            mkdir_p drawable
+            cp iconapppath, iconresname if File.exist? drawable
+        end
+      end
   end
 end
 
@@ -211,8 +230,40 @@ namespace 'project' do
     end
 
     task :studio => ['config:android', 'config:android:extensions','build:android:manifest'] do
-      #TODO
-      raise "Project generation for Android Studio is not implemented yet"
+
+      project_template_path = File.join 'res','generators','templates','project','android_studio_project'
+
+
+      main_gradle_script = File.join( project_template_path, 'build.gradle' )
+      gradle_properties = File.join( project_template_path, 'gradle.properties' )
+      gradlew = File.join( project_template_path, 'gradlew' )
+      gradlew_bat = File.join( project_template_path, 'gradlew.bat' )
+      settings_gradle = File.join( project_template_path, 'settings.gradle' )
+      app_gradle_template = File.join( project_template_path, 'app', 'build.gradle.erb' )
+      project_path = File.join $app_path,'project','android_studio'
+
+      rhodes_path = File.absolute_path '.'
+
+      generator = AndroidStudioProjectGenerator.new
+      generator.rhoRoot = rhodes_path
+      generator.buildToolsVersion = $build_tools_ver
+      generator.applicationId = $app_package_name
+      generator.minSdkVersion = $min_sdk_level
+      generator.targetSdkVersion = 12
+      generator.compileSdkVersion = $found_api_level
+      generator.versionName = $app_config["version"]
+
+
+      mkdir_p File.join(project_path,'app')
+
+      app_gradle_path = File.join( project_path, 'app', 'build.gradle')
+      File.open( app_gradle_path, 'w' ) { |f| f.write generator.render_app_gradle( app_gradle_template ) }
+
+      cp main_gradle_script,  project_path
+      cp gradle_properties,   project_path
+      cp gradlew,             project_path
+      cp gradlew_bat,         project_path
+      cp settings_gradle,     project_path
     end
   end
 end
@@ -528,6 +579,8 @@ namespace "config" do
       $storealias = $config["android"]["production"]["alias"] if $storealias.nil? and !$config["android"].nil? and !$config["android"]["production"].nil?
       $storealias = "rhomobile.keystore" if $storealias.nil?
 
+      $build_tools_ver = File.split( build_tools_path )[1]
+
     end
 
     $app_config["capabilities"] += ANDROID_CAPS_ALWAYS_ENABLED
@@ -1666,6 +1719,7 @@ namespace "build" do
       generator.screenOrientation = $android_orientation unless $android_orientation.nil?
       generator.hardwareAcceleration = true if $app_config["capabilities"].index('hardware_acceleration')
       generator.apikey = $gapikey if $gapikey
+      generator.debuggable = $debug
 
       generator.addUriParams $uri_scheme, $uri_host, $uri_path_prefix
 

data/platform/android/build/android_studio_project_generator.rb

@@ -0,0 +1,21 @@
+require 'erb'
+
+class AndroidStudioProjectGenerator
+  attr_accessor :rhoRoot
+  attr_accessor :compileSdkVersion
+  attr_accessor :buildToolsVersion
+  attr_accessor :applicationId
+  attr_accessor :minSdkVersion
+  attr_accessor :targetSdkVersion
+  attr_accessor :versionCode
+  attr_accessor :versionName
+
+  def render_app_gradle(erbPath)
+    @versionCode = @versionName.to_i
+    #@compileSdkVersion = @targetSdkVersion
+
+    tpl = File.read erbPath
+    erb = ERB.new tpl
+    erb.result binding
+  end
+end

data/platform/android/build/android_tools.rb

@@ -31,6 +31,9 @@
 
 #USE_TRACES = Rake.application.options.trace
 
+require 'pp'
+require 'open3'
+
 module AndroidTools
 
 def fill_api_levels(sdkpath)
@@ -290,7 +293,7 @@ def  run_emulator(options = {})
         end
       end
 
-      raise "ARM-based emulator image is not found for selected target: #{$androidtargets[get_api_level($emuversion)][:abis].inspect}" unless abi
+      raise "Emulator image is not found for selected target: #{$androidtargets[get_api_level($emuversion)][:abis].inspect}" unless abi
     end
 
     unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
@@ -300,7 +303,7 @@ def  run_emulator(options = {})
         puts "AVD name: #{$avdname}, emulator version: #{$emuversion}, target id: #{targetid}"
       end
       raise "Unable to create AVD image. No appropriate target API for SDK version: #{$emuversion}" unless targetid
-      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{targetid} --sdcard 128M"
+      createavd = "echo no | \"#{$androidbin}\" create avd --name #{$avdname} --target #{targetid} --sdcard 128M"
       createavd = createavd + " --abi #{abi}" if abi
       puts "Creating AVD image: #{createavd}"
       IO.popen(createavd, 'r+') do |io|
@@ -422,7 +425,6 @@ def load_app_and_run(device_flag, apkfile, pkgname)
   argv << apkfile
 
   cmd = argv.join(' ')
-  argv = cmd if RUBY_VERSION =~ /^1\.8/
 
   count = 0
   done = false
@@ -432,9 +434,9 @@ def load_app_and_run(device_flag, apkfile, pkgname)
     begin
       status = Timeout::timeout(300) do
         puts "CMD: #{cmd}"
-        IO.popen(argv) do |pipe|
-          child = pipe.pid
-          while line = pipe.gets
+        Open3.popen3(cmd) do |pin,pout,perr,wait_thr|
+          child = pout.pid
+          while line = perr.gets
             theoutput << line
             puts "RET: #{line}"
           end

data/platform/iphone/Classes/AppManager/AppManager.h

@@ -39,6 +39,9 @@
 + (NSString *) getApplicationsRosterUrl;
 + (bool) installApplication:(NSString*)appName data:(NSData*)appData;
 
++ (void) startupLogging:(NSString*)message;
++ (BOOL) isEnabledStartupLogging;
+
 - (void) copyFromMainBundle:(NSFileManager*)fileManager fromPath:(NSString*)source
 					 toPath:(NSString*)target remove:(BOOL)remove;
 - (void) configure;
@@ -49,3 +52,6 @@
 - (void) openURL:(NSString*)url;
 
 @end
+
+
+void rho_startup_logging(const char* message);

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

@@ -61,29 +61,51 @@ VALUE rho_sys_has_wifi_network();
 VALUE rho_sys_has_cell_network();
 
 
+
+static BOOL getEnabledStartupLogging() {
+    static int res = -1;
+    if (res == -1) {
+        const char* svalue = get_app_build_config_item("iphone_enable_startup_logging");
+        if (svalue != NULL) {
+            if ((svalue[0] != '0') && (svalue[0] != 'f') && (svalue[0] != 'F') ) {
+                res = 1;
+            }
+            else {
+                res = 0;
+            }
+        }
+    }
+    return res == 1;
+}
+
+// when Application manager is initialize Rhodes logging system is not ready !!!
+#define ENABLE_STARTUP_TRACES getEnabledStartupLogging()
+
+
+
 BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
     NSError *error;
     
     NSDictionary *attributes = [fileManager attributesOfItemAtPath:path error:&error]; 
     
     if (attributes == nil) {
-        //NSLog(@"     SymLink  NO : %@", path);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:      SymLink  NO : %@", path);
         return NO;
     }
     
     NSString* fileType = [attributes objectForKey:NSFileType];
     
     if (fileType == nil) {
-        //NSLog(@"     SymLink  NO : %@", path);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:      SymLink  NO : %@", path);
         return NO;
     }
 
     BOOL res = [NSFileTypeSymbolicLink isEqualToString:fileType];
     if (res) {
-        //NSLog(@"     SymLink YES : %@", path);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:      SymLink YES : %@", path);
     }
     else {
-        //NSLog(@"     SymLink  NO : %@", path);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:      SymLink  NO : %@", path);
     }
     
     return res;
@@ -121,6 +143,19 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 	return(gInstance);
 }
 
+
++ (void) startupLogging:(NSString*)message {
+    if (ENABLE_STARTUP_TRACES) {
+        NSLog(@"Rhodes startup : %@", message);
+    }
+}
+
++ (BOOL) isEnabledStartupLogging {
+    return getEnabledStartupLogging();
+}
+
+
+
 /*
  * Gets root folder of the site
  * Application folders located undern the root
@@ -141,7 +176,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
 
 + (NSString *) getApplicationsRosterUrl {
-	return @"http://dev.rhomobile.com/vlad/";
+	return @"http://tau-technologies.com/";
 }
 
 + (bool) installApplication:(NSString*)appName data:(NSData*)appData {
@@ -194,8 +229,8 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
 
 - (BOOL)isContentsEqual:(NSFileManager*)fileManager first:(NSString*)filePath1 second:(NSString*)filePath2 {
-    NSLog(@"filePath1: %@", filePath1);
-    NSLog(@"filePath2: %@", filePath2);
+    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: filePath1: %@", filePath1);
+    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: filePath2: %@", filePath2);
     if (![fileManager fileExistsAtPath:filePath1] || ![fileManager fileExistsAtPath:filePath2])
         return NO;
     
@@ -252,12 +287,12 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             // check exist of sym-link
             NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
             if (![fileManager fileExistsAtPath:testName]) {
-                NSLog(@" Can not found main Sym-Link - we should restore all sym-links !");
+                if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  Can not found main Sym-Link - we should restore all sym-links !");
                 contentChanged = YES;
                 restoreSymLinks_only = YES;
             }
             else {
-                NSLog(@" Main Sym-Link founded - disable restoring !");
+                if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  Main Sym-Link founded - disable restoring !");
             }
         }
         
@@ -266,10 +301,10 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
     NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
     BOOL libExist = [fileManager fileExistsAtPath:testName];
     if (libExist) {
-        NSLog(@" Lib File is Exist: %@", testName);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  Lib File is Exist: %@", testName);
     }
     else {
-        NSLog(@" Lib File is NOT Exist: %@", testName);
+        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  Lib File is NOT Exist: %@", testName);
     }
 	
     
@@ -301,9 +336,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             
             // Create symlink to "lib"
             NSString *src = [bundleRoot stringByAppendingPathComponent:@"lib"];
-            NSLog(@"src: %@", src);
+            if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: src: %@", src);
             NSString *dst = [rhoRoot stringByAppendingPathComponent:@"lib"];
-            NSLog(@"dst: %@", dst);
+            if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: dst: %@", dst);
             [fileManager removeItemAtPath:dst error:&error];
             
             [fileManager createSymbolicLinkAtPath:dst withDestinationPath:src error:&error];
@@ -313,9 +348,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             for (int i = 0, lim = sizeof(dirs)/sizeof(dirs[0]); i < lim; ++i) {
                 // Create directory
                 src = [bundleRoot stringByAppendingPathComponent:dirs[i]];
-                NSLog(@"src: %@", src);
+                if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: src: %@", src);
                 dst = [rhoRoot stringByAppendingPathComponent:dirs[i]];
-                NSLog(@"dst: %@", dst);
+                if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: dst: %@", dst);
                 if (![fileManager fileExistsAtPath:dst])
                     [fileManager createDirectoryAtPath:dst withIntermediateDirectories:YES attributes:nil error:&error];
                 
@@ -325,9 +360,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                 for (int i = 0, lim = [subelements count]; i < lim; ++i) {
                     NSString *child = [subelements objectAtIndex:i];
                     NSString *fchild = [src stringByAppendingPathComponent:child];
-                    NSLog(@" .. src: %@", fchild);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  .. src: %@", fchild);
                     NSString *target = [dst stringByAppendingPathComponent:child];
-                    NSLog(@" .. dst: %@", target);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  .. dst: %@", target);
                     [fileManager removeItemAtPath:target error:&error];
                     if ([child isEqualToString:@"rhoconfig.txt"]) {
                         [fileManager setDelegate:nil];
@@ -360,9 +395,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                     if ([copy_dirs[i] isEqualToString:@"db"] && !hasOldName)
                         remove = NO;
                     NSString *src = [bundleRoot stringByAppendingPathComponent:copy_dirs[i]];
-                    NSLog(@"copy src: %@", src);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: copy src: %@", src);
                     NSString *dst = [rhoDBRoot stringByAppendingPathComponent:copy_dirs[i]];
-                    NSLog(@"copy dst: %@", dst);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: copy dst: %@", dst);
                     
                     //[self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
                     
@@ -370,9 +405,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                     for (int i = 0, lim = [subelements count]; i < lim; ++i) {
                         NSString *child = [subelements objectAtIndex:i];
                         NSString *fchild = [src stringByAppendingPathComponent:child];
-                        NSLog(@" .. copy src: %@", fchild);
+                        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  .. copy src: %@", fchild);
                         NSString *target = [dst stringByAppendingPathComponent:child];
-                        NSLog(@" .. copy dst: %@", target);
+                        if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager:  .. copy dst: %@", target);
                         
                         BOOL copyit = YES;
                         
@@ -394,9 +429,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                 NSString *items[] = {@"hash", @"name"};
                 for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
                     NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
-                    NSLog(@"copy src: %@", src);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: copy src: %@", src);
                     NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
-                    NSLog(@"copy dst: %@", dst);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: copy dst: %@", dst);
                     [fileManager removeItemAtPath:dst error:&error];
                     [fileManager copyItemAtPath:src toPath:dst error:&error];
                     
@@ -413,19 +448,19 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                     if ([dirs[i] isEqualToString:@"db"] && !hasOldName)
                         remove = NO;
                     NSString *src = [bundleRoot stringByAppendingPathComponent:dirs[i]];
-                    NSLog(@"src: %@", src);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: src: %@", src);
                     NSString *dst = [rhoRoot stringByAppendingPathComponent:dirs[i]];
-                    NSLog(@"dst: %@", dst);
+                    if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: dst: %@", dst);
                     [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
                 }
             }
         }
 	}
-    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");
+    //if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: Create rhodes logging and rhoconfig.txt loading");
+	//rho_logconf_Init_with_separate_user_path(rho_native_rhopath(), rho_native_rhopath(), "", rho_native_rhouserpath());
+    //if (ENABLE_STARTUP_TRACES) NSLog(@"RhoAppManager: Create rhodes app");
+	//rho_rhodesapp_create_with_separate_user_path(rho_native_rhopath(), rho_native_rhouserpath());
+	//RAWLOG_INFO("Rhodes started");
 }
 
 
@@ -677,7 +712,7 @@ int rho_sys_is_app_installed(const char *appname) {
 }
 
 void rho_sys_app_uninstall(const char *appname) {
-	NSLog(@"ALERT: Uninstall of applications is unsupported on iOS platfrom !!!");	
+	RAWLOG_ERROR("ERROR: Uninstall of applications is unsupported on iOS platfrom !!!");
 }
 
 
@@ -1196,11 +1231,11 @@ void setApplicationBadgeNumber(NSInteger badgeNumber)
     {
         if (checkNotificationType(UIUserNotificationTypeBadge))
         {
-            NSLog(@"badge number changed to %d", badgeNumber);
+            RAWLOG_INFO1("badge number changed to %d", (int)badgeNumber);
             [UIApplication sharedApplication].applicationIconBadgeNumber = badgeNumber;
         }
         else
-            NSLog(@"access denied for UIUserNotificationTypeBadge");
+            RAWLOG_INFO("access denied for UIUserNotificationTypeBadge");
     }
 #else
     // compile with Xcode 5 (iOS SDK < 8.0)
@@ -1235,7 +1270,7 @@ int rho_sys_set_do_not_bakup_attribute(const char* path, int value) {
         result = setxattr(path, attrName, &attrValue, sizeof(attrValue), 0, 0);
         
         if (result != 0) {
-            NSLog(@"Can not change [do_not_bakup] attribute for path: %@", [NSString stringWithUTF8String:path]);
+            RAWLOG_WARNING1("WARNING: Can not change [do_not_bakup] attribute for path: %s", path);
         }
     }
     else {
@@ -1245,7 +1280,7 @@ int rho_sys_set_do_not_bakup_attribute(const char* path, int value) {
         if (result != -1) {
             int removeResult = removexattr(path, attrName, 0);
             if (removeResult == 0) {
-                NSLog(@"Removed extended attribute on file %@", pathString);
+                RAWLOG_WARNING1("Removed extended attribute on file %s", [pathString UTF8String]);
             }
         }
         
@@ -1258,7 +1293,7 @@ int rho_sys_set_do_not_bakup_attribute(const char* path, int value) {
         result = success ? 0 : -1;
         
         if (result != 0) {
-            NSLog(@"Can not change [do_not_bakup] attribute for path: %@, error: %@", pathString, error);
+            RAWLOG_WARNING2("Can not change [do_not_bakup] attribute for path: %s, error: %d", [pathString UTF8String], (int)[error localizedDescription]);
         }
     }
 
@@ -1301,11 +1336,15 @@ void rho_title_change(const int tabIndex, const char* strTitle) {
 }
 
 
-
+// this method called from logging system - loggins system add logmessage to log and also copy it to iOS console by NSLog()
 void rho_ios_log_console_output(const char* message) {
     NSLog(@"%@", [NSString stringWithUTF8String:message]);
 }
 
+void rho_startup_logging(const char* message) {
+    [AppManager startupLogging:[NSString stringWithUTF8String:message]];
+}
+
 /*
 #define MAX_ACTIONS 4
 const static struct {