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,575 @@
|
|
1
|
+
package com.rhomobile.rhodes;
|
2
|
+
|
3
|
+
import java.util.Arrays;
|
4
|
+
|
5
|
+
/** A very fast and memory efficient class to encode and decode to and from BASE64 in full accordance
|
6
|
+
* with RFC 2045.<br><br>
|
7
|
+
* On Windows XP sp1 with 1.4.2_04 and later ;), this encoder and decoder is about 10 times faster
|
8
|
+
* on small arrays (10 - 1000 bytes) and 2-3 times as fast on larger arrays (10000 - 1000000 bytes)
|
9
|
+
* compared to <code>sun.misc.Encoder()/Decoder()</code>.<br><br>
|
10
|
+
*
|
11
|
+
* On byte arrays the encoder is about 20% faster than Jakarta Commons Base64 Codec for encode and
|
12
|
+
* about 50% faster for decoding large arrays. This implementation is about twice as fast on very small
|
13
|
+
* arrays (< 30 bytes). If source/destination is a <code>String</code> this
|
14
|
+
* version is about three times as fast due to the fact that the Commons Codec result has to be recoded
|
15
|
+
* to a <code>String</code> from <code>byte[]</code>, which is very expensive.<br><br>
|
16
|
+
*
|
17
|
+
* This encode/decode algorithm doesn't create any temporary arrays as many other codecs do, it only
|
18
|
+
* allocates the resulting array. This produces less garbage and it is possible to handle arrays twice
|
19
|
+
* as large as algorithms that create a temporary array. (E.g. Jakarta Commons Codec). It is unknown
|
20
|
+
* whether Sun's <code>sun.misc.Encoder()/Decoder()</code> produce temporary arrays but since performance
|
21
|
+
* is quite low it probably does.<br><br>
|
22
|
+
*
|
23
|
+
* The encoder produces the same output as the Sun one except that the Sun's encoder appends
|
24
|
+
* a trailing line separator if the last character isn't a pad. Unclear why but it only adds to the
|
25
|
+
* length and is probably a side effect. Both are in conformance with RFC 2045 though.<br>
|
26
|
+
* Commons codec seem to always att a trailing line separator.<br><br>
|
27
|
+
*
|
28
|
+
* <b>Note!</b>
|
29
|
+
* The encode/decode method pairs (types) come in three versions with the <b>exact</b> same algorithm and
|
30
|
+
* thus a lot of code redundancy. This is to not create any temporary arrays for transcoding to/from different
|
31
|
+
* format types. The methods not used can simply be commented out.<br><br>
|
32
|
+
*
|
33
|
+
* There is also a "fast" version of all decode methods that works the same way as the normal ones, but
|
34
|
+
* har a few demands on the decoded input. Normally though, these fast verions should be used if the source if
|
35
|
+
* the input is known and it hasn't bee tampered with.<br><br>
|
36
|
+
*
|
37
|
+
* If you find the code useful or you find a bug, please send me a note at base64 @ miginfocom . com.
|
38
|
+
*
|
39
|
+
* Licence (BSD):
|
40
|
+
* ==============
|
41
|
+
*
|
42
|
+
* Copyright (c) 2004, Mikael Grev, MiG InfoCom AB. (base64 @ miginfocom . com)
|
43
|
+
* All rights reserved.
|
44
|
+
*
|
45
|
+
* Redistribution and use in source and binary forms, with or without modification,
|
46
|
+
* are permitted provided that the following conditions are met:
|
47
|
+
* Redistributions of source code must retain the above copyright notice, this list
|
48
|
+
* of conditions and the following disclaimer.
|
49
|
+
* Redistributions in binary form must reproduce the above copyright notice, this
|
50
|
+
* list of conditions and the following disclaimer in the documentation and/or other
|
51
|
+
* materials provided with the distribution.
|
52
|
+
* Neither the name of the MiG InfoCom AB nor the names of its contributors may be
|
53
|
+
* used to endorse or promote products derived from this software without specific
|
54
|
+
* prior written permission.
|
55
|
+
*
|
56
|
+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
57
|
+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
58
|
+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
59
|
+
* IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
60
|
+
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
61
|
+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
|
62
|
+
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
63
|
+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
64
|
+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
65
|
+
* OF SUCH DAMAGE.
|
66
|
+
*
|
67
|
+
* @version 2.2
|
68
|
+
* @author Mikael Grev
|
69
|
+
* Date: 2004-aug-02
|
70
|
+
* Time: 11:31:11
|
71
|
+
*/
|
72
|
+
|
73
|
+
public class Base64
|
74
|
+
{
|
75
|
+
private static final char[] CA = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();
|
76
|
+
private static final int[] IA = new int[256];
|
77
|
+
static {
|
78
|
+
Arrays.fill(IA, -1);
|
79
|
+
for (int i = 0, iS = CA.length; i < iS; i++)
|
80
|
+
IA[CA[i]] = i;
|
81
|
+
IA['='] = 0;
|
82
|
+
}
|
83
|
+
|
84
|
+
// ****************************************************************************************
|
85
|
+
// * char[] version
|
86
|
+
// ****************************************************************************************
|
87
|
+
|
88
|
+
/** Encodes a raw byte array into a BASE64 <code>char[]</code> representation i accordance with RFC 2045.
|
89
|
+
* @param sArr The bytes to convert. If <code>null</code> or length 0 an empty array will be returned.
|
90
|
+
* @param lineSep Optional "\r\n" after 76 characters, unless end of file.<br>
|
91
|
+
* No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a
|
92
|
+
* little faster.
|
93
|
+
* @return A BASE64 encoded array. Never <code>null</code>.
|
94
|
+
*/
|
95
|
+
public final static char[] encodeToChar(byte[] sArr, boolean lineSep)
|
96
|
+
{
|
97
|
+
// Check special case
|
98
|
+
int sLen = sArr != null ? sArr.length : 0;
|
99
|
+
if (sLen == 0)
|
100
|
+
return new char[0];
|
101
|
+
|
102
|
+
int eLen = (sLen / 3) * 3; // Length of even 24-bits.
|
103
|
+
int cCnt = ((sLen - 1) / 3 + 1) << 2; // Returned character count
|
104
|
+
int dLen = cCnt + (lineSep ? (cCnt - 1) / 76 << 1 : 0); // Length of returned array
|
105
|
+
char[] dArr = new char[dLen];
|
106
|
+
|
107
|
+
// Encode even 24-bits
|
108
|
+
for (int s = 0, d = 0, cc = 0; s < eLen;) {
|
109
|
+
// Copy next three bytes into lower 24 bits of int, paying attension to sign.
|
110
|
+
int i = (sArr[s++] & 0xff) << 16 | (sArr[s++] & 0xff) << 8 | (sArr[s++] & 0xff);
|
111
|
+
|
112
|
+
// Encode the int into four chars
|
113
|
+
dArr[d++] = CA[(i >>> 18) & 0x3f];
|
114
|
+
dArr[d++] = CA[(i >>> 12) & 0x3f];
|
115
|
+
dArr[d++] = CA[(i >>> 6) & 0x3f];
|
116
|
+
dArr[d++] = CA[i & 0x3f];
|
117
|
+
|
118
|
+
// Add optional line separator
|
119
|
+
if (lineSep && ++cc == 19 && d < dLen - 2) {
|
120
|
+
dArr[d++] = '\r';
|
121
|
+
dArr[d++] = '\n';
|
122
|
+
cc = 0;
|
123
|
+
}
|
124
|
+
}
|
125
|
+
|
126
|
+
// Pad and encode last bits if source isn't even 24 bits.
|
127
|
+
int left = sLen - eLen; // 0 - 2.
|
128
|
+
if (left > 0) {
|
129
|
+
// Prepare the int
|
130
|
+
int i = ((sArr[eLen] & 0xff) << 10) | (left == 2 ? ((sArr[sLen - 1] & 0xff) << 2) : 0);
|
131
|
+
|
132
|
+
// Set last four chars
|
133
|
+
dArr[dLen - 4] = CA[i >> 12];
|
134
|
+
dArr[dLen - 3] = CA[(i >>> 6) & 0x3f];
|
135
|
+
dArr[dLen - 2] = left == 2 ? CA[i & 0x3f] : '=';
|
136
|
+
dArr[dLen - 1] = '=';
|
137
|
+
}
|
138
|
+
return dArr;
|
139
|
+
}
|
140
|
+
|
141
|
+
/** Decodes a BASE64 encoded char array. All illegal characters will be ignored and can handle both arrays with
|
142
|
+
* and without line separators.
|
143
|
+
* @param sArr The source array. <code>null</code> or length 0 will return an empty array.
|
144
|
+
* @return The decoded array of bytes. May be of length 0. Will be <code>null</code> if the legal characters
|
145
|
+
* (including '=') isn't divideable by 4. (I.e. definitely corrupted).
|
146
|
+
*/
|
147
|
+
public final static byte[] decode(char[] sArr)
|
148
|
+
{
|
149
|
+
// Check special case
|
150
|
+
int sLen = sArr != null ? sArr.length : 0;
|
151
|
+
if (sLen == 0)
|
152
|
+
return new byte[0];
|
153
|
+
|
154
|
+
// Count illegal characters (including '\r', '\n') to know what size the returned array will be,
|
155
|
+
// so we don't have to reallocate & copy it later.
|
156
|
+
int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...)
|
157
|
+
for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out.
|
158
|
+
if (IA[sArr[i]] < 0)
|
159
|
+
sepCnt++;
|
160
|
+
|
161
|
+
// Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045.
|
162
|
+
if ((sLen - sepCnt) % 4 != 0)
|
163
|
+
return null;
|
164
|
+
|
165
|
+
int pad = 0;
|
166
|
+
for (int i = sLen; i > 1 && IA[sArr[--i]] <= 0;)
|
167
|
+
if (sArr[i] == '=')
|
168
|
+
pad++;
|
169
|
+
|
170
|
+
int len = ((sLen - sepCnt) * 6 >> 3) - pad;
|
171
|
+
|
172
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
173
|
+
|
174
|
+
for (int s = 0, d = 0; d < len;) {
|
175
|
+
// Assemble three bytes into an int from four "valid" characters.
|
176
|
+
int i = 0;
|
177
|
+
for (int j = 0; j < 4; j++) { // j only increased if a valid char was found.
|
178
|
+
int c = IA[sArr[s++]];
|
179
|
+
if (c >= 0)
|
180
|
+
i |= c << (18 - j * 6);
|
181
|
+
else
|
182
|
+
j--;
|
183
|
+
}
|
184
|
+
// Add the bytes
|
185
|
+
dArr[d++] = (byte) (i >> 16);
|
186
|
+
if (d < len) {
|
187
|
+
dArr[d++]= (byte) (i >> 8);
|
188
|
+
if (d < len)
|
189
|
+
dArr[d++] = (byte) i;
|
190
|
+
}
|
191
|
+
}
|
192
|
+
return dArr;
|
193
|
+
}
|
194
|
+
|
195
|
+
/** Decodes a BASE64 encoded char array that is known to be resonably well formatted. The method is about twice as
|
196
|
+
* fast as {@link #decode(char[])}. The preconditions are:<br>
|
197
|
+
* + The array must have a line length of 76 chars OR no line separators at all (one line).<br>
|
198
|
+
* + Line separator must be "\r\n", as specified in RFC 2045
|
199
|
+
* + The array must not contain illegal characters within the encoded string<br>
|
200
|
+
* + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.<br>
|
201
|
+
* @param sArr The source array. Length 0 will return an empty array. <code>null</code> will throw an exception.
|
202
|
+
* @return The decoded array of bytes. May be of length 0.
|
203
|
+
*/
|
204
|
+
public final static byte[] decodeFast(char[] sArr)
|
205
|
+
{
|
206
|
+
// Check special case
|
207
|
+
int sLen = sArr.length;
|
208
|
+
if (sLen == 0)
|
209
|
+
return new byte[0];
|
210
|
+
|
211
|
+
int sIx = 0, eIx = sLen - 1; // Start and end index after trimming.
|
212
|
+
|
213
|
+
// Trim illegal chars from start
|
214
|
+
while (sIx < eIx && IA[sArr[sIx]] < 0)
|
215
|
+
sIx++;
|
216
|
+
|
217
|
+
// Trim illegal chars from end
|
218
|
+
while (eIx > 0 && IA[sArr[eIx]] < 0)
|
219
|
+
eIx--;
|
220
|
+
|
221
|
+
// get the padding count (=) (0, 1 or 2)
|
222
|
+
int pad = sArr[eIx] == '=' ? (sArr[eIx - 1] == '=' ? 2 : 1) : 0; // Count '=' at end.
|
223
|
+
int cCnt = eIx - sIx + 1; // Content count including possible separators
|
224
|
+
int sepCnt = sLen > 76 ? (sArr[76] == '\r' ? cCnt / 78 : 0) << 1 : 0;
|
225
|
+
|
226
|
+
int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes
|
227
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
228
|
+
|
229
|
+
// Decode all but the last 0 - 2 bytes.
|
230
|
+
int d = 0;
|
231
|
+
for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) {
|
232
|
+
// Assemble three bytes into an int from four "valid" characters.
|
233
|
+
int i = IA[sArr[sIx++]] << 18 | IA[sArr[sIx++]] << 12 | IA[sArr[sIx++]] << 6 | IA[sArr[sIx++]];
|
234
|
+
|
235
|
+
// Add the bytes
|
236
|
+
dArr[d++] = (byte) (i >> 16);
|
237
|
+
dArr[d++] = (byte) (i >> 8);
|
238
|
+
dArr[d++] = (byte) i;
|
239
|
+
|
240
|
+
// If line separator, jump over it.
|
241
|
+
if (sepCnt > 0 && ++cc == 19) {
|
242
|
+
sIx += 2;
|
243
|
+
cc = 0;
|
244
|
+
}
|
245
|
+
}
|
246
|
+
|
247
|
+
if (d < len) {
|
248
|
+
// Decode last 1-3 bytes (incl '=') into 1-3 bytes
|
249
|
+
int i = 0;
|
250
|
+
for (int j = 0; sIx <= eIx - pad; j++)
|
251
|
+
i |= IA[sArr[sIx++]] << (18 - j * 6);
|
252
|
+
|
253
|
+
for (int r = 16; d < len; r -= 8)
|
254
|
+
dArr[d++] = (byte) (i >> r);
|
255
|
+
}
|
256
|
+
|
257
|
+
return dArr;
|
258
|
+
}
|
259
|
+
|
260
|
+
// ****************************************************************************************
|
261
|
+
// * byte[] version
|
262
|
+
// ****************************************************************************************
|
263
|
+
|
264
|
+
/** Encodes a raw byte array into a BASE64 <code>byte[]</code> representation i accordance with RFC 2045.
|
265
|
+
* @param sArr The bytes to convert. If <code>null</code> or length 0 an empty array will be returned.
|
266
|
+
* @param lineSep Optional "\r\n" after 76 characters, unless end of file.<br>
|
267
|
+
* No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a
|
268
|
+
* little faster.
|
269
|
+
* @return A BASE64 encoded array. Never <code>null</code>.
|
270
|
+
*/
|
271
|
+
public final static byte[] encodeToByte(byte[] sArr, boolean lineSep)
|
272
|
+
{
|
273
|
+
// Check special case
|
274
|
+
int sLen = sArr != null ? sArr.length : 0;
|
275
|
+
if (sLen == 0)
|
276
|
+
return new byte[0];
|
277
|
+
|
278
|
+
int eLen = (sLen / 3) * 3; // Length of even 24-bits.
|
279
|
+
int cCnt = ((sLen - 1) / 3 + 1) << 2; // Returned character count
|
280
|
+
int dLen = cCnt + (lineSep ? (cCnt - 1) / 76 << 1 : 0); // Length of returned array
|
281
|
+
byte[] dArr = new byte[dLen];
|
282
|
+
|
283
|
+
// Encode even 24-bits
|
284
|
+
for (int s = 0, d = 0, cc = 0; s < eLen;) {
|
285
|
+
// Copy next three bytes into lower 24 bits of int, paying attension to sign.
|
286
|
+
int i = (sArr[s++] & 0xff) << 16 | (sArr[s++] & 0xff) << 8 | (sArr[s++] & 0xff);
|
287
|
+
|
288
|
+
// Encode the int into four chars
|
289
|
+
dArr[d++] = (byte) CA[(i >>> 18) & 0x3f];
|
290
|
+
dArr[d++] = (byte) CA[(i >>> 12) & 0x3f];
|
291
|
+
dArr[d++] = (byte) CA[(i >>> 6) & 0x3f];
|
292
|
+
dArr[d++] = (byte) CA[i & 0x3f];
|
293
|
+
|
294
|
+
// Add optional line separator
|
295
|
+
if (lineSep && ++cc == 19 && d < dLen - 2) {
|
296
|
+
dArr[d++] = '\r';
|
297
|
+
dArr[d++] = '\n';
|
298
|
+
cc = 0;
|
299
|
+
}
|
300
|
+
}
|
301
|
+
|
302
|
+
// Pad and encode last bits if source isn't an even 24 bits.
|
303
|
+
int left = sLen - eLen; // 0 - 2.
|
304
|
+
if (left > 0) {
|
305
|
+
// Prepare the int
|
306
|
+
int i = ((sArr[eLen] & 0xff) << 10) | (left == 2 ? ((sArr[sLen - 1] & 0xff) << 2) : 0);
|
307
|
+
|
308
|
+
// Set last four chars
|
309
|
+
dArr[dLen - 4] = (byte) CA[i >> 12];
|
310
|
+
dArr[dLen - 3] = (byte) CA[(i >>> 6) & 0x3f];
|
311
|
+
dArr[dLen - 2] = left == 2 ? (byte) CA[i & 0x3f] : (byte) '=';
|
312
|
+
dArr[dLen - 1] = '=';
|
313
|
+
}
|
314
|
+
return dArr;
|
315
|
+
}
|
316
|
+
|
317
|
+
/** Decodes a BASE64 encoded byte array. All illegal characters will be ignored and can handle both arrays with
|
318
|
+
* and without line separators.
|
319
|
+
* @param sArr The source array. Length 0 will return an empty array. <code>null</code> will throw an exception.
|
320
|
+
* @return The decoded array of bytes. May be of length 0. Will be <code>null</code> if the legal characters
|
321
|
+
* (including '=') isn't divideable by 4. (I.e. definitely corrupted).
|
322
|
+
*/
|
323
|
+
public final static byte[] decode(byte[] sArr)
|
324
|
+
{
|
325
|
+
// Check special case
|
326
|
+
int sLen = sArr.length;
|
327
|
+
|
328
|
+
// Count illegal characters (including '\r', '\n') to know what size the returned array will be,
|
329
|
+
// so we don't have to reallocate & copy it later.
|
330
|
+
int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...)
|
331
|
+
for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out.
|
332
|
+
if (IA[sArr[i] & 0xff] < 0)
|
333
|
+
sepCnt++;
|
334
|
+
|
335
|
+
// Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045.
|
336
|
+
if ((sLen - sepCnt) % 4 != 0)
|
337
|
+
return null;
|
338
|
+
|
339
|
+
int pad = 0;
|
340
|
+
for (int i = sLen; i > 1 && IA[sArr[--i] & 0xff] <= 0;)
|
341
|
+
if (sArr[i] == '=')
|
342
|
+
pad++;
|
343
|
+
|
344
|
+
int len = ((sLen - sepCnt) * 6 >> 3) - pad;
|
345
|
+
|
346
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
347
|
+
|
348
|
+
for (int s = 0, d = 0; d < len;) {
|
349
|
+
// Assemble three bytes into an int from four "valid" characters.
|
350
|
+
int i = 0;
|
351
|
+
for (int j = 0; j < 4; j++) { // j only increased if a valid char was found.
|
352
|
+
int c = IA[sArr[s++] & 0xff];
|
353
|
+
if (c >= 0)
|
354
|
+
i |= c << (18 - j * 6);
|
355
|
+
else
|
356
|
+
j--;
|
357
|
+
}
|
358
|
+
|
359
|
+
// Add the bytes
|
360
|
+
dArr[d++] = (byte) (i >> 16);
|
361
|
+
if (d < len) {
|
362
|
+
dArr[d++]= (byte) (i >> 8);
|
363
|
+
if (d < len)
|
364
|
+
dArr[d++] = (byte) i;
|
365
|
+
}
|
366
|
+
}
|
367
|
+
|
368
|
+
return dArr;
|
369
|
+
}
|
370
|
+
|
371
|
+
|
372
|
+
/** Decodes a BASE64 encoded byte array that is known to be resonably well formatted. The method is about twice as
|
373
|
+
* fast as {@link #decode(byte[])}. The preconditions are:<br>
|
374
|
+
* + The array must have a line length of 76 chars OR no line separators at all (one line).<br>
|
375
|
+
* + Line separator must be "\r\n", as specified in RFC 2045
|
376
|
+
* + The array must not contain illegal characters within the encoded string<br>
|
377
|
+
* + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.<br>
|
378
|
+
* @param sArr The source array. Length 0 will return an empty array. <code>null</code> will throw an exception.
|
379
|
+
* @return The decoded array of bytes. May be of length 0.
|
380
|
+
*/
|
381
|
+
public final static byte[] decodeFast(byte[] sArr)
|
382
|
+
{
|
383
|
+
// Check special case
|
384
|
+
int sLen = sArr.length;
|
385
|
+
if (sLen == 0)
|
386
|
+
return new byte[0];
|
387
|
+
|
388
|
+
int sIx = 0, eIx = sLen - 1; // Start and end index after trimming.
|
389
|
+
|
390
|
+
// Trim illegal chars from start
|
391
|
+
while (sIx < eIx && IA[sArr[sIx] & 0xff] < 0)
|
392
|
+
sIx++;
|
393
|
+
|
394
|
+
// Trim illegal chars from end
|
395
|
+
while (eIx > 0 && IA[sArr[eIx] & 0xff] < 0)
|
396
|
+
eIx--;
|
397
|
+
|
398
|
+
// get the padding count (=) (0, 1 or 2)
|
399
|
+
int pad = sArr[eIx] == '=' ? (sArr[eIx - 1] == '=' ? 2 : 1) : 0; // Count '=' at end.
|
400
|
+
int cCnt = eIx - sIx + 1; // Content count including possible separators
|
401
|
+
int sepCnt = sLen > 76 ? (sArr[76] == '\r' ? cCnt / 78 : 0) << 1 : 0;
|
402
|
+
|
403
|
+
int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes
|
404
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
405
|
+
|
406
|
+
// Decode all but the last 0 - 2 bytes.
|
407
|
+
int d = 0;
|
408
|
+
for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) {
|
409
|
+
// Assemble three bytes into an int from four "valid" characters.
|
410
|
+
int i = IA[sArr[sIx++]] << 18 | IA[sArr[sIx++]] << 12 | IA[sArr[sIx++]] << 6 | IA[sArr[sIx++]];
|
411
|
+
|
412
|
+
// Add the bytes
|
413
|
+
dArr[d++] = (byte) (i >> 16);
|
414
|
+
dArr[d++] = (byte) (i >> 8);
|
415
|
+
dArr[d++] = (byte) i;
|
416
|
+
|
417
|
+
// If line separator, jump over it.
|
418
|
+
if (sepCnt > 0 && ++cc == 19) {
|
419
|
+
sIx += 2;
|
420
|
+
cc = 0;
|
421
|
+
}
|
422
|
+
}
|
423
|
+
|
424
|
+
if (d < len) {
|
425
|
+
// Decode last 1-3 bytes (incl '=') into 1-3 bytes
|
426
|
+
int i = 0;
|
427
|
+
for (int j = 0; sIx <= eIx - pad; j++)
|
428
|
+
i |= IA[sArr[sIx++]] << (18 - j * 6);
|
429
|
+
|
430
|
+
for (int r = 16; d < len; r -= 8)
|
431
|
+
dArr[d++] = (byte) (i >> r);
|
432
|
+
}
|
433
|
+
|
434
|
+
return dArr;
|
435
|
+
}
|
436
|
+
|
437
|
+
// ****************************************************************************************
|
438
|
+
// * String version
|
439
|
+
// ****************************************************************************************
|
440
|
+
|
441
|
+
/** Encodes a raw byte array into a BASE64 <code>String</code> representation i accordance with RFC 2045.
|
442
|
+
* @param sArr The bytes to convert. If <code>null</code> or length 0 an empty array will be returned.
|
443
|
+
* @param lineSep Optional "\r\n" after 76 characters, unless end of file.<br>
|
444
|
+
* No line separator will be in breach of RFC 2045 which specifies max 76 per line but will be a
|
445
|
+
* little faster.
|
446
|
+
* @return A BASE64 encoded array. Never <code>null</code>.
|
447
|
+
*/
|
448
|
+
public final static String encodeToString(byte[] sArr, boolean lineSep)
|
449
|
+
{
|
450
|
+
// Reuse char[] since we can't create a String incrementally anyway and StringBuffer/Builder would be slower.
|
451
|
+
return new String(encodeToChar(sArr, lineSep));
|
452
|
+
}
|
453
|
+
|
454
|
+
/** Decodes a BASE64 encoded <code>String</code>. All illegal characters will be ignored and can handle both strings with
|
455
|
+
* and without line separators.<br>
|
456
|
+
* <b>Note!</b> It can be up to about 2x the speed to call <code>decode(str.toCharArray())</code> instead. That
|
457
|
+
* will create a temporary array though. This version will use <code>str.charAt(i)</code> to iterate the string.
|
458
|
+
* @param str The source string. <code>null</code> or length 0 will return an empty array.
|
459
|
+
* @return The decoded array of bytes. May be of length 0. Will be <code>null</code> if the legal characters
|
460
|
+
* (including '=') isn't divideable by 4. (I.e. definitely corrupted).
|
461
|
+
*/
|
462
|
+
public final static byte[] decode(String str)
|
463
|
+
{
|
464
|
+
// Check special case
|
465
|
+
int sLen = str != null ? str.length() : 0;
|
466
|
+
if (sLen == 0)
|
467
|
+
return new byte[0];
|
468
|
+
|
469
|
+
// Count illegal characters (including '\r', '\n') to know what size the returned array will be,
|
470
|
+
// so we don't have to reallocate & copy it later.
|
471
|
+
int sepCnt = 0; // Number of separator characters. (Actually illegal characters, but that's a bonus...)
|
472
|
+
for (int i = 0; i < sLen; i++) // If input is "pure" (I.e. no line separators or illegal chars) base64 this loop can be commented out.
|
473
|
+
if (IA[str.charAt(i)] < 0)
|
474
|
+
sepCnt++;
|
475
|
+
|
476
|
+
// Check so that legal chars (including '=') are evenly divideable by 4 as specified in RFC 2045.
|
477
|
+
if ((sLen - sepCnt) % 4 != 0)
|
478
|
+
return null;
|
479
|
+
|
480
|
+
// Count '=' at end
|
481
|
+
int pad = 0;
|
482
|
+
for (int i = sLen; i > 1 && IA[str.charAt(--i)] <= 0;)
|
483
|
+
if (str.charAt(i) == '=')
|
484
|
+
pad++;
|
485
|
+
|
486
|
+
int len = ((sLen - sepCnt) * 6 >> 3) - pad;
|
487
|
+
|
488
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
489
|
+
|
490
|
+
for (int s = 0, d = 0; d < len;) {
|
491
|
+
// Assemble three bytes into an int from four "valid" characters.
|
492
|
+
int i = 0;
|
493
|
+
for (int j = 0; j < 4; j++) { // j only increased if a valid char was found.
|
494
|
+
int c = IA[str.charAt(s++)];
|
495
|
+
if (c >= 0)
|
496
|
+
i |= c << (18 - j * 6);
|
497
|
+
else
|
498
|
+
j--;
|
499
|
+
}
|
500
|
+
// Add the bytes
|
501
|
+
dArr[d++] = (byte) (i >> 16);
|
502
|
+
if (d < len) {
|
503
|
+
dArr[d++]= (byte) (i >> 8);
|
504
|
+
if (d < len)
|
505
|
+
dArr[d++] = (byte) i;
|
506
|
+
}
|
507
|
+
}
|
508
|
+
return dArr;
|
509
|
+
}
|
510
|
+
|
511
|
+
/** Decodes a BASE64 encoded string that is known to be resonably well formatted. The method is about twice as
|
512
|
+
* fast as {@link #decode(String)}. The preconditions are:<br>
|
513
|
+
* + The array must have a line length of 76 chars OR no line separators at all (one line).<br>
|
514
|
+
* + Line separator must be "\r\n", as specified in RFC 2045
|
515
|
+
* + The array must not contain illegal characters within the encoded string<br>
|
516
|
+
* + The array CAN have illegal characters at the beginning and end, those will be dealt with appropriately.<br>
|
517
|
+
* @param s The source string. Length 0 will return an empty array. <code>null</code> will throw an exception.
|
518
|
+
* @return The decoded array of bytes. May be of length 0.
|
519
|
+
*/
|
520
|
+
public final static byte[] decodeFast(String s)
|
521
|
+
{
|
522
|
+
// Check special case
|
523
|
+
int sLen = s.length();
|
524
|
+
if (sLen == 0)
|
525
|
+
return new byte[0];
|
526
|
+
|
527
|
+
int sIx = 0, eIx = sLen - 1; // Start and end index after trimming.
|
528
|
+
|
529
|
+
// Trim illegal chars from start
|
530
|
+
while (sIx < eIx && IA[s.charAt(sIx) & 0xff] < 0)
|
531
|
+
sIx++;
|
532
|
+
|
533
|
+
// Trim illegal chars from end
|
534
|
+
while (eIx > 0 && IA[s.charAt(eIx) & 0xff] < 0)
|
535
|
+
eIx--;
|
536
|
+
|
537
|
+
// get the padding count (=) (0, 1 or 2)
|
538
|
+
int pad = s.charAt(eIx) == '=' ? (s.charAt(eIx - 1) == '=' ? 2 : 1) : 0; // Count '=' at end.
|
539
|
+
int cCnt = eIx - sIx + 1; // Content count including possible separators
|
540
|
+
int sepCnt = sLen > 76 ? (s.charAt(76) == '\r' ? cCnt / 78 : 0) << 1 : 0;
|
541
|
+
|
542
|
+
int len = ((cCnt - sepCnt) * 6 >> 3) - pad; // The number of decoded bytes
|
543
|
+
byte[] dArr = new byte[len]; // Preallocate byte[] of exact length
|
544
|
+
|
545
|
+
// Decode all but the last 0 - 2 bytes.
|
546
|
+
int d = 0;
|
547
|
+
for (int cc = 0, eLen = (len / 3) * 3; d < eLen;) {
|
548
|
+
// Assemble three bytes into an int from four "valid" characters.
|
549
|
+
int i = IA[s.charAt(sIx++)] << 18 | IA[s.charAt(sIx++)] << 12 | IA[s.charAt(sIx++)] << 6 | IA[s.charAt(sIx++)];
|
550
|
+
|
551
|
+
// Add the bytes
|
552
|
+
dArr[d++] = (byte) (i >> 16);
|
553
|
+
dArr[d++] = (byte) (i >> 8);
|
554
|
+
dArr[d++] = (byte) i;
|
555
|
+
|
556
|
+
// If line separator, jump over it.
|
557
|
+
if (sepCnt > 0 && ++cc == 19) {
|
558
|
+
sIx += 2;
|
559
|
+
cc = 0;
|
560
|
+
}
|
561
|
+
}
|
562
|
+
|
563
|
+
if (d < len) {
|
564
|
+
// Decode last 1-3 bytes (incl '=') into 1-3 bytes
|
565
|
+
int i = 0;
|
566
|
+
for (int j = 0; sIx <= eIx - pad; j++)
|
567
|
+
i |= IA[s.charAt(sIx++)] << (18 - j * 6);
|
568
|
+
|
569
|
+
for (int r = 16; d < len; r -= 8)
|
570
|
+
dArr[d++] = (byte) (i >> r);
|
571
|
+
}
|
572
|
+
|
573
|
+
return dArr;
|
574
|
+
}
|
575
|
+
}
|
@@ -0,0 +1,83 @@
|
|
1
|
+
package com.rhomobile.rhodes;
|
2
|
+
|
3
|
+
import android.app.Activity;
|
4
|
+
import android.app.Application;
|
5
|
+
import android.content.ComponentName;
|
6
|
+
import android.content.Context;
|
7
|
+
import android.content.Intent;
|
8
|
+
import android.content.ServiceConnection;
|
9
|
+
import android.content.res.Configuration;
|
10
|
+
import android.os.Bundle;
|
11
|
+
import android.os.IBinder;
|
12
|
+
import android.util.Log;
|
13
|
+
|
14
|
+
public class BaseActivity extends Activity implements ServiceConnection {
|
15
|
+
|
16
|
+
private static final String TAG = BaseActivity.class.getName();
|
17
|
+
|
18
|
+
private static final boolean DEBUG = false;
|
19
|
+
|
20
|
+
protected RhodesService mRhodesService;
|
21
|
+
private boolean mBoundToService;
|
22
|
+
|
23
|
+
@Override
|
24
|
+
protected void onCreate(Bundle savedInstanceState) {
|
25
|
+
super.onCreate(savedInstanceState);
|
26
|
+
|
27
|
+
Intent intent = new Intent(this, RhodesService.class);
|
28
|
+
ComponentName serviceName = startService(intent);
|
29
|
+
if (serviceName == null)
|
30
|
+
throw new RuntimeException("Can not start Rhodes service");
|
31
|
+
bindService(intent, this, Context.BIND_AUTO_CREATE);
|
32
|
+
mBoundToService = true;
|
33
|
+
}
|
34
|
+
|
35
|
+
@Override
|
36
|
+
protected void onDestroy() {
|
37
|
+
if (mBoundToService) {
|
38
|
+
unbindService(this);
|
39
|
+
mBoundToService = false;
|
40
|
+
}
|
41
|
+
super.onDestroy();
|
42
|
+
}
|
43
|
+
|
44
|
+
@Override
|
45
|
+
protected void onStart() {
|
46
|
+
super.onStart();
|
47
|
+
RhodesService.activityStarted();
|
48
|
+
}
|
49
|
+
|
50
|
+
@Override
|
51
|
+
protected void onStop() {
|
52
|
+
RhodesService.activityStopped();
|
53
|
+
super.onStop();
|
54
|
+
}
|
55
|
+
|
56
|
+
@Override
|
57
|
+
public void onConfigurationChanged(Configuration newConfig) {
|
58
|
+
Logger.T(TAG, "+++ onConfigurationChanged");
|
59
|
+
super.onConfigurationChanged(newConfig);
|
60
|
+
RhodesService.getInstance().rereadScreenProperties();
|
61
|
+
}
|
62
|
+
|
63
|
+
public RhodesApplication getRhodesApplication() {
|
64
|
+
Application app = super.getApplication();
|
65
|
+
if (DEBUG)
|
66
|
+
Log.d(TAG, "getApplication: " + app);
|
67
|
+
return (RhodesApplication)app;
|
68
|
+
}
|
69
|
+
|
70
|
+
@Override
|
71
|
+
public void onServiceConnected(ComponentName name, IBinder service) {
|
72
|
+
mRhodesService = ((RhodesService.LocalBinder)service).getService();
|
73
|
+
if (DEBUG)
|
74
|
+
Log.d(TAG, "Connected to service: " + mRhodesService);
|
75
|
+
}
|
76
|
+
|
77
|
+
@Override
|
78
|
+
public void onServiceDisconnected(ComponentName name) {
|
79
|
+
if (DEBUG)
|
80
|
+
Log.d(TAG, "Disconnected from service: " + mRhodesService);
|
81
|
+
mRhodesService = null;
|
82
|
+
}
|
83
|
+
}
|