rhodes 2.2.6 → 2.3.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/README.md +46 -0
- data/Rakefile +85 -80
- data/bin/rhodes +2 -2
- data/bin/rhogen +1 -1
- data/doc/application.txt +277 -0
- data/doc/bb-css.txt +209 -0
- data/doc/build.txt +785 -0
- data/doc/configuration.txt +236 -0
- data/doc/connect-to-web-services.txt +282 -0
- data/doc/contributing.txt +64 -0
- data/doc/css-framework.txt +144 -0
- data/doc/device-caps.txt +1152 -0
- data/doc/extensions.txt +528 -0
- data/doc/files.txt +4 -0
- data/doc/generator.txt +141 -0
- data/doc/install.txt +35 -0
- data/doc/introduction.txt +88 -0
- data/doc/rhom.txt +826 -0
- data/doc/standard-css.txt +392 -0
- data/doc/synchronization.txt +542 -0
- data/doc/test-log-debug.txt +148 -0
- data/doc/tutorial.txt +136 -0
- data/doc/ui.txt +766 -0
- data/installer/EnvVarUpdate.nsh +328 -0
- data/installer/README.html +81 -0
- data/installer/RHOSYNC-LICENSE.txt +675 -0
- data/installer/icon.ico +0 -0
- data/installer/instant-rhodes.nsi +427 -0
- data/lib/build/jake.rb +15 -1
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/imageprovider.cpp +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Barcode6.files +45 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +6 -0
- data/lib/extensions/barcode/ext/barcode/platform/bb/barcode6.jdp +92 -0
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj +7 -4
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Rakefile +2 -1
- data/lib/extensions/barcode/ext/barcode/platform/wm/src/wm_imageprovider.cpp +1 -1
- data/lib/extensions/digest-sha1/ext/build.bat +1 -0
- data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +335 -0
- data/lib/extensions/esri/ext/build +17 -0
- data/lib/extensions/esri/ext/build.bat +29 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.h +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactory.mm +58 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewFactoryRegister.mm +22 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.h +21 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/ESRIViewManager.mm +32 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/InitESRI.c +5 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +143 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +919 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI.xcodeproj/project.pbxproj +320 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/ESRI_Prefix.pch +7 -0
- data/lib/extensions/esri/ext/esri/platform/iphone/Rakefile +76 -0
- data/lib/extensions/esri/ext.yml +3 -0
- data/lib/extensions/net-http/monitor.rb +265 -0
- data/lib/extensions/net-http/net/ftp.rb +981 -0
- data/lib/extensions/net-http/thread.rb +367 -0
- data/lib/extensions/rhocgi/cgi.rb +16 -0
- data/lib/extensions/rhospec/rhospec.rb +118 -0
- data/lib/framework/base64.rb +91 -0
- data/lib/framework/builtinME.rb +13 -10
- data/lib/framework/ostruct.rb +145 -0
- data/lib/framework/res/back_btn.wm.png +0 -0
- data/lib/framework/res/blue_pushpin.wm.png +0 -0
- data/lib/framework/res/blue_pushpin_small.wm.png +0 -0
- data/lib/framework/res/callout.wm.png +0 -0
- data/lib/framework/res/callout_link.wm.png +0 -0
- data/lib/framework/res/forward_btn.wm.png +0 -0
- data/lib/framework/res/home_btn.wm.png +0 -0
- data/lib/framework/res/options_btn.wm.png +0 -0
- data/lib/framework/res/refresh_btn.wm.png +0 -0
- data/lib/framework/rho/render.rb +5 -2
- data/lib/framework/rho/rho.rb +320 -50
- data/lib/framework/rho/rhoapplication.rb +48 -10
- data/lib/framework/rho/rhonativeviewmanager.rb +73 -0
- data/lib/framework/rho/rhosupport.rb +15 -1
- data/lib/framework/rho/rhotabbar.rb +29 -0
- data/lib/framework/rho/rhotoolbar.rb +17 -0
- data/lib/framework/rho/rhoutils.rb +22 -6
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rholang/rhomsg_de.rb +4 -3
- data/lib/framework/rholang/rhomsg_en.rb +1 -0
- data/lib/framework/rholang/rhomsg_es.rb +1 -0
- data/lib/framework/rholang/rhomsg_it.rb +1 -0
- data/lib/framework/rhom/rhom.rb +31 -10
- data/lib/framework/rhom/rhom_db_adapter.rb +33 -23
- data/lib/framework/rhom/rhom_object_factory.rb +465 -249
- data/lib/framework/rhom/rhom_source.rb +22 -7
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +83 -20
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java +5 -0
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +2 -0
- data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +9 -5
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesAppOptions.h +53 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +46 -56
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +10 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mapview_MapView.h +93 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +38 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +64 -8
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +6 -0
- data/platform/android/Rhodes/jni/src/alert.cpp +5 -11
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +66 -29
- data/platform/android/Rhodes/jni/src/callbacks.cpp +24 -21
- data/platform/android/Rhodes/jni/src/camera.cpp +2 -6
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +13 -11
- data/platform/android/Rhodes/jni/src/event.cpp +9 -15
- data/platform/android/Rhodes/jni/src/fileapi.cpp +13 -27
- data/platform/android/Rhodes/jni/src/logconf.cpp +3 -3
- data/platform/android/Rhodes/jni/src/mapview.cpp +696 -16
- data/platform/android/Rhodes/jni/src/menu.cpp +3 -3
- data/platform/android/Rhodes/jni/src/nativebar.cpp +55 -4
- data/platform/android/Rhodes/jni/src/nativeview.cpp +33 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +6 -11
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +4 -4
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +87 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +55 -34
- data/platform/android/Rhodes/jni/src/ringtones.cpp +2 -3
- data/platform/android/Rhodes/jni/src/signature.cpp +3 -5
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +7 -0
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +17 -20
- data/platform/android/Rhodes/jni/src/webview.cpp +13 -12
- data/platform/android/Rhodes/res/drawable/callout.png +0 -0
- data/platform/android/Rhodes/res/drawable/callout_link.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_cancel.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_clear.png +0 -0
- data/platform/android/Rhodes/res/drawable/signature_ok.png +0 -0
- data/platform/android/Rhodes/res/layout/datetime.xml +4 -0
- data/platform/android/Rhodes/res/layout/signature.xml +24 -17
- data/platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml +102 -0
- data/platform/android/Rhodes/res/values/strings.xml +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java +575 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +83 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +21 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +23 -15
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +151 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +372 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +11 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +58 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +705 -523
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java +167 -85
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java +36 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +4 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +33 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +2 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +2 -24
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +106 -36
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +15 -58
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +4 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +91 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +6 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +275 -42
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +1 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +120 -43
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +518 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +2 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +434 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +20 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +296 -336
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +111 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +77 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +10 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +6 -11
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +6 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +0 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +9 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +8 -8
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +11 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +3 -5
- data/platform/android/build/RhodesSRC_build.files +32 -23
- data/platform/android/build/android.rake +28 -11
- data/platform/android/build/androidcommon.rb +2 -0
- data/platform/android/build/librhocommon_build.files +9 -5
- data/platform/android/build/librhodes_build.files +1 -0
- data/platform/android/build/libruby_build.files +1 -0
- data/platform/bb/Hsqldb/Hsqldb.jdp +0 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +10 -2
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +37 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Column.java +5 -5
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +1 -1
- data/platform/bb/Hsqldb/src/org/hsqldb/Function.java +73 -78
- data/platform/bb/Hsqldb/src/org/hsqldb/Library.java +288 -8
- data/platform/bb/RubyVM/RubyVM.jdp +3 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +13 -1
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -2
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +12 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +18 -1
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +128 -108
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +9 -10
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +16 -1
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +20 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +5 -2
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +65 -46
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +192 -50
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +8 -114
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +5 -3
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +5 -1
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +109 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +85 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +12 -4
- data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java +5 -0
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +37 -23
- data/platform/bb/RubyVM/src/com/rho/net/URI.java +84 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +119 -61
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +61 -24
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +108 -54
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +121 -163
- data/platform/bb/RubyVM/src/com/xruby/GeneratedMethods/RubyString_Methods.java +23 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyMutex.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRange.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyRegexp.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyString.java +208 -25
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RhoSupport.java +5 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +12 -5
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyID.java +1 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule.java +16 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyKernelModule_Methods.java +5 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyValue.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/stdlib/RubyStringIO.java +4 -1
- data/platform/bb/{Hsqldb → RubyVM}/src/j2me/math/Number.java +33 -0
- data/platform/bb/build/RubyVM_build.files +3 -0
- data/platform/bb/build/bb.rake +140 -62
- data/platform/bb/build/hsqldb_build.files +0 -2
- data/platform/bb/build/rhodes_build.files +5 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +43 -7
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +23 -2
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +5 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +3 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +12 -2
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +2 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +2 -0
- data/platform/bb/rhodes/resources/mappin.png +0 -0
- data/platform/bb/rhodes/rhodes.jdp +3 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +21 -18
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +150 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +1 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +63 -4
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +6 -5
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +242 -2
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +143 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +269 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +446 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +1 -1
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +71 -14
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +4 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +28 -12
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +100 -4
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +3 -2
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +1 -1
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +32 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +9 -2
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +174 -41
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +52 -3
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +33 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +2 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +686 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +14 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +13 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +174 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +104 -330
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +79 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +35 -12
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +2 -1
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +336 -44
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +3 -6
- data/platform/iphone/Classes/AppManager/AppManager.m +19 -4
- data/platform/iphone/Classes/DateTime.h +4 -0
- data/platform/iphone/Classes/DateTime.m +1 -1
- data/platform/iphone/Classes/DateTimePicker.m +8 -1
- data/platform/iphone/Classes/DateTimePickerDelegate.m +7 -1
- data/platform/iphone/Classes/Event/Event.m +2 -2
- data/platform/iphone/Classes/MapView/MapViewController.h +4 -1
- data/platform/iphone/Classes/MapView/MapViewController.m +6 -46
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -0
- data/platform/iphone/Classes/MapView/MapViewManager.m +172 -0
- data/platform/iphone/Classes/NativeBar.h +34 -0
- data/platform/iphone/Classes/NativeBar.m +131 -26
- data/platform/iphone/Classes/NativeView/NVDelegate.h +26 -0
- data/platform/iphone/Classes/NativeView/NVDelegate.m +40 -0
- data/platform/iphone/Classes/NativeView/NVViewController.h +24 -0
- data/platform/iphone/Classes/NativeView/NVViewController.m +90 -0
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +449 -0
- data/platform/iphone/Classes/{RhoNativeViewManagerOC.h → NativeView/RhoNativeViewManagerOC.h} +15 -0
- data/platform/iphone/Classes/RhoAlert.m +3 -3
- data/platform/iphone/Classes/RhoMainView.h +3 -0
- data/platform/iphone/Classes/Rhodes.h +6 -2
- data/platform/iphone/Classes/Rhodes.m +47 -79
- data/platform/iphone/Classes/Signature/SignatureViewController.m +1 -0
- data/platform/iphone/Classes/SimpleMainView.h +18 -1
- data/platform/iphone/Classes/SimpleMainView.m +180 -35
- data/platform/iphone/Classes/SplitView/LeftViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/LeftViewController.m +13 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +1 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +26 -11
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +1 -6
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +14 -52
- data/platform/iphone/Classes/TabbedMainView.h +25 -3
- data/platform/iphone/Classes/TabbedMainView.m +340 -14
- data/platform/iphone/ESRI/BluePushpin.png +0 -0
- data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
- data/platform/iphone/ESRI/esri.png +0 -0
- data/platform/iphone/ESRI/esri@2x.png +0 -0
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +26 -3
- data/platform/iphone/rbuild/iphone.rake +100 -4
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +12 -0
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +116 -12
- data/platform/shared/SyncClient/SyncClient.cpp +29 -3
- data/platform/shared/SyncClient/SyncClient.h +2 -1
- data/platform/shared/common/IRhoClassFactory.h +3 -0
- data/platform/shared/common/IRhoCrypt.h +16 -0
- data/platform/shared/common/IRhoThreadImpl.h +1 -0
- data/platform/shared/common/RhoAppAdapter.h +2 -0
- data/platform/shared/common/RhoConf.cpp +97 -46
- data/platform/shared/common/RhoConf.h +14 -13
- data/platform/shared/common/RhoFile.cpp +10 -0
- data/platform/shared/common/RhoFile.h +1 -0
- data/platform/shared/common/RhoMath.cpp +43 -0
- data/platform/shared/common/RhoMath.h +27 -0
- data/platform/shared/common/RhoNativeViewManager.h +27 -1
- data/platform/shared/common/RhoPort.h +11 -0
- data/platform/shared/common/RhoStd.h +5 -0
- data/platform/shared/common/RhoThread.cpp +1 -1
- data/platform/shared/common/RhoThread.h +1 -1
- data/platform/shared/common/RhodesApp.cpp +381 -139
- data/platform/shared/common/RhodesApp.h +24 -10
- data/platform/shared/common/RhodesAppBase.cpp +72 -1
- data/platform/shared/common/RhodesAppBase.h +5 -1
- data/platform/shared/common/SplashScreen.h +4 -4
- data/platform/shared/common/ThreadQueue.cpp +44 -17
- data/platform/shared/common/ThreadQueue.h +4 -0
- data/platform/shared/common/app_build_configs.c +0 -1
- data/platform/shared/common/iphone/RhoClassfactory.h +6 -0
- data/platform/shared/common/iphone/RhoCryptImpl.h +47 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +286 -0
- data/platform/shared/common/map/ESRIMapEngine.cpp +921 -0
- data/platform/shared/common/map/ESRIMapEngine.h +255 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +160 -0
- data/platform/shared/common/map/GoogleMapEngine.h +52 -0
- data/platform/shared/common/map/MapEngine.cpp +304 -0
- data/platform/shared/common/map/MapEngine.h +214 -0
- data/platform/shared/db/DBAdapter.cpp +147 -18
- data/platform/shared/db/DBAdapter.h +38 -12
- data/platform/shared/db/DBAttrManager.cpp +4 -3
- data/platform/shared/db/DBAttrManager.h +7 -7
- data/platform/shared/db/res/db/syncdb.triggers +0 -5
- data/platform/shared/db/res/db/syncdb_java.triggers +21 -0
- data/platform/shared/json/JSONIterator.cpp +11 -1
- data/platform/shared/json/JSONIterator.h +1 -0
- data/platform/shared/logging/RhoLogConf.cpp +29 -12
- data/platform/shared/net/CURLNetRequest.cpp +80 -25
- data/platform/shared/net/CURLNetRequest.h +6 -2
- data/platform/shared/net/HttpServer.cpp +12 -6
- data/platform/shared/net/HttpServer.h +2 -1
- data/platform/shared/net/INetRequest.h +1 -0
- data/platform/shared/ruby/ext/alert/alert.i +5 -0
- data/platform/shared/ruby/ext/alert/alert_wrap.c +439 -108
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker.i +42 -0
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +521 -120
- data/platform/shared/ruby/ext/nativebar/nativebar.i +16 -0
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +623 -128
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +18 -0
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +2321 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -1
- data/platform/shared/ruby/ext/rho/rhoruby.c +53 -0
- data/platform/shared/ruby/ext/rho/rhoruby.h +6 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +6 -3
- data/platform/shared/ruby/ext/syncengine/syncengine.i +9 -1
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +61 -0
- data/platform/shared/ruby/ext/system/system.i +4 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +33 -5
- data/platform/shared/rubyext/RhoAppAdapter.cpp +11 -1
- data/platform/shared/rubyext/System.cpp +9 -0
- data/platform/shared/rubyext/WebView.h +1 -0
- data/platform/shared/sqlite/crypto.c +907 -0
- data/platform/shared/sqlite/sqlite3.c +6 -0
- data/platform/shared/sync/SyncEngine.cpp +49 -19
- data/platform/shared/sync/SyncEngine.h +0 -1
- data/platform/shared/sync/SyncNotify.cpp +14 -5
- data/platform/shared/sync/SyncNotify.h +2 -2
- data/platform/shared/sync/SyncSource.cpp +79 -33
- data/platform/shared/sync/SyncSource.h +1 -0
- data/platform/shared/sync/SyncThread.cpp +26 -11
- data/platform/shared/xruby/src/com/xruby/compiler/codedom/StringExpression.java +4 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +108 -72
- data/platform/wm/build/wm.rake +6 -0
- data/platform/wm/rhodes/Alert.cpp +4 -3
- data/platform/wm/rhodes/Alert.h +1 -1
- data/platform/wm/rhodes/DateTimePicker.cpp +30 -3
- data/platform/wm/rhodes/DateTimePicker.h +9 -1
- data/platform/wm/rhodes/MainWindow.cpp +121 -61
- data/platform/wm/rhodes/MainWindow.h +29 -4
- data/platform/wm/rhodes/MapView/Graphics.cpp +547 -0
- data/platform/wm/rhodes/MapView/Graphics.h +136 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +391 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +158 -0
- data/platform/wm/rhodes/RhoCryptImpl.cpp +248 -0
- data/platform/wm/rhodes/RhoCryptImpl.h +51 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +208 -0
- data/platform/wm/rhodes/Rhodes.cpp +94 -102
- data/platform/wm/rhodes/Rhodes.rc +27 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +1 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +2 -1
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +7 -4
- data/platform/wm/rhodes/camera/Camera.cpp +36 -15
- data/platform/wm/rhodes/camera/Camera.h +0 -4
- data/platform/wm/rhodes/resource.h +10 -2
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +7 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +1 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +10 -2
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +10 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +513 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +74 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +22 -10
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +5 -0
- data/platform/wm/rhodes/rhodes.vcproj +38 -2
- data/platform/wm/rhodes/stdafx.h +2 -1
- data/platform/wm/rubylib/rubylib.vcproj +12 -0
- data/rakefile.rb +85 -80
- data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +14 -3
- data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
- data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj +2 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/templates/application/app/application.rb +2 -2
- data/res/generators/templates/application/app/helpers/application_helper.rb +1 -1
- data/res/generators/templates/application/public/css/android.css +1 -0
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +1 -1
- data/res/generators/templates/application/rhoconfig.txt +66 -14
- data/rhodes.gemspec +3 -3
- data/spec/framework_spec/app/spec/core/file/expand_path_spec.rb +7 -3
- data/spec/framework_spec/build.yml +1 -1
- data/spec/phone_spec/Rakefile +1 -0
- data/spec/phone_spec/app/Account/account.rb +2 -0
- data/spec/phone_spec/app/Account_s/account_s.rb +7 -0
- data/spec/phone_spec/app/spec/{fixtures → array/fixtures}/classes.rb +0 -0
- data/spec/phone_spec/app/spec/{array_pack_spec.rb → array/pack_spec.rb} +2 -1
- data/spec/phone_spec/app/spec/bulksync_spec.rb +1 -0
- data/spec/phone_spec/app/spec/contacts_spec.rb +2 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +34 -233
- data/spec/phone_spec/app/spec/rhom_object_spec.rb +396 -87
- data/spec/phone_spec/app/spec/string/element_set_spec.rb +251 -0
- data/spec/phone_spec/app/spec/string/end_with_spec.rb +49 -0
- data/spec/phone_spec/app/spec/string/fixtures/classes.rb +27 -0
- data/spec/phone_spec/app/spec/{lstrip_spec.rb → string/lstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/replace_spec.rb +52 -0
- data/spec/phone_spec/app/spec/{rstrip_spec.rb → string/rstrip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/string/slice_spec.rb +473 -0
- data/spec/phone_spec/app/spec/string/split_spec.rb +302 -0
- data/spec/phone_spec/app/spec/string/start_with_spec.rb +48 -0
- data/spec/phone_spec/app/spec/{strip_spec.rb → string/strip_spec.rb} +0 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +30 -1
- data/spec/phone_spec/app/spec_runner.rb +15 -7
- data/spec/phone_spec/build.yml +2 -2
- metadata +154 -25
- data/README.textile +0 -45
- data/platform/android/Rhodes/AndroidManifest.full.xml +0 -62
- data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java +0 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java +0 -193
- data/platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java +0 -25
- data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java +0 -22
- data/platform/bb/RubyVM/src/com/rho/Capabilities.java +0 -6
- data/platform/bb/RubyVM/src/com/rho/Extensions.java +0 -11
- data/platform/iphone/Classes/RhoNativeViewManager.mm +0 -226
@@ -0,0 +1,248 @@
|
|
1
|
+
#include "StdAfx.h"
|
2
|
+
#include "RhoCryptImpl.h"
|
3
|
+
#include "common/RhodesApp.h"
|
4
|
+
|
5
|
+
namespace rho{
|
6
|
+
namespace common{
|
7
|
+
IMPLEMENT_LOGCLASS(CRhoCryptImpl,"RhoCrypt");
|
8
|
+
#define checkError(func) _checkError(func, #func)
|
9
|
+
|
10
|
+
CRhoCryptImpl::CRhoCryptImpl(void) : m_hCryptProv(0), m_hKey(0)
|
11
|
+
{
|
12
|
+
}
|
13
|
+
|
14
|
+
CRhoCryptImpl::~CRhoCryptImpl(void)
|
15
|
+
{
|
16
|
+
if ( m_hKey )
|
17
|
+
CryptDestroyKey(m_hKey);
|
18
|
+
|
19
|
+
if ( m_hCryptProv )
|
20
|
+
CryptReleaseContext( m_hCryptProv, 0 );
|
21
|
+
}
|
22
|
+
|
23
|
+
bool CRhoCryptImpl::_checkError( BOOL bRes, const char* szFunc )
|
24
|
+
{
|
25
|
+
m_dwLastError = 0;
|
26
|
+
if ( !bRes )
|
27
|
+
m_dwLastError = GetLastError();
|
28
|
+
|
29
|
+
if ( m_dwLastError == 0 )
|
30
|
+
return true;
|
31
|
+
|
32
|
+
LPTSTR pszMessage = NULL;
|
33
|
+
|
34
|
+
DWORD dwLen = FormatMessage(
|
35
|
+
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
36
|
+
//FORMAT_MESSAGE_FROM_SYSTEM |
|
37
|
+
FORMAT_MESSAGE_FROM_HMODULE|
|
38
|
+
FORMAT_MESSAGE_IGNORE_INSERTS,
|
39
|
+
#if defined(_WIN32_WCE)
|
40
|
+
GetModuleHandle( _T("Coredll.dll") ),
|
41
|
+
#else
|
42
|
+
GetModuleHandle( _T("Advapi32.dll") ),
|
43
|
+
#endif
|
44
|
+
m_dwLastError,
|
45
|
+
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
46
|
+
(LPTSTR)&pszMessage,
|
47
|
+
0, NULL );
|
48
|
+
|
49
|
+
LOG(ERROR) + szFunc + "failed with code: " + LOGFMT("0x%X") + m_dwLastError + ";Message: " + (pszMessage ? pszMessage : _T(""));
|
50
|
+
if ( pszMessage )
|
51
|
+
LocalFree(pszMessage);
|
52
|
+
|
53
|
+
return false;
|
54
|
+
}
|
55
|
+
|
56
|
+
void CRhoCryptImpl::readKeyFromStorage(DATA_BLOB& blobKey)
|
57
|
+
{
|
58
|
+
StringW strKey = L"Software\\Rhomobile\\";
|
59
|
+
strKey += RHODESAPP().getAppNameW() + L"\\Storage\\" + m_strDBPartition;
|
60
|
+
|
61
|
+
CRegKey oKey;
|
62
|
+
LONG res = oKey.Open(HKEY_LOCAL_MACHINE, strKey.c_str(), KEY_READ);
|
63
|
+
if ( res != ERROR_SUCCESS )
|
64
|
+
return;
|
65
|
+
|
66
|
+
ULONG nBytes = 0;
|
67
|
+
res = oKey.QueryBinaryValue(L"DataKey", 0, &nBytes );
|
68
|
+
if ( res != ERROR_SUCCESS )
|
69
|
+
return;
|
70
|
+
|
71
|
+
blobKey.cbData = nBytes;
|
72
|
+
blobKey.pbData = (BYTE*)LocalAlloc(LMEM_FIXED, nBytes);
|
73
|
+
res = oKey.QueryBinaryValue(L"DataKey", blobKey.pbData, &nBytes );
|
74
|
+
}
|
75
|
+
|
76
|
+
void CRhoCryptImpl::saveKeyToStorage(DATA_BLOB& blobKey)
|
77
|
+
{
|
78
|
+
LONG res = 0;
|
79
|
+
StringW strKey = L"Software\\Rhomobile\\";
|
80
|
+
strKey += RHODESAPP().getAppNameW() + L"\\Storage\\" + m_strDBPartition;
|
81
|
+
|
82
|
+
{
|
83
|
+
CRegKey oKey;
|
84
|
+
res = oKey.Create(HKEY_LOCAL_MACHINE, strKey.c_str() );
|
85
|
+
}
|
86
|
+
|
87
|
+
CRegKey oKey;
|
88
|
+
res = oKey.Open(HKEY_LOCAL_MACHINE, strKey.c_str(), KEY_WRITE);
|
89
|
+
if ( res != ERROR_SUCCESS )
|
90
|
+
return;
|
91
|
+
|
92
|
+
res = oKey.SetBinaryValue(L"DataKey", blobKey.pbData, blobKey.cbData );
|
93
|
+
if ( res != ERROR_SUCCESS )
|
94
|
+
return;
|
95
|
+
}
|
96
|
+
|
97
|
+
void CRhoCryptImpl::writeKeyToStorage()
|
98
|
+
{
|
99
|
+
BYTE *pbKeyBlob = NULL;
|
100
|
+
DWORD dwBlobLen = 0;
|
101
|
+
if ( !checkError( CryptExportKey(m_hKey, 0, PLAINTEXTKEYBLOB, 0, NULL, &dwBlobLen)) )
|
102
|
+
return;
|
103
|
+
|
104
|
+
pbKeyBlob = (BYTE*)malloc(dwBlobLen);
|
105
|
+
checkError( CryptExportKey(m_hKey, 0, PLAINTEXTKEYBLOB, 0, pbKeyBlob, &dwBlobLen) );
|
106
|
+
|
107
|
+
DATA_BLOB unprotectedKey = {dwBlobLen , pbKeyBlob };
|
108
|
+
DATA_BLOB protectedKey = {0};
|
109
|
+
checkError( CryptProtectData( &unprotectedKey, L"Rhodes data key", 0, 0, 0, 0, &protectedKey ) );
|
110
|
+
|
111
|
+
if (pbKeyBlob)
|
112
|
+
free(pbKeyBlob);
|
113
|
+
|
114
|
+
saveKeyToStorage(protectedKey);
|
115
|
+
|
116
|
+
if ( protectedKey.pbData )
|
117
|
+
LocalFree(protectedKey.pbData);
|
118
|
+
}
|
119
|
+
|
120
|
+
void CRhoCryptImpl::initCryptProvider()
|
121
|
+
{
|
122
|
+
if ( m_hCryptProv )
|
123
|
+
return;
|
124
|
+
|
125
|
+
LPCTSTR szContName = _T("RhodesKeyContainer"); // Name of the key container to be used.
|
126
|
+
checkError( CryptAcquireContext( &m_hCryptProv, szContName, NULL, PROV_RSA_AES, 0) );
|
127
|
+
|
128
|
+
if ( getErrorCode() == NTE_BAD_KEYSET )
|
129
|
+
{
|
130
|
+
checkError( CryptAcquireContext( &m_hCryptProv, szContName, NULL, PROV_RSA_AES, CRYPT_NEWKEYSET) );
|
131
|
+
}
|
132
|
+
}
|
133
|
+
|
134
|
+
void CRhoCryptImpl::initContext(const char* szPartition)
|
135
|
+
{
|
136
|
+
if ( m_hCryptProv )
|
137
|
+
return;
|
138
|
+
|
139
|
+
convertToStringW(szPartition, m_strDBPartition);
|
140
|
+
|
141
|
+
initCryptProvider();
|
142
|
+
if ( getErrorCode() != 0 )
|
143
|
+
return;
|
144
|
+
|
145
|
+
DATA_BLOB protectedKey = {0};
|
146
|
+
readKeyFromStorage(protectedKey);
|
147
|
+
if ( protectedKey.cbData > 0 )
|
148
|
+
{
|
149
|
+
DATA_BLOB unprotectedKey = {0};
|
150
|
+
LPWSTR pDescr = NULL;
|
151
|
+
checkError(CryptUnprotectData( &protectedKey, &pDescr, NULL, NULL, NULL, 0, &unprotectedKey));
|
152
|
+
|
153
|
+
checkError(CryptImportKey(m_hCryptProv, unprotectedKey.pbData, unprotectedKey.cbData, 0, 0, &m_hKey));
|
154
|
+
|
155
|
+
if( pDescr )
|
156
|
+
LocalFree(pDescr);
|
157
|
+
if ( unprotectedKey.pbData )
|
158
|
+
LocalFree(unprotectedKey.pbData);
|
159
|
+
if ( protectedKey.pbData )
|
160
|
+
LocalFree(protectedKey.pbData);
|
161
|
+
}else
|
162
|
+
{
|
163
|
+
//generate new key
|
164
|
+
if ( checkError(CryptGenKey(m_hCryptProv, CALG_RC4, CRYPT_EXPORTABLE, &m_hKey)) )
|
165
|
+
{
|
166
|
+
//DWORD dwPadding = ZERO_PADDING;
|
167
|
+
//checkError( CryptSetKeyParam( m_hKey, KP_PADDING, (const BYTE*)&dwPadding, 0) );
|
168
|
+
|
169
|
+
writeKeyToStorage();
|
170
|
+
}
|
171
|
+
}
|
172
|
+
}
|
173
|
+
|
174
|
+
int CRhoCryptImpl::db_encrypt( const char* szPartition, int size, unsigned char* data, unsigned char* dataOut )
|
175
|
+
{
|
176
|
+
initContext(szPartition);
|
177
|
+
|
178
|
+
memcpy(dataOut, data, size);
|
179
|
+
|
180
|
+
DWORD dwSize = size;
|
181
|
+
if ( m_hKey )
|
182
|
+
{
|
183
|
+
checkError( CryptEncrypt( m_hKey,
|
184
|
+
0, // No hashing of data
|
185
|
+
TRUE, // Final or only buffer of data
|
186
|
+
0, // Must be zero
|
187
|
+
dataOut, // Data buffer
|
188
|
+
&dwSize, // Size of data
|
189
|
+
dwSize // Size of block
|
190
|
+
));
|
191
|
+
}
|
192
|
+
|
193
|
+
return getErrorCode() == 0 ? 1 : 0;
|
194
|
+
}
|
195
|
+
|
196
|
+
int CRhoCryptImpl::db_decrypt( const char* szPartition, int size, unsigned char* data )
|
197
|
+
{
|
198
|
+
initContext(szPartition);
|
199
|
+
|
200
|
+
DWORD dwSize = size;
|
201
|
+
|
202
|
+
if ( m_hKey )
|
203
|
+
{
|
204
|
+
checkError( CryptDecrypt( m_hKey,
|
205
|
+
0, // No hashing of data
|
206
|
+
TRUE, // Final or only buffer of data
|
207
|
+
0, // Must be zero
|
208
|
+
data, // Data buffer
|
209
|
+
&dwSize // Size of data
|
210
|
+
));
|
211
|
+
}
|
212
|
+
|
213
|
+
return getErrorCode() == 0 ? 1 : 0;
|
214
|
+
}
|
215
|
+
|
216
|
+
int CRhoCryptImpl::set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent )
|
217
|
+
{
|
218
|
+
convertToStringW(szPartition, m_strDBPartition);
|
219
|
+
|
220
|
+
int dwBlobLen = rho_base64_decode( szKey, -1, 0 );
|
221
|
+
BYTE* pbKeyBlob = (BYTE*)malloc(dwBlobLen);
|
222
|
+
rho_base64_decode(szKey, -1, (char*)pbKeyBlob);
|
223
|
+
|
224
|
+
DATA_BLOB unprotectedKey = {dwBlobLen , pbKeyBlob };
|
225
|
+
|
226
|
+
if ( !bPersistent )
|
227
|
+
{
|
228
|
+
initCryptProvider();
|
229
|
+
checkError(CryptImportKey(m_hCryptProv, unprotectedKey.pbData, unprotectedKey.cbData, 0, 0, &m_hKey));
|
230
|
+
}else
|
231
|
+
{
|
232
|
+
DATA_BLOB protectedKey = {0};
|
233
|
+
checkError( CryptProtectData( &unprotectedKey, L"Rhodes data key", 0, 0, 0, 0, &protectedKey ) );
|
234
|
+
|
235
|
+
if (pbKeyBlob)
|
236
|
+
free(pbKeyBlob);
|
237
|
+
|
238
|
+
saveKeyToStorage(protectedKey);
|
239
|
+
|
240
|
+
if ( protectedKey.pbData )
|
241
|
+
LocalFree(protectedKey.pbData);
|
242
|
+
}
|
243
|
+
|
244
|
+
return 1;
|
245
|
+
}
|
246
|
+
|
247
|
+
}
|
248
|
+
}
|
@@ -0,0 +1,51 @@
|
|
1
|
+
#pragma once
|
2
|
+
|
3
|
+
#include "logging/RhoLog.h"
|
4
|
+
#include "common/IRhoCrypt.h"
|
5
|
+
|
6
|
+
#include <wincrypt.h>
|
7
|
+
|
8
|
+
namespace rho{
|
9
|
+
namespace common{
|
10
|
+
|
11
|
+
class CRhoCryptImpl : public IRhoCrypt
|
12
|
+
{
|
13
|
+
DEFINE_LOGCLASS;
|
14
|
+
|
15
|
+
HCRYPTPROV m_hCryptProv;
|
16
|
+
HCRYPTKEY m_hKey;
|
17
|
+
DWORD m_dwLastError;
|
18
|
+
StringW m_strDBPartition;
|
19
|
+
|
20
|
+
public:
|
21
|
+
CRhoCryptImpl(void);
|
22
|
+
~CRhoCryptImpl(void);
|
23
|
+
|
24
|
+
virtual int db_decrypt( const char* szPartition, int size, unsigned char* data );
|
25
|
+
virtual int db_encrypt( const char* szPartition, int size, unsigned char* data, unsigned char* dataOut );
|
26
|
+
virtual int set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent );
|
27
|
+
private:
|
28
|
+
bool _checkError( BOOL bRes, const char* szFunc );
|
29
|
+
unsigned int getErrorCode(){ return m_dwLastError; }
|
30
|
+
|
31
|
+
void initContext(const char* szPartition);
|
32
|
+
void initCryptProvider();
|
33
|
+
|
34
|
+
void readKeyFromStorage(DATA_BLOB& blobKey);
|
35
|
+
void writeKeyToStorage();
|
36
|
+
void saveKeyToStorage(DATA_BLOB& blobKey);
|
37
|
+
};
|
38
|
+
|
39
|
+
}
|
40
|
+
}
|
41
|
+
|
42
|
+
#ifdef __cplusplus
|
43
|
+
extern "C" {
|
44
|
+
#endif //__cplusplus
|
45
|
+
|
46
|
+
void rho_crypt_aes_256_encrypt(int size, unsigned char *in, unsigned char *out);
|
47
|
+
void rho_crypt_aes_256_decrypt(int size, unsigned char *in, unsigned char *out);
|
48
|
+
|
49
|
+
#ifdef __cplusplus
|
50
|
+
};
|
51
|
+
#endif //__cplusplus
|
@@ -18,6 +18,8 @@
|
|
18
18
|
|
19
19
|
extern "C" HWND getWebViewWnd();
|
20
20
|
extern "C" HWND getMainWnd();
|
21
|
+
CMainWindow* Rhodes_getMainWindow();
|
22
|
+
|
21
23
|
|
22
24
|
class RhoNativeViewHolder{
|
23
25
|
public :
|
@@ -43,7 +45,65 @@ class RhoNativeViewHolder{
|
|
43
45
|
RhoNativeViewHolder* next;
|
44
46
|
};
|
45
47
|
|
48
|
+
static int ourGlobalID = 1;
|
49
|
+
|
50
|
+
class RhoOpenedNativeView {
|
51
|
+
public:
|
52
|
+
RhoOpenedNativeView() {
|
53
|
+
next = NULL;
|
54
|
+
id = ourGlobalID++;
|
55
|
+
tab_index = 0;
|
56
|
+
factory_holder = NULL;
|
57
|
+
n_view = NULL;
|
58
|
+
}
|
59
|
+
RhoOpenedNativeView* next;
|
60
|
+
int id;
|
61
|
+
int tab_index;
|
62
|
+
RhoNativeViewHolder* factory_holder;
|
63
|
+
NativeView* n_view;
|
64
|
+
};
|
65
|
+
|
66
|
+
|
67
|
+
class RhoNativeViewRunnable_OpenViewCommand : public RhoNativeViewRunnable {
|
68
|
+
public:
|
69
|
+
RhoNativeViewRunnable_OpenViewCommand(RhoOpenedNativeView* view) {
|
70
|
+
mView = view;
|
71
|
+
}
|
72
|
+
virtual void run() {
|
73
|
+
CMainWindow* mw = Rhodes_getMainWindow();
|
74
|
+
String sn(mView->factory_holder->viewtype);
|
75
|
+
mw->openNativeView(mView->factory_holder->factory, mView->n_view, sn);
|
76
|
+
//delete this;
|
77
|
+
}
|
78
|
+
|
79
|
+
private:
|
80
|
+
RhoOpenedNativeView* mView;
|
81
|
+
};
|
82
|
+
|
83
|
+
class RhoNativeViewRunnable_CloseViewCommand : public RhoNativeViewRunnable {
|
84
|
+
public:
|
85
|
+
RhoNativeViewRunnable_CloseViewCommand() {
|
86
|
+
}
|
87
|
+
virtual void run() {
|
88
|
+
CMainWindow* mw = Rhodes_getMainWindow();
|
89
|
+
mw->closeNativeView();
|
90
|
+
//delete this;
|
91
|
+
}
|
92
|
+
};
|
93
|
+
|
94
|
+
|
95
|
+
|
96
|
+
|
97
|
+
|
46
98
|
static RhoNativeViewHolder* first = NULL;
|
99
|
+
static RhoOpenedNativeView* first_opened = NULL;
|
100
|
+
|
101
|
+
|
102
|
+
|
103
|
+
|
104
|
+
|
105
|
+
|
106
|
+
|
47
107
|
|
48
108
|
|
49
109
|
static void addRhoNativeViewHolder(RhoNativeViewHolder* holder) {
|
@@ -76,6 +136,8 @@ static void removeRhoNativeViewHolder(RhoNativeViewHolder* holder) {
|
|
76
136
|
}
|
77
137
|
}
|
78
138
|
|
139
|
+
|
140
|
+
|
79
141
|
static RhoNativeViewHolder* getHolderByViewTypeName(const char* name) {
|
80
142
|
RhoNativeViewHolder* p = first;
|
81
143
|
while (p != NULL) {
|
@@ -88,6 +150,76 @@ static RhoNativeViewHolder* getHolderByViewTypeName(const char* name) {
|
|
88
150
|
}
|
89
151
|
|
90
152
|
|
153
|
+
|
154
|
+
|
155
|
+
|
156
|
+
|
157
|
+
|
158
|
+
static void addRhoNativeOpenedView(RhoOpenedNativeView* view) {
|
159
|
+
if (first_opened == NULL) {
|
160
|
+
first_opened = view;
|
161
|
+
view->next = NULL;
|
162
|
+
}
|
163
|
+
else {
|
164
|
+
view->next = first_opened;
|
165
|
+
first_opened = view;
|
166
|
+
}
|
167
|
+
}
|
168
|
+
|
169
|
+
static void removeRhoNativeOpenedView(RhoOpenedNativeView* view) {
|
170
|
+
RhoOpenedNativeView* p = first_opened;
|
171
|
+
RhoOpenedNativeView* prev = NULL;
|
172
|
+
while (p != NULL) {
|
173
|
+
if (p == view) {
|
174
|
+
RhoOpenedNativeView* next = p->next;
|
175
|
+
if (prev != NULL) {
|
176
|
+
prev->next = next;
|
177
|
+
}
|
178
|
+
if (first_opened == p) {
|
179
|
+
first_opened = NULL;
|
180
|
+
}
|
181
|
+
delete p;
|
182
|
+
}
|
183
|
+
prev = p;
|
184
|
+
p = p->next;
|
185
|
+
}
|
186
|
+
}
|
187
|
+
|
188
|
+
|
189
|
+
|
190
|
+
static RhoOpenedNativeView* getOpenedViewByID(int v_id) {
|
191
|
+
RhoOpenedNativeView* p = first_opened;
|
192
|
+
while (p != NULL) {
|
193
|
+
if (p->id == v_id) {
|
194
|
+
return p;
|
195
|
+
}
|
196
|
+
p = p->next;
|
197
|
+
}
|
198
|
+
return NULL;
|
199
|
+
}
|
200
|
+
|
201
|
+
|
202
|
+
static RhoOpenedNativeView* getOpenedViewByNativeView(NativeView* nv) {
|
203
|
+
RhoOpenedNativeView* p = first_opened;
|
204
|
+
while (p != NULL) {
|
205
|
+
if (p->n_view == nv) {
|
206
|
+
return p;
|
207
|
+
}
|
208
|
+
p = p->next;
|
209
|
+
}
|
210
|
+
return NULL;
|
211
|
+
}
|
212
|
+
|
213
|
+
|
214
|
+
|
215
|
+
|
216
|
+
|
217
|
+
|
218
|
+
|
219
|
+
|
220
|
+
|
221
|
+
|
222
|
+
|
91
223
|
void RhoNativeViewManager::registerViewType(const char* viewType, NativeViewFactory* factory) {
|
92
224
|
RhoNativeViewHolder* holder = new RhoNativeViewHolder();
|
93
225
|
holder->factory = factory;
|
@@ -124,3 +256,79 @@ void RhoNativeViewUtil::executeInUIThread_WM(RhoNativeViewRunnable* command) {
|
|
124
256
|
::PostMessage(main_wnd, WM_EXECUTE_COMMAND, (WPARAM)command, 0);
|
125
257
|
|
126
258
|
}
|
259
|
+
|
260
|
+
|
261
|
+
extern "C" int rho_native_view_manager_create_native_view(const char* viewtype, int tab_index, VALUE params) {
|
262
|
+
RhoNativeViewHolder* h = getHolderByViewTypeName(viewtype);
|
263
|
+
if (h == NULL) {
|
264
|
+
return -1;
|
265
|
+
}
|
266
|
+
NativeViewFactory* factory = h->factory;
|
267
|
+
NativeView* nv = factory->getNativeView(viewtype);
|
268
|
+
if (nv == NULL) {
|
269
|
+
return -1;
|
270
|
+
}
|
271
|
+
//String vtype = new String(viewtype);
|
272
|
+
|
273
|
+
RhoOpenedNativeView* opened_view = new RhoOpenedNativeView();
|
274
|
+
opened_view->factory_holder = h;
|
275
|
+
opened_view->n_view = nv;
|
276
|
+
opened_view->tab_index = tab_index;
|
277
|
+
|
278
|
+
addRhoNativeOpenedView(opened_view);
|
279
|
+
|
280
|
+
RhoNativeViewRunnable_OpenViewCommand* open_command = new RhoNativeViewRunnable_OpenViewCommand(opened_view);
|
281
|
+
|
282
|
+
RhoNativeViewUtil::executeInUIThread_WM(open_command);
|
283
|
+
|
284
|
+
return opened_view->id;
|
285
|
+
}
|
286
|
+
|
287
|
+
extern "C" void rho_native_view_manager_navigate_native_view(int native_view_id, const char* url) {
|
288
|
+
RhoOpenedNativeView* opened_view = getOpenedViewByID(native_view_id);
|
289
|
+
if (opened_view != NULL) {
|
290
|
+
opened_view->n_view->navigate(url);
|
291
|
+
}
|
292
|
+
}
|
293
|
+
|
294
|
+
extern "C" void rho_native_view_manager_destroy_native_view(int native_view_id) {
|
295
|
+
RhoOpenedNativeView* opened_view = getOpenedViewByID(native_view_id);
|
296
|
+
if (opened_view != NULL) {
|
297
|
+
removeRhoNativeOpenedView(opened_view);
|
298
|
+
RhoNativeViewRunnable_CloseViewCommand* close_command = new RhoNativeViewRunnable_CloseViewCommand();
|
299
|
+
RhoNativeViewUtil::executeInUIThread_WM(close_command);
|
300
|
+
}
|
301
|
+
}
|
302
|
+
|
303
|
+
|
304
|
+
|
305
|
+
|
306
|
+
// destroy native view (opened with URL prefix or in separated full-screen window)
|
307
|
+
// this function can executed from your native code (from NativeView code, for example)
|
308
|
+
// instead of this function you can execute destroy() for Ruby NativeView object
|
309
|
+
void RhoNativeViewManager::destroyNativeView(NativeView* nativeView) {
|
310
|
+
RhoOpenedNativeView* opened_view = getOpenedViewByNativeView(nativeView);
|
311
|
+
if (opened_view != NULL) {
|
312
|
+
RhoNativeViewRunnable_CloseViewCommand* close_command = new RhoNativeViewRunnable_CloseViewCommand();
|
313
|
+
RhoNativeViewUtil::executeInUIThread_WM(close_command);
|
314
|
+
}
|
315
|
+
}
|
316
|
+
|
317
|
+
int RhoNativeViewManager::openNativeView(const char* viewType, int tab_index, VALUE params) {
|
318
|
+
return rho_native_view_manager_create_native_view(viewType, tab_index, params);
|
319
|
+
}
|
320
|
+
|
321
|
+
|
322
|
+
void RhoNativeViewManager::closeNativeView(int v_id) {
|
323
|
+
rho_native_view_manager_destroy_native_view(v_id);
|
324
|
+
}
|
325
|
+
|
326
|
+
|
327
|
+
|
328
|
+
|
329
|
+
|
330
|
+
|
331
|
+
|
332
|
+
|
333
|
+
|
334
|
+
|