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
@@ -23,6 +23,8 @@
|
|
23
23
|
#define SQLITE_DEFAULT_MEMSTATUS 0
|
24
24
|
#define SQLITE_OSTRACE 0
|
25
25
|
#define SQLITE_OMIT_UTF16
|
26
|
+
#define SQLITE_TEMP_STORE 2
|
27
|
+
#define SQLITE_HAS_CODEC 1
|
26
28
|
// RHO
|
27
29
|
#define SQLITE_CORE 1
|
28
30
|
#define SQLITE_AMALGAMATION 1
|
@@ -112449,3 +112451,7 @@ SQLITE_PRIVATE void sqlite3Fts3IcuTokenizerModule(
|
|
112449
112451
|
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
|
112450
112452
|
|
112451
112453
|
/************** End of fts3_icu.c ********************************************/
|
112454
|
+
|
112455
|
+
#ifdef SQLITE_HAS_CODEC
|
112456
|
+
#include "crypto.c"
|
112457
|
+
#endif //SQLITE_HAS_CODEC
|
@@ -15,6 +15,11 @@
|
|
15
15
|
#include "SyncProtocol_3.h"
|
16
16
|
#include "net/URI.h"
|
17
17
|
|
18
|
+
#ifdef _MSC_VER
|
19
|
+
// Disable warnings about using "this" in member initializater list
|
20
|
+
#pragma warning(disable: 4355)
|
21
|
+
#endif
|
22
|
+
|
18
23
|
namespace rho {
|
19
24
|
namespace sync {
|
20
25
|
IMPLEMENT_LOGCLASS(CSyncEngine,"Sync");
|
@@ -361,23 +366,31 @@ void CSyncEngine::applyChangedValues(db::CDBAdapter& db)
|
|
361
366
|
|
362
367
|
void CSyncEngine::loadAllSources()
|
363
368
|
{
|
369
|
+
if (isNoThreadedMode())
|
370
|
+
RhoAppAdapter.loadAllSyncSources();
|
371
|
+
else
|
372
|
+
{
|
373
|
+
NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null ));
|
374
|
+
}
|
375
|
+
|
364
376
|
m_sources.removeAllElements();
|
365
|
-
m_arPartitions.removeAllElements();
|
366
377
|
|
367
|
-
|
368
|
-
for ( ; !res.isEnd(); res.next() )
|
369
|
-
{
|
370
|
-
String strShouldSync = res.getStringByIdx(1);
|
371
|
-
if ( strShouldSync.compare("none") == 0 )
|
372
|
-
continue;
|
378
|
+
Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
|
373
379
|
|
374
|
-
|
375
|
-
|
380
|
+
for( int i = 0; i < (int)arPartNames.size(); i++ )
|
381
|
+
{
|
382
|
+
db::CDBAdapter& dbPart = db::CDBAdapter::getDB(arPartNames.elementAt(i).c_str());
|
383
|
+
DBResult( res, dbPart.executeSQL("SELECT source_id,sync_type,name from sources ORDER BY sync_priority") );
|
384
|
+
for ( ; !res.isEnd(); res.next() )
|
385
|
+
{
|
386
|
+
String strShouldSync = res.getStringByIdx(1);
|
387
|
+
if ( strShouldSync.compare("none") == 0 )
|
388
|
+
continue;
|
376
389
|
|
377
|
-
|
378
|
-
m_arPartitions.addElement(strPartition);
|
390
|
+
String strName = res.getStringByIdx(2);
|
379
391
|
|
380
|
-
|
392
|
+
m_sources.addElement( new CSyncSource( res.getIntByIdx(0), strName, strShouldSync, dbPart, *this) );
|
393
|
+
}
|
381
394
|
}
|
382
395
|
|
383
396
|
checkSourceAssociations();
|
@@ -589,9 +602,12 @@ void CSyncEngine::doBulkSync()//throws Exception
|
|
589
602
|
|
590
603
|
LOG(INFO) + "Bulk sync: start";
|
591
604
|
getNotify().fireBulkSyncNotification(false, "start", "", RhoAppAdapter.ERR_NONE);
|
592
|
-
|
593
|
-
for (int i = 0; i < (int)
|
594
|
-
|
605
|
+
Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
|
606
|
+
for (int i = 0; i < (int)arPartNames.size() && isContinueSync(); i++)
|
607
|
+
{
|
608
|
+
if ( arPartNames.elementAt(i).compare("local") !=0 )
|
609
|
+
loadBulkPartition(arPartNames.elementAt(i));
|
610
|
+
}
|
595
611
|
|
596
612
|
if (isContinueSync())
|
597
613
|
{
|
@@ -609,7 +625,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
|
|
609
625
|
String serverUrl = RHOCONF().getPath("syncserver");
|
610
626
|
String strUrl = serverUrl + "bulk_data";
|
611
627
|
String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
|
612
|
-
String strDataUrl = "", strCmd = "";
|
628
|
+
String strDataUrl = "", strCmd = "", strCryptKey = "";
|
613
629
|
|
614
630
|
getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoAppAdapter.ERR_NONE);
|
615
631
|
|
@@ -689,7 +705,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
|
|
689
705
|
LOG(INFO) + "Bulk sync: start change db";
|
690
706
|
getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoAppAdapter.ERR_NONE);
|
691
707
|
|
692
|
-
dbPartition.setBulkSyncDB(fDataName);
|
708
|
+
dbPartition.setBulkSyncDB(fDataName, strCryptKey);
|
693
709
|
processServerSources(String("{\"partition\":\"") + strPartition + "\"}");
|
694
710
|
|
695
711
|
LOG(INFO) + "Bulk sync: end change db";
|
@@ -806,6 +822,21 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
|
|
806
822
|
getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
|
807
823
|
}
|
808
824
|
|
825
|
+
if ( RHOCONF().isExist("rho_sync_user") )
|
826
|
+
{
|
827
|
+
String strOldUser = RHOCONF().getString("rho_sync_user");
|
828
|
+
if ( name.compare(strOldUser) != 0 )
|
829
|
+
{
|
830
|
+
if (isNoThreadedMode())
|
831
|
+
RhoAppAdapter.resetDBOnSyncUserChanged();
|
832
|
+
else
|
833
|
+
{
|
834
|
+
NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null ));
|
835
|
+
}
|
836
|
+
}
|
837
|
+
}
|
838
|
+
RHOCONF().setString("rho_sync_user", name, true);
|
839
|
+
|
809
840
|
getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_NONE, "" );
|
810
841
|
|
811
842
|
PROF_STOP("Login");
|
@@ -859,8 +890,7 @@ void CSyncEngine::setSyncServer(const char* syncserver)
|
|
859
890
|
|
860
891
|
if ( strOldSrv.compare(strNewSrv) != 0)
|
861
892
|
{
|
862
|
-
|
863
|
-
rho_conf_save();
|
893
|
+
RHOCONF().setString("syncserver", syncserver, true);
|
864
894
|
|
865
895
|
getUserDB().executeSQL("DELETE FROM client_info");
|
866
896
|
|
@@ -248,7 +248,7 @@ CSyncNotification::CSyncNotification(String strUrl, String strParams, boolean bR
|
|
248
248
|
m_strParams(strParams), m_bRemoveAfterFire(bRemoveAfterFire),
|
249
249
|
m_cCallback(null), m_cCallbackData(null)
|
250
250
|
{
|
251
|
-
if ( strUrl
|
251
|
+
if ( strUrl.length() > 0 )
|
252
252
|
m_strUrl = RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
|
253
253
|
}
|
254
254
|
|
@@ -286,7 +286,7 @@ void CSyncNotify::showStatusPopup(const String& status)
|
|
286
286
|
if ( m_strStatusHide.length() == 0 )
|
287
287
|
m_strStatusHide = RhoAppAdapter.getMessageText("hide");
|
288
288
|
|
289
|
-
alert_show_status(status.c_str(), m_strStatusHide.c_str());
|
289
|
+
alert_show_status("", status.c_str(), m_strStatusHide.c_str());
|
290
290
|
}
|
291
291
|
|
292
292
|
void CSyncNotify::reportSyncStatus(String status, int error, String strDetails)
|
@@ -460,8 +460,9 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
|
|
460
460
|
clearNotification(src);
|
461
461
|
}
|
462
462
|
|
463
|
-
boolean CSyncNotify::callNotify(CSyncNotification oNotify, const String& strBody )
|
463
|
+
boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const String& strBody )
|
464
464
|
{
|
465
|
+
String strUrl = oNotify.m_strUrl; //Need to copy url since notify may be cleared in callback
|
465
466
|
if ( getSync().isNoThreadedMode() )
|
466
467
|
{
|
467
468
|
m_strNotifyBody = strBody;
|
@@ -472,10 +473,10 @@ boolean CSyncNotify::callNotify(CSyncNotification oNotify, const String& strBody
|
|
472
473
|
int nRet = (*oNotify.m_cCallback)(strBody.c_str(), oNotify.m_cCallbackData);
|
473
474
|
return nRet == 1;
|
474
475
|
}
|
475
|
-
if (
|
476
|
+
if ( strUrl.length() == 0 )
|
476
477
|
return true;
|
477
478
|
|
478
|
-
NetResponse(resp,getNet().pushData(
|
479
|
+
NetResponse(resp,getNet().pushData( strUrl, strBody, null ));
|
479
480
|
if ( !resp.isOK() )
|
480
481
|
LOG(ERROR) + "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
|
481
482
|
else
|
@@ -565,3 +566,11 @@ void CSyncNotify::callLoginCallback(const CSyncNotification& oNotify, int nErrCo
|
|
565
566
|
}
|
566
567
|
}
|
567
568
|
}
|
569
|
+
|
570
|
+
extern "C"
|
571
|
+
{
|
572
|
+
void rho_alert_show_status(char* szTitle, char* szText, char* szHideLabel)
|
573
|
+
{
|
574
|
+
alert_show_status( szTitle ? szTitle : "", szText ? szText : "", szHideLabel ? szHideLabel : "");
|
575
|
+
}
|
576
|
+
}
|
@@ -126,7 +126,7 @@ private:
|
|
126
126
|
|
127
127
|
void doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams);
|
128
128
|
|
129
|
-
boolean callNotify(CSyncNotification oNotify, const String& strBody );
|
129
|
+
boolean callNotify(const CSyncNotification& oNotify, const String& strBody );
|
130
130
|
|
131
131
|
void clearNotification(CSyncSource* src);
|
132
132
|
|
@@ -135,4 +135,4 @@ private:
|
|
135
135
|
}
|
136
136
|
}
|
137
137
|
|
138
|
-
extern "C" void alert_show_status(const char* message, const char* szHide);
|
138
|
+
extern "C" void alert_show_status(const char* title, const char* message, const char* szHide);
|
@@ -142,12 +142,16 @@ boolean CSyncSource::syncClientChanges()
|
|
142
142
|
boolean bSyncedServer = false;
|
143
143
|
if ( isPendingClientChanges() )
|
144
144
|
{
|
145
|
+
LOG(INFO) + "Client has unconfirmed created items. Call server to update them.";
|
145
146
|
syncServerChanges();
|
146
147
|
bSyncedServer = true;
|
147
148
|
}
|
148
149
|
|
149
150
|
if ( bSyncedServer && isPendingClientChanges() )
|
151
|
+
{
|
152
|
+
LOG(INFO) + "Server does not sent created items. Stop sync.";
|
150
153
|
getSync().setState(CSyncEngine::esStop);
|
154
|
+
}
|
151
155
|
else
|
152
156
|
{
|
153
157
|
PROF_START("Pull");
|
@@ -230,6 +234,7 @@ void CSyncSource::doSyncClientChanges()
|
|
230
234
|
{
|
231
235
|
getSync().setState(CSyncEngine::esStop);
|
232
236
|
m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
|
237
|
+
m_strError = resp.getCharData();
|
233
238
|
}
|
234
239
|
}else
|
235
240
|
{
|
@@ -238,6 +243,7 @@ void CSyncSource::doSyncClientChanges()
|
|
238
243
|
{
|
239
244
|
getSync().setState(CSyncEngine::esStop);
|
240
245
|
m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
|
246
|
+
m_strError = resp.getCharData();
|
241
247
|
}
|
242
248
|
}
|
243
249
|
}
|
@@ -280,6 +286,10 @@ static void escapeDoubleQuotes(String& str)
|
|
280
286
|
void CSyncSource::makePushBody_Ver3(String& strBody, const String& strUpdateType, boolean isSync)
|
281
287
|
{
|
282
288
|
getDB().Lock();
|
289
|
+
|
290
|
+
if ( isSync )
|
291
|
+
getDB().updateAllAttribChanges();
|
292
|
+
|
283
293
|
DBResult( res , getDB().executeSQL("SELECT attrib, object, value, attrib_type "
|
284
294
|
"FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY object", getID(), strUpdateType.c_str() ) );
|
285
295
|
|
@@ -416,6 +426,7 @@ void CSyncSource::syncServerChanges()
|
|
416
426
|
//const char* szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":28},{\"total_count\":28},{\"source-error\":{\"login-error\":{\"message\":\"s currently connected from another machine\"}}}]";
|
417
427
|
//const char* szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"0_broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"0_broken_object_id-error\":{\"message\":\"error create\"}}}]";
|
418
428
|
//const char* szData = "[{\"version\":3},{\"token\":\"35639160294387\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":3},{\"metadata\":\"{\\\"foo\\\":\\\"bar\\\"}\",\"insert\":{\"1\":{\"price\":\"199.99\",\"brand\":\"Apple\",\"name\":\"iPhone\"}}}]";
|
429
|
+
//const char* szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":1},{\"total_count\":1},{\"update-error\":{\"1-error\":{\"message\":\"Update failed!\"},\"1\":{\"foo\":\"bar5\"}}}]";
|
419
430
|
|
420
431
|
//LOG(INFO) + szData;
|
421
432
|
PROF_START("Parse");
|
@@ -435,6 +446,73 @@ void CSyncSource::syncServerChanges()
|
|
435
446
|
getSync().stopSync();
|
436
447
|
}
|
437
448
|
|
449
|
+
boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
|
450
|
+
{
|
451
|
+
if ( oCmds.hasName("source-error") )
|
452
|
+
{
|
453
|
+
CJSONEntry errSrc = oCmds.getEntry("source-error");
|
454
|
+
CJSONStructIterator errIter(errSrc);
|
455
|
+
for( ; !errIter.isEnd(); errIter.next() )
|
456
|
+
{
|
457
|
+
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
458
|
+
m_strError = errIter.getCurValue().getString("message");
|
459
|
+
m_strErrorType = errIter.getCurKey();
|
460
|
+
}
|
461
|
+
}else if ( oCmds.hasName("search-error") )
|
462
|
+
{
|
463
|
+
CJSONEntry errSrc = oCmds.getEntry("search-error");
|
464
|
+
CJSONStructIterator errIter(errSrc);
|
465
|
+
for( ; !errIter.isEnd(); errIter.next() )
|
466
|
+
{
|
467
|
+
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
468
|
+
m_strError = errIter.getCurValue().getString("message");
|
469
|
+
m_strErrorType = errIter.getCurKey();
|
470
|
+
}
|
471
|
+
}else if ( oCmds.hasName("create-error") )
|
472
|
+
{
|
473
|
+
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
474
|
+
m_strErrorType = "create-error";
|
475
|
+
|
476
|
+
CJSONEntry errSrc = oCmds.getEntry(m_strErrorType.c_str());
|
477
|
+
CJSONStructIterator errIter(errSrc);
|
478
|
+
for( ; !errIter.isEnd(); errIter.next() )
|
479
|
+
{
|
480
|
+
String strKey = errIter.getCurKey();
|
481
|
+
if ( String_endsWith(strKey, "-error") )
|
482
|
+
m_strError = errIter.getCurValue().getString("message");
|
483
|
+
}
|
484
|
+
}else if ( oCmds.hasName("update-error") )
|
485
|
+
{
|
486
|
+
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
487
|
+
m_strErrorType = "update-error";
|
488
|
+
|
489
|
+
CJSONEntry errSrc = oCmds.getEntry(m_strErrorType.c_str());
|
490
|
+
CJSONStructIterator errIter(errSrc);
|
491
|
+
for( ; !errIter.isEnd(); errIter.next() )
|
492
|
+
{
|
493
|
+
String strKey = errIter.getCurKey();
|
494
|
+
if ( String_endsWith(strKey, "-error") )
|
495
|
+
m_strError = errIter.getCurValue().getString("message");
|
496
|
+
}
|
497
|
+
}else if ( oCmds.hasName("delete-error") )
|
498
|
+
{
|
499
|
+
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
500
|
+
m_strErrorType = "delete-error";
|
501
|
+
|
502
|
+
CJSONEntry errSrc = oCmds.getEntry(m_strErrorType.c_str());
|
503
|
+
CJSONStructIterator errIter(errSrc);
|
504
|
+
for( ; !errIter.isEnd(); errIter.next() )
|
505
|
+
{
|
506
|
+
String strKey = errIter.getCurKey();
|
507
|
+
if ( String_endsWith(strKey, "-error") )
|
508
|
+
m_strError = errIter.getCurValue().getString("message");
|
509
|
+
}
|
510
|
+
}else
|
511
|
+
return false;
|
512
|
+
|
513
|
+
return true;
|
514
|
+
}
|
515
|
+
|
438
516
|
void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
|
439
517
|
{
|
440
518
|
PROF_START("Data1");
|
@@ -522,39 +600,7 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
|
|
522
600
|
if ( oCmds.hasName("schema-changed") )
|
523
601
|
{
|
524
602
|
getSync().setSchemaChanged(true);
|
525
|
-
}else if ( oCmds
|
526
|
-
{
|
527
|
-
CJSONEntry errSrc = oCmds.getEntry("source-error");
|
528
|
-
CJSONStructIterator errIter(errSrc);
|
529
|
-
for( ; !errIter.isEnd(); errIter.next() )
|
530
|
-
{
|
531
|
-
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
532
|
-
m_strError = errIter.getCurValue().getString("message");
|
533
|
-
m_strErrorType = errIter.getCurKey();
|
534
|
-
}
|
535
|
-
}else if ( oCmds.hasName("search-error") )
|
536
|
-
{
|
537
|
-
CJSONEntry errSrc = oCmds.getEntry("search-error");
|
538
|
-
CJSONStructIterator errIter(errSrc);
|
539
|
-
for( ; !errIter.isEnd(); errIter.next() )
|
540
|
-
{
|
541
|
-
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
542
|
-
m_strError = errIter.getCurValue().getString("message");
|
543
|
-
m_strErrorType = errIter.getCurKey();
|
544
|
-
}
|
545
|
-
}else if ( oCmds.hasName("create-error") )
|
546
|
-
{
|
547
|
-
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
548
|
-
m_strErrorType = "create-error";
|
549
|
-
}else if ( oCmds.hasName("update-error") )
|
550
|
-
{
|
551
|
-
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
552
|
-
m_strErrorType = "update-error";
|
553
|
-
}else if ( oCmds.hasName("delete-error") )
|
554
|
-
{
|
555
|
-
m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
|
556
|
-
m_strErrorType = "delete-error";
|
557
|
-
}else
|
603
|
+
}else if ( !processServerErrors(oCmds) )
|
558
604
|
{
|
559
605
|
getDB().startTransaction();
|
560
606
|
|
@@ -133,6 +133,7 @@ public:
|
|
133
133
|
void updateAssociation(const String& strOldObject, const String& strNewObject, const String& strAttrib);
|
134
134
|
|
135
135
|
void applyChangedValues();
|
136
|
+
boolean processServerErrors(json::CJSONEntry& oCmds);
|
136
137
|
private:
|
137
138
|
CSyncEngine& getSync(){ return m_syncEngine; }
|
138
139
|
CSyncNotify& getNotify();
|
@@ -44,6 +44,10 @@ CSyncThread::CSyncThread(common::IRhoClassFactory* factory) : CThreadQueue(facto
|
|
44
44
|
|
45
45
|
m_oSyncEngine.setFactory(factory);
|
46
46
|
|
47
|
+
LOG(INFO) + "sync_poll_interval: " + RHOCONF().getInt("sync_poll_interval");
|
48
|
+
LOG(INFO) + "syncserver: " + RHOCONF().getString("syncserver");
|
49
|
+
LOG(INFO) + "bulksync_state: " + RHOCONF().getInt("bulksync_state");
|
50
|
+
|
47
51
|
if ( RHOCONF().getString("syncserver").length() > 0 )
|
48
52
|
start(epLow);
|
49
53
|
}
|
@@ -85,16 +89,22 @@ unsigned long CSyncThread::getRetValue()
|
|
85
89
|
int CSyncThread::getLastPollInterval()
|
86
90
|
{
|
87
91
|
uint64 nowTime = CLocalTime().toULong();
|
88
|
-
|
89
|
-
DBResult( res, CDBAdapter::getUserDB().executeSQL("SELECT last_updated from sources") );
|
90
92
|
uint64 latestTimeUpdated = 0;
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
93
|
+
|
94
|
+
Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
|
95
|
+
for( int i = 0; i < (int)arPartNames.size(); i++ )
|
96
|
+
{
|
97
|
+
db::CDBAdapter& dbPart = db::CDBAdapter::getDB(arPartNames.elementAt(i).c_str());
|
98
|
+
|
99
|
+
DBResult( res, dbPart.executeSQL("SELECT last_updated from sources") );
|
100
|
+
for ( ; !res.isEnd(); res.next() )
|
101
|
+
{
|
102
|
+
uint64 timeUpdated = res.getUInt64ByIdx(0);
|
103
|
+
if ( latestTimeUpdated < timeUpdated )
|
104
|
+
latestTimeUpdated = timeUpdated;
|
105
|
+
}
|
96
106
|
}
|
97
|
-
|
107
|
+
|
98
108
|
return latestTimeUpdated > 0 ? (int)(nowTime-latestTimeUpdated) : 0;
|
99
109
|
}
|
100
110
|
|
@@ -348,7 +358,7 @@ void rho_sync_clear_notification(int source_id)
|
|
348
358
|
#ifndef RHO_NO_RUBY
|
349
359
|
unsigned long rho_sync_get_attrs(const char* szPartition, int nSrcID)
|
350
360
|
{
|
351
|
-
return (VALUE)CDBAdapter::getDB(szPartition).getAttrMgr().getAttrsBySrc(nSrcID);
|
361
|
+
return 0;//(VALUE)CDBAdapter::getDB(szPartition).getAttrMgr().getAttrsBySrc(nSrcID);
|
352
362
|
}
|
353
363
|
|
354
364
|
unsigned long rho_sync_is_blob_attr(const char* szPartition, int nSrcID, const char* szAttrName)
|
@@ -405,12 +415,12 @@ char* rho_sync_create_string(const char* szStr)
|
|
405
415
|
|
406
416
|
void rho_sync_free_string(char* szStr)
|
407
417
|
{
|
408
|
-
|
418
|
+
free(szStr);
|
409
419
|
}
|
410
420
|
|
411
421
|
void rho_sync_enable_status_popup(int b)
|
412
422
|
{
|
413
|
-
|
423
|
+
CSyncThread::getSyncEngine().getNotify().enableStatusPopup(b == 0 ? false : true);
|
414
424
|
}
|
415
425
|
|
416
426
|
void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue)
|
@@ -418,4 +428,9 @@ void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char
|
|
418
428
|
CSyncEngine::getSourceOptions().setProperty(nSrcID, szPropName, szPropValue);
|
419
429
|
}
|
420
430
|
|
431
|
+
void rho_sync_set_ssl_verify_peer(int b)
|
432
|
+
{
|
433
|
+
CSyncThread::getSyncEngine().getNet().sslVerifyPeer(b == 0 ? false : true);
|
434
|
+
}
|
435
|
+
|
421
436
|
}
|
@@ -89,11 +89,13 @@ public class StringExpression extends Expression {
|
|
89
89
|
break;
|
90
90
|
}
|
91
91
|
default:
|
92
|
-
if (Character.isDigit(next_char)) {
|
92
|
+
//if (Character.isDigit(next_char)) {
|
93
|
+
if (next_char>='0' && next_char < '8') {
|
93
94
|
//e,g. "\142", '\0', '\56'
|
94
95
|
int number_length = 1;
|
95
96
|
while ((i + 1 + number_length) < value.length() &&
|
96
|
-
|
97
|
+
// Character.isDigit(value.charAt(i + 1 + number_length)) &&
|
98
|
+
(value.charAt(i + 1 + number_length)>='0' && value.charAt(i + 1 + number_length) < '8')&&
|
97
99
|
number_length <= 3) {
|
98
100
|
++number_length;
|
99
101
|
}
|