rhodes 3.4.2 → 3.5.1.12
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +9 -0
- data/Rakefile +61 -9
- data/doc/build.txt +147 -38
- data/doc/configuration.txt +49 -33
- data/doc/connect-to-web-services.txt +32 -32
- data/doc/contributing.txt +1 -1
- data/doc/device-caps.txt +62 -311
- data/doc/extensions.txt +104 -5
- data/doc/install.txt +17 -61
- data/doc/linea.txt +11 -11
- data/doc/nfc.txt +3 -3
- data/doc/release.txt +4 -4
- data/doc/rhom.txt +7 -7
- data/doc/rhostudio-test-plan.txt +12 -12
- data/doc/simulator.txt +32 -19
- data/doc/syncengine-ajax-api.txt +1 -1
- data/doc/synchronization.txt +8 -2
- data/doc/test-log-debug.txt +34 -3
- data/doc/ui.txt +8 -3
- data/installer/icon.ico +0 -0
- data/lib/build/jake.rb +27 -6
- data/lib/extensions/audiocapture/audiocapture.rb +43 -0
- data/lib/extensions/audiocapture/ext.yml +5 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/AndroidManifest.xml +10 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/Rakefile +77 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/ext_build.files +2 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/jni/src/audiocapture.cpp +189 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/src/com/audiocapture/Audiocapture.java +236 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/src/com/audiocapture/ExtAudioRecorder.java +573 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/Audiocapture.files +1 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/Rakefile +97 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/audiocapture.jdp +48 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/src/com/audiocapture/Audiocapture.java +118 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Audiocapture.xcodeproj/project.pbxproj +314 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Audiocapture_Prefix.pch +7 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Classes/audioCapture.h +51 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Classes/audioCapture.m +418 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Rakefile +79 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.sln +44 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.vcproj +647 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.vsprops +15 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Rakefile +62 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/src/audiocapture_wm.cpp +40 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/src/audiocapture_wm.h +2 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/ruby/audiocapture.i +29 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/ruby/audiocapture_wrap.c +2310 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/src/audiocapture.c +26 -0
- data/lib/extensions/audiocapture/ext/build +17 -0
- data/lib/extensions/audiocapture/ext/build.bat +36 -0
- data/lib/extensions/barcode/ext.yml +5 -3
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +87 -87
- data/lib/extensions/digest-md5/ext/build +1 -1
- data/lib/extensions/digest-sha1/ext/build +1 -1
- data/lib/extensions/digest-sha2/ext/build +1 -1
- data/lib/extensions/digest/ext/build +1 -1
- data/lib/extensions/fcntl/ext/fcntl.c +5 -5
- data/lib/extensions/gcm-push/ext.yml +8 -0
- data/lib/extensions/gcm-push/ext/android/AndroidManifest.rb +5 -0
- data/lib/extensions/gcm-push/ext/android/ApplicationManifestAdds.erb +8 -0
- data/lib/extensions/gcm-push/ext/android/Rakefile +66 -0
- data/lib/extensions/gcm-push/ext/android/ext_build.files +3 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/com_rhomobile_rhodes_gcm_GCMRhoListener.h +21 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.cpp +173 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.h +62 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMBroadcastReceiver.java +40 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMFacade.java +55 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMIntentService.java +60 -0
- data/lib/extensions/gcm-push/ext/build +12 -0
- data/lib/extensions/gcm-push/ext/build.bat +8 -0
- data/lib/extensions/net-http/net/http.rb +153 -119
- data/lib/extensions/net-http/net/https.rb +4 -38
- data/lib/extensions/nfc/ext.yml +6 -4
- data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp +2 -2
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java +0 -1
- data/lib/extensions/openssl/openssl/ssl-internal.rb +3 -1
- data/lib/extensions/rawsensors/ext.yml +4 -0
- data/lib/extensions/rawsensors/ext/build +17 -0
- data/lib/extensions/rawsensors/ext/build.bat +36 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/Rakefile +77 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/ext_build.files +1 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/jni/src/rawsensors.cpp +180 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/src/com/rawsensors/Rawsensors.java +355 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/Rakefile +97 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/Rawsensors.files +1 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/rawsensors.jdp +48 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/src/com/rawsensors/Rawsensors.java +118 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Classes/RawSensors.h +66 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Classes/RawSensors.m +351 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rakefile +79 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rawsensors.xcodeproj/project.pbxproj +316 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rawsensors_Prefix.pch +7 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rakefile +62 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.sln +44 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.vcproj +647 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.vsprops +15 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/src/rawsensors_wm.cpp +40 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/src/rawsensors_wm.h +2 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/ruby/rawsensors.i +22 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/ruby/rawsensors_wrap.c +2308 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/src/rawsensors.c +25 -0
- data/lib/extensions/rawsensors/rawsensors.rb +36 -0
- data/lib/framework/autocomplete/AddressBar.rb +19 -0
- data/lib/framework/autocomplete/Alarm.rb +23 -0
- data/lib/framework/autocomplete/Alert.rb +19 -0
- data/lib/framework/autocomplete/AppApplication.rb +17 -0
- data/lib/framework/autocomplete/AppSwitcher.rb +13 -0
- data/lib/framework/autocomplete/Application.rb +23 -0
- data/lib/framework/autocomplete/AudioCapture.rb +31 -0
- data/lib/framework/autocomplete/BackButton.rb +25 -0
- data/lib/framework/autocomplete/Backlight.rb +21 -0
- data/lib/framework/autocomplete/Barcode.rb +29 -0
- data/lib/framework/autocomplete/BasicSocket.rb +87 -0
- data/lib/framework/autocomplete/Battery.rb +33 -0
- data/lib/framework/autocomplete/BottomCommandArea.rb +19 -0
- data/lib/framework/autocomplete/BrowserHelper.rb +19 -0
- data/lib/framework/autocomplete/Bsearch.rb +11 -0
- data/lib/framework/autocomplete/Camera.rb +17 -0
- data/lib/framework/autocomplete/CardReader.rb +29 -0
- data/lib/framework/autocomplete/Comm.rb +45 -0
- data/lib/framework/autocomplete/Cradle.rb +15 -0
- data/lib/framework/autocomplete/Date.rb +50 -0
- data/lib/framework/autocomplete/DateTime.rb +24 -0
- data/lib/framework/autocomplete/DateTimePicker.rb +15 -0
- data/lib/framework/autocomplete/Device.rb +19 -0
- data/lib/framework/autocomplete/Digest.rb +28 -0
- data/lib/framework/autocomplete/Dir.rb +63 -0
- data/lib/framework/autocomplete/Eink.rb +19 -0
- data/lib/framework/autocomplete/EmmlProfile.rb +19 -0
- data/lib/framework/autocomplete/File.rb +301 -0
- data/lib/framework/autocomplete/FileTransfer.rb +27 -0
- data/lib/framework/autocomplete/ForwardButton.rb +25 -0
- data/lib/framework/autocomplete/GeneratorController.rb +15 -0
- data/lib/framework/autocomplete/GeoLocation.rb +27 -0
- data/lib/framework/autocomplete/Gesture.rb +71 -0
- data/lib/framework/autocomplete/GoButton.rb +25 -0
- data/lib/framework/autocomplete/HashWithIndifferentAccess.rb +51 -0
- data/lib/framework/autocomplete/History.rb +11 -0
- data/lib/framework/autocomplete/HomeButton.rb +25 -0
- data/lib/framework/autocomplete/Hourglass.rb +17 -0
- data/lib/framework/autocomplete/IPSocket.rb +65 -0
- data/lib/framework/autocomplete/Imager.rb +53 -0
- data/lib/framework/autocomplete/IoAnalog.rb +73 -0
- data/lib/framework/autocomplete/IoDigital.rb +93 -0
- data/lib/framework/autocomplete/IoSystem.rb +21 -0
- data/lib/framework/autocomplete/JSON.rb +142 -0
- data/lib/framework/autocomplete/KeyCapture.rb +25 -0
- data/lib/framework/autocomplete/KeyState.rb +23 -0
- data/lib/framework/autocomplete/Keylight.rb +17 -0
- data/lib/framework/autocomplete/Lightsensor.rb +19 -0
- data/lib/framework/autocomplete/LocalizationSimplified.rb +33 -0
- data/lib/framework/autocomplete/MapView.rb +23 -0
- data/lib/framework/autocomplete/MediaPlayer.rb +19 -0
- data/lib/framework/autocomplete/Memory.rb +17 -0
- data/lib/framework/autocomplete/MinimizeButton.rb +25 -0
- data/lib/framework/autocomplete/NativeBar.rb +31 -0
- data/lib/framework/autocomplete/NavBar.rb +15 -0
- data/lib/framework/autocomplete/Network.rb +31 -0
- data/lib/framework/autocomplete/Notification.rb +35 -0
- data/lib/framework/autocomplete/OpenSSL.rb +440 -0
- data/lib/framework/autocomplete/Phonebook.rb +39 -0
- data/lib/framework/autocomplete/PowerOn.rb +13 -0
- data/lib/framework/autocomplete/Push.rb +27 -0
- data/lib/framework/autocomplete/QuitButton.rb +25 -0
- data/lib/framework/autocomplete/RHO_APPS_DIR.rb +8 -0
- data/lib/framework/autocomplete/RHO_ERB_EXT.rb +8 -0
- data/lib/framework/autocomplete/RHO_FRAMEWORK.rb +0 -0
- data/lib/framework/autocomplete/RHO_RB_EXT.rb +8 -0
- data/lib/framework/autocomplete/RawSensors.rb +53 -0
- data/lib/framework/autocomplete/Reboot.rb +13 -0
- data/lib/framework/autocomplete/Registry.rb +25 -0
- data/lib/framework/autocomplete/ReloadButton.rb +25 -0
- data/lib/framework/autocomplete/Rfid.rb +173 -0
- data/lib/framework/autocomplete/Rho.rb +496 -0
- data/lib/framework/autocomplete/RhoBluetooth.rb +41 -0
- data/lib/framework/autocomplete/RhoConf.rb +23 -0
- data/lib/framework/autocomplete/RhoElementsExt.rb +11 -0
- data/lib/framework/autocomplete/RhoLog.rb +13 -0
- data/lib/framework/autocomplete/RhoProfiler.rb +21 -0
- data/lib/framework/autocomplete/RhoStdout.rb +19 -0
- data/lib/framework/autocomplete/Rhodes.rb +13 -0
- data/lib/framework/autocomplete/RhodesNativeViewManager.rb +15 -0
- data/lib/framework/autocomplete/Rhom.rb +198 -0
- data/lib/framework/autocomplete/Rsm.rb +135 -0
- data/lib/framework/autocomplete/SQLite3.rb +36 -0
- data/lib/framework/autocomplete/SWIG.rb +24 -0
- data/lib/framework/autocomplete/ScanError.rb +9 -0
- data/lib/framework/autocomplete/Scanner.rb +379 -0
- data/lib/framework/autocomplete/ScreenOrientation.rb +23 -0
- data/lib/framework/autocomplete/SignatureCapture.rb +47 -0
- data/lib/framework/autocomplete/SignatureTool.rb +11 -0
- data/lib/framework/autocomplete/Sip.rb +19 -0
- data/lib/framework/autocomplete/SipButton.rb +25 -0
- data/lib/framework/autocomplete/Sntp.rb +13 -0
- data/lib/framework/autocomplete/Socket.rb +356 -0
- data/lib/framework/autocomplete/SocketError.rb +9 -0
- data/lib/framework/autocomplete/StopButton.rb +25 -0
- data/lib/framework/autocomplete/StringIO.rb +139 -0
- data/lib/framework/autocomplete/StringScanner.rb +102 -0
- data/lib/framework/autocomplete/Stylus.rb +15 -0
- data/lib/framework/autocomplete/SyncEngine.rb +77 -0
- data/lib/framework/autocomplete/System.rb +79 -0
- data/lib/framework/autocomplete/SystemTime.rb +17 -0
- data/lib/framework/autocomplete/TCPServer.rb +65 -0
- data/lib/framework/autocomplete/TCPSocket.rb +59 -0
- data/lib/framework/autocomplete/Telemetry.rb +23 -0
- data/lib/framework/autocomplete/Thread.rb +85 -0
- data/lib/framework/autocomplete/Time.rb +167 -0
- data/lib/framework/autocomplete/Timer.rb +19 -0
- data/lib/framework/autocomplete/TopCommandArea.rb +19 -0
- data/lib/framework/autocomplete/UDPSocket.rb +65 -0
- data/lib/framework/autocomplete/VideoCapture.rb +29 -0
- data/lib/framework/autocomplete/Volume.rb +13 -0
- data/lib/framework/autocomplete/Wake.rb +15 -0
- data/lib/framework/autocomplete/WebView.rb +31 -0
- data/lib/framework/autocomplete/Wlan.rb +87 -0
- data/lib/framework/autocomplete/Zoom.rb +15 -0
- data/lib/framework/autocomplete/ZoomInPageButton.rb +25 -0
- data/lib/framework/autocomplete/ZoomOutPageButton.rb +25 -0
- data/lib/framework/autocomplete/ZoomTextButton.rb +25 -0
- data/lib/framework/rho/render.rb +15 -4
- data/lib/framework/rho/rho.rb +17 -8
- data/lib/framework/rho/rhoapplication.rb +25 -3
- data/lib/framework/rho/rhocontact.rb +13 -0
- data/lib/framework/rho/rhoevent.rb +15 -0
- data/lib/framework/rho/rhonativeviewmanager.rb +3 -3
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rhom/rhom.rb +5 -0
- data/lib/framework/rhomotoapi.rb +2 -1
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +4 -3
- data/platform/android/Rhodes/AndroidManifest.xml.erb +7 -7
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +22 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +1 -9
- data/platform/android/Rhodes/jni/src/callbacks.cpp +2 -0
- data/platform/android/Rhodes/jni/src/camera.cpp +5 -0
- data/platform/android/Rhodes/jni/src/event.cpp +10 -0
- data/platform/android/Rhodes/jni/src/geolocation.cpp +10 -0
- data/platform/android/Rhodes/jni/src/logger.cpp +3 -1
- data/platform/android/Rhodes/jni/src/phonebook.cpp +11 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +1 -1
- data/platform/android/Rhodes/jni/src/rhodesapp.cpp +41 -25
- data/platform/android/Rhodes/jni/src/signature.cpp +7 -6
- data/platform/android/Rhodes/jni/src/webview.cpp +29 -0
- data/platform/android/Rhodes/project.properties +1 -1
- data/platform/android/Rhodes/res/drawable/icon.png +0 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ConnectionChangeReceiver.java +28 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushContract.java +102 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +20 -56
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +9 -124
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +114 -126
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java +3 -5
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +31 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +2 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +3 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProvider.java +19 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderFroyo.java +5 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderICS.java +22 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +32 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java +5 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoListener.java +34 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java +11 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{webview → extmanager}/IRhoWebView.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java +605 -492
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +16 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +9 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +43 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SplashScreen.java +82 -64
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +28 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +4 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java +4 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java +7 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality12.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality13.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality14.java +12 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java +10 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +3 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java +43 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebChromeClient.java +5 -0
- data/platform/android/build/RhodesSRC_build.files +10 -4
- data/platform/android/build/android.rake +46 -193
- data/platform/android/build/android_tools.rb +181 -13
- data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java +3 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +4 -2
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -0
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +6 -0
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +13 -8
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +103 -1
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +18 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +9 -2
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +16 -11
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +25 -3
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +122 -32
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +44 -14
- data/platform/bb/RubyVM/src/com/rho/sync/SyncProtocol_3.java +3 -2
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +340 -88
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +62 -15
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/AttrReader.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFixnum.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyHash.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +19 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBasic.java +9 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBinding.java +4 -4
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyModule.java +13 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyObject.java +16 -1
- data/platform/bb/build/bb.rake +3 -1
- data/platform/bb/build/rhodes_build.files +0 -1
- data/platform/bb/rhodes/platform/4.7/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +13 -3
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/platform/common/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/resources/icon.png +0 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +10 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +13 -3
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +5 -0
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +6 -1
- data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java +6 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +38 -9
- data/platform/bb/rhodes/src/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +16 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +0 -20
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +1 -10
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +40 -35
- data/platform/iphone/Classes/AppManager/AppManager.h +1 -1
- data/platform/iphone/Classes/AppManager/AppManager.m +46 -29
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +9 -0
- data/platform/iphone/Classes/Event/Event.h +6 -1
- data/platform/iphone/Classes/Event/Event.m +67 -1
- data/platform/iphone/Classes/GeoLocation/LocationController.h +2 -1
- data/platform/iphone/Classes/GeoLocation/LocationController.m +17 -1
- data/platform/iphone/Classes/NetworkStatusMonitor.h +17 -0
- data/platform/iphone/Classes/NetworkStatusMonitor.mm +58 -0
- data/platform/iphone/Classes/Phonebook/phonebook.h +6 -0
- data/platform/iphone/Classes/Phonebook/phonebook.m +62 -6
- data/platform/iphone/Classes/Reachability.h +31 -0
- data/platform/iphone/Classes/Reachability.m +223 -0
- data/platform/iphone/Classes/RhoMainView.h +1 -0
- data/platform/iphone/Classes/RhoViewController.m +16 -0
- data/platform/iphone/Classes/Rhodes.h +2 -0
- data/platform/iphone/Classes/Rhodes.m +89 -10
- data/platform/iphone/Classes/Signature/SignatureDelegate.m +4 -7
- data/platform/iphone/Classes/SimpleMainView.m +16 -0
- data/platform/iphone/Classes/SplashViewController.m +11 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +6 -0
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +5 -0
- data/platform/iphone/Classes/TabbedMainView.m +4 -0
- data/platform/iphone/Classes/WebView.m +14 -0
- data/platform/iphone/Info.plist +1 -6
- data/platform/iphone/iTunesArtwork.jpg +0 -0
- data/platform/iphone/icon.png +0 -0
- data/platform/iphone/icon114.png +0 -0
- data/platform/iphone/icon57.png +0 -0
- data/platform/iphone/icon72.png +0 -0
- data/platform/iphone/rbuild/iphone.rake +8 -11
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +20 -4
- data/platform/osx/Rhodes Launcher/rhorunner.app/icon.png +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +1 -1
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqcorewlanbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtga.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_inspector.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_tcp.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/rho.icns +0 -0
- data/platform/shared/common/ExtManager.h +8 -0
- data/platform/shared/common/RhoDefs.h +3 -2
- data/platform/shared/common/RhoFile.cpp +14 -1
- data/platform/shared/common/RhoMutexLock.h +4 -0
- data/platform/shared/common/RhoPort.h +5 -1
- data/platform/shared/common/RhoStd.h +12 -0
- data/platform/shared/common/RhoThread.cpp +1 -2
- data/platform/shared/common/RhoTime.h +4 -0
- data/platform/shared/common/RhodesApp.cpp +189 -65
- data/platform/shared/common/RhodesApp.h +60 -7
- data/platform/shared/common/RhodesAppBase.cpp +2 -8
- data/platform/shared/common/RhodesAppBase.h +1 -0
- data/platform/shared/common/ThreadQueue.cpp +2 -2
- data/platform/shared/common/app_build_configs.c +3 -1
- data/platform/shared/common/map/MapEngine.cpp +39 -3
- data/platform/shared/common/push/IRhoPushClient.h +3 -3
- data/platform/shared/common/push/RhoPushManager.cpp +31 -53
- data/platform/shared/common/push/RhoPushManager.h +12 -26
- data/platform/shared/curl/lib/curl_config.h +1 -1
- data/platform/shared/json/RJSONTokener.c +3 -1
- data/platform/shared/json/config.h +4 -4
- data/platform/shared/json/json_tokener.c +1 -1
- data/platform/shared/logging/RhoLog.cpp +5 -5
- data/platform/shared/logging/RhoLogConf.cpp +4 -6
- data/platform/shared/logging/RhoLogConf.h +2 -2
- data/platform/shared/logging/RhoLogSink.cpp +2 -0
- data/platform/shared/net/HttpServer.cpp +54 -7
- data/platform/shared/net/HttpServer.h +2 -0
- data/platform/shared/qt/rhodes/QtMainWindow.cpp +22 -0
- data/platform/shared/qt/rhodes/QtMainWindow.h +1 -0
- data/platform/shared/qt/rhodes/impl/CalendarImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/CameraImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/GeoLocationImpl.cpp +6 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp +7 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.h +2 -0
- data/platform/shared/qt/rhodes/impl/PhonebookImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +5 -0
- data/platform/shared/qt/rhodes/impl/WebViewImpl.cpp +12 -0
- data/platform/shared/qt/rhodes/main.cpp +0 -7
- data/platform/shared/qt/rhodes/resources/rho.icns +0 -0
- data/platform/shared/qt/rhodes/resources/rho.ico +0 -0
- data/platform/shared/qt/rhodes/resources/rho.png +0 -0
- data/platform/shared/ruby/encoding.c +4 -0
- data/platform/shared/ruby/ext/calendar/calendar.i +3 -0
- data/platform/shared/ruby/ext/calendar/calendar_wrap.c +19 -0
- data/platform/shared/ruby/ext/camera/camera.i +2 -0
- data/platform/shared/ruby/ext/camera/camera_wrap.c +43 -2
- data/platform/shared/ruby/ext/geolocation/geolocation.i +4 -0
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +24 -4
- data/platform/shared/ruby/ext/phonebook/phonebook.i +4 -0
- data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +44 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -2
- data/platform/shared/ruby/ext/rho/rhoruby.c +2 -0
- data/platform/shared/ruby/ext/rho/rhosupport.c +8 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +1 -1
- data/platform/shared/ruby/ext/syncengine/syncengine.i +6 -2
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +19 -6
- data/platform/shared/ruby/ext/system/system.i +22 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +158 -86
- data/platform/shared/ruby/ext/webview/webview.i +13 -8
- data/platform/shared/ruby/ext/webview/webview_wrap.c +88 -2
- data/platform/shared/ruby/include/ruby/win32.h +3 -1
- data/platform/shared/ruby/iphone/ruby/config.h +3 -3
- data/platform/shared/ruby/missing/hypot.c +4 -0
- data/platform/shared/ruby/random.c +6 -2
- data/platform/shared/ruby/thread_win32.c +8 -3
- data/platform/shared/ruby/win32/ruby/config.h +0 -3
- data/platform/shared/ruby/win32/win32.c +4 -0
- data/platform/shared/ruby/wp8/assert.c +12 -0
- data/platform/shared/ruby/wp8/assert.h +18 -0
- data/platform/shared/ruby/wp8/errno.c +11 -0
- data/platform/shared/ruby/wp8/errno.h +59 -0
- data/platform/shared/ruby/wp8/missing_wp8.h +74 -0
- data/platform/shared/ruby/wp8/signal.h +71 -0
- data/platform/shared/ruby/wp8/signal_wp8.c +26 -0
- data/platform/shared/ruby/wp8/stdio.c +36 -0
- data/platform/shared/ruby/wp8/stdlib.c +61 -0
- data/platform/shared/ruby/wp8/string_wp8.c +89 -0
- data/platform/shared/ruby/wp8/sys/stat.c +183 -0
- data/platform/shared/ruby/wp8/sys/stat.h +70 -0
- data/platform/shared/ruby/wp8/sys/timeb.c +31 -0
- data/platform/shared/ruby/wp8/sys/timeb.h +27 -0
- data/platform/shared/ruby/wp8/sys/types.h +62 -0
- data/platform/shared/ruby/wp8/sys/utime.c +44 -0
- data/platform/shared/ruby/wp8/sys/utime.h +27 -0
- data/platform/shared/ruby/wp8/time_wp8.c +256 -0
- data/platform/shared/ruby/wp8/varargs.h +34 -0
- data/platform/shared/ruby/wp8/win32/win32.c +5783 -0
- data/platform/shared/ruby/wp8/winsock_wp8.c +26 -0
- data/platform/shared/ruby/wp8/winsock_wp8.h +23 -0
- data/platform/shared/ruby/wp8/wp8.c +516 -0
- data/platform/shared/ruby/wp8/wp8.h +274 -0
- data/platform/shared/ruby/wp8/wp8main.c +18 -0
- data/platform/shared/rubyext/GeoLocation.cpp +1 -1
- data/platform/shared/rubyext/System.cpp +18 -4
- data/platform/shared/rubyext/ZipFiles.cpp +1 -1
- data/platform/shared/sync/ClientRegister.cpp +113 -23
- data/platform/shared/sync/ClientRegister.h +27 -16
- data/platform/shared/sync/ILoginListener.h +44 -0
- data/platform/shared/sync/SyncEngine.cpp +50 -24
- data/platform/shared/sync/SyncEngine.h +11 -5
- data/platform/shared/sync/SyncSource.cpp +87 -61
- data/platform/shared/sync/SyncSource.h +6 -3
- data/platform/shared/sync/SyncThread.cpp +8 -15
- data/platform/shared/sync/SyncThread.h +13 -7
- data/platform/shared/unzip/unzip.cpp +1 -1
- data/platform/shared/unzip/zip.h +8 -1
- data/platform/shared/xruby/src/com/xruby/runtime/builtin/AttrReader.java +13 -0
- data/platform/shared/xruby/src/com/xruby/runtime/builtin/RubyFixnum.java +3 -1
- data/platform/shared/xruby/src/com/xruby/runtime/lang/MethodBlockBase.java +9 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyBasic.java +9 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyBinding.java +17 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyMethod.java +22 -2
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyModule.java +25 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyObject.java +21 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyValue.java +8 -0
- data/platform/symbian/rhodes/src/phonebook/ruby_phonebook.cpp +6 -0
- data/platform/win32/RhoSimulator/Microsoft.VC90.CRT.manifest +12 -5
- data/platform/win32/RhoSimulator/Microsoft.VC90.OpenMP.manifest +12 -5
- data/platform/win32/RhoSimulator/QtCore4.dll +0 -0
- data/platform/win32/RhoSimulator/QtGui4.dll +0 -0
- data/platform/win32/RhoSimulator/QtNetwork4.dll +0 -0
- data/platform/win32/RhoSimulator/QtWebKit4.dll +0 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/RhoSimulator/imageformats/qgif4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qico4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qjpeg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qmng4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qsvg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qtiff4.dll +0 -0
- data/platform/win32/RhoSimulator/msvcm90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcp90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcr90.dll +0 -0
- data/platform/win32/RhoSimulator/phonon4.dll +0 -0
- data/platform/win32/RhoSimulator/vcomp90.dll +0 -0
- data/platform/wm/build/wm.rake +67 -22
- data/platform/wm/rhodes.sln +485 -493
- data/platform/wm/rhodes/IEBrowserEngine.cpp +2 -6
- data/platform/wm/rhodes/MainWindow.cpp +86 -35
- data/platform/wm/rhodes/MainWindow.h +33 -0
- data/platform/wm/rhodes/Rhodes.cpp +288 -215
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +22 -17
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +3 -3
- data/platform/wm/rhodes/camera/Camera.cpp +4 -0
- data/platform/wm/rhodes/camera/Camera.h +1 -0
- data/platform/wm/rhodes/phonebook/phonebook.cpp +9 -0
- data/platform/wm/rhodes/phonebook/phonebook.h +2 -0
- data/platform/wm/rhodes/resources/icon.ico +0 -0
- data/platform/wm/rhodes/rho/common/ExtManager.cpp +5 -1
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +1 -11
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +5 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +21 -2
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +12 -0
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +9 -0
- data/platform/wm/rhodes/rhodes.vcproj +60 -60
- data/platform/wm/rhodes/simulator/MainWindowQt.cpp +91 -6
- data/platform/wm/rhodes/simulator/MainWindowQt.h +6 -0
- data/platform/wm/rhoelements.sln +624 -623
- data/platform/wm/tcmalloc/tcmalloc.vcproj +1230 -1070
- data/platform/wp7/RhoRubyLib/rubyext/RhoCamera.cs +6 -3
- data/platform/wp7/rhodes/Properties/WMAppManifest.xml +5 -0
- data/platform/wp7/rhodes/icon.png +0 -0
- data/platform/wp8/RhoAppRunner/Program.cs +99 -0
- data/platform/wp8/RhoAppRunner/Properties/AssemblyInfo.cs +36 -0
- data/platform/wp8/RhoAppRunner/RhoAppRunner.csproj +69 -0
- data/platform/wp8/build/wp.rake +486 -0
- data/platform/wp8/rhodes.sln +154 -0
- data/platform/wp8/rhodes/App.xaml +20 -0
- data/platform/wp8/rhodes/App.xaml.cs +189 -0
- data/platform/wp8/rhodes/Assets/ApplicationIcon.png +0 -0
- data/platform/wp8/rhodes/Assets/Tiles/FlipCycleTileMedium.png +0 -0
- data/platform/wp8/rhodes/Assets/Tiles/FlipCycleTileSmall.png +0 -0
- data/platform/wp8/rhodes/LocalizedStrings.cs +37 -0
- data/platform/wp8/rhodes/MainPage.xaml +21 -0
- data/platform/wp8/rhodes/MainPage.xaml.cs +339 -0
- data/platform/wp8/rhodes/Properties/AppManifest.xml +6 -0
- data/platform/wp8/rhodes/Properties/AssemblyInfo.cs +37 -0
- data/platform/wp8/rhodes/Properties/WMAppManifest.xml +47 -0
- data/platform/wp8/rhodes/Resources/AppResources.Designer.cs +127 -0
- data/platform/wp8/rhodes/Resources/AppResources.resx +135 -0
- data/platform/wp8/rhodes/common/IInputStream.cs +47 -0
- data/platform/wp8/rhodes/common/RhoFile.cs +374 -0
- data/platform/wp8/rhodes/common/RhoFilePath.cs +115 -0
- data/platform/wp8/rhodes/common/RhoResourceMap.cs +92 -0
- data/platform/wp8/rhodes/common/RhoStd.cs +237 -0
- data/platform/wp8/rhodes/icon.png +0 -0
- data/platform/wp8/rhodes/rhodes.csproj +198 -0
- data/platform/wp8/rholib/rholib.vcxproj +240 -0
- data/platform/wp8/rholib/rholib.vcxproj.filters +289 -0
- data/platform/wp8/rhoruntime/FakeDefs.cpp +134 -0
- data/platform/wp8/rhoruntime/common/ExtManager.cpp +449 -0
- data/platform/wp8/rhoruntime/common/RhoClassFactory.cpp +58 -0
- data/platform/wp8/rhoruntime/common/RhoClassFactory.h +60 -0
- data/platform/wp8/rhoruntime/common/RhoCryptImpl.cpp +274 -0
- data/platform/wp8/rhoruntime/common/RhoCryptImpl.h +78 -0
- data/platform/wp8/rhoruntime/common/RhoThreadImpl.cpp +109 -0
- data/platform/wp8/rhoruntime/common/RhoThreadImpl.h +56 -0
- data/platform/wp8/rhoruntime/pch_rhoruntime.cpp +27 -0
- data/platform/wp8/rhoruntime/pch_rhoruntime.h +30 -0
- data/platform/wp8/rhoruntime/rhoruntime.cpp +93 -0
- data/platform/wp8/rhoruntime/rhoruntime.h +114 -0
- data/platform/wp8/rhoruntime/rhoruntime.vcxproj +175 -0
- data/platform/wp8/rhoruntime/rhoruntime.vcxproj.filters +44 -0
- data/platform/wp8/rubylib/file.c +5459 -0
- data/platform/wp8/rubylib/rubylib.vcxproj +286 -0
- data/platform/wp8/rubylib/rubylib.vcxproj.filters +307 -0
- data/platform/wp8/sqlite3/crypto.c +933 -0
- data/platform/wp8/sqlite3/sqlite3.c +136332 -0
- data/platform/wp8/sqlite3/sqlite3.vcxproj +149 -0
- data/platform/wp8/sqlite3/sqlite3.vcxproj.filters +16 -0
- data/platform/wp8/syncengine/syncengine.vcxproj +199 -0
- data/platform/wp8/syncengine/syncengine.vcxproj.filters +155 -0
- data/rakefile.rb +61 -9
- data/res/build-tools/RhoAppRunnerWP8.exe +0 -0
- data/res/build-tools/license_rc.dll +0 -0
- data/res/build-tools/win32/license_rc.dll +0 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/rhogen.rb +36 -0
- data/res/generators/templates/application/app/loading-568h@2x.png +0 -0
- data/res/generators/templates/application/app/loading-Landscape.png +0 -0
- data/res/generators/templates/application/app/loading-LandscapeLeft.png +0 -0
- data/res/generators/templates/application/app/loading-LandscapeRight.png +0 -0
- data/res/generators/templates/application/app/loading-Portrait.png +0 -0
- data/res/generators/templates/application/app/loading-PortraitUpsideDown.png +0 -0
- data/res/generators/templates/application/app/loading.png +0 -0
- data/res/generators/templates/application/app/loading@2x.png +0 -0
- data/res/generators/templates/application/icon/icon.ico +0 -0
- data/res/generators/templates/application/icon/icon.png +0 -0
- data/res/generators/templates/application/icon/icon114.png +0 -0
- data/res/generators/templates/application/icon/icon57.png +0 -0
- data/res/generators/templates/application/icon/icon72.png +0 -0
- data/res/generators/templates/application/public/css/android.css +1 -1
- data/res/generators/templates/application/public/jqmobile/images/icon-search-black.png +0 -0
- data/res/generators/templates/application/rhoconfig.txt +3 -1
- data/res/generators/templates/model/model.rb +1 -1
- data/res/icons/rho.icns +0 -0
- data/res/icons/rho.ico +0 -0
- data/res/icons/rho.png +0 -0
- data/res/icons/rhodes.icns +0 -0
- data/res/icons/rhodes.ico +0 -0
- data/res/icons/rhodes.png +0 -0
- data/res/icons/rhosim.icns +0 -0
- data/res/icons/rhosim.ico +0 -0
- data/res/icons/rhosim.png +0 -0
- data/res/libs/motorolalicence/android/MotorolaLicence.h +2 -1
- data/res/libs/motorolalicence/android/libMotorolaLicence.a +0 -0
- data/res/libs/motorolalicence/iphone/MotorolaLicence.h +2 -1
- data/res/libs/motorolalicence/iphone/libMotorolaLicence.a +0 -0
- data/spec/autocomplete_generator/Rakefile +37 -0
- data/spec/autocomplete_generator/app/Generator/controller.rb +40 -0
- data/spec/autocomplete_generator/app/Generator/generator.rb +236 -0
- data/spec/autocomplete_generator/app/Generator/index.erb +21 -0
- data/spec/autocomplete_generator/app/Settings/controller.rb +117 -0
- data/spec/autocomplete_generator/app/Settings/err_sync.erb +11 -0
- data/spec/autocomplete_generator/app/Settings/home.bb.erb +18 -0
- data/spec/autocomplete_generator/app/Settings/home.erb +19 -0
- data/spec/autocomplete_generator/app/Settings/index.bb.erb +31 -0
- data/spec/autocomplete_generator/app/Settings/index.erb +31 -0
- data/spec/autocomplete_generator/app/Settings/login.bb.erb +29 -0
- data/spec/autocomplete_generator/app/Settings/login.erb +25 -0
- data/spec/autocomplete_generator/app/Settings/reset.bb.erb +16 -0
- data/spec/autocomplete_generator/app/Settings/reset.erb +14 -0
- data/spec/autocomplete_generator/app/Settings/wait.bb.erb +10 -0
- data/spec/autocomplete_generator/app/Settings/wait.erb +10 -0
- data/spec/autocomplete_generator/app/application.rb +16 -0
- data/spec/autocomplete_generator/app/helpers/application_helper.rb +129 -0
- data/spec/autocomplete_generator/app/helpers/browser_helper.rb +22 -0
- data/spec/autocomplete_generator/app/index.bb.erb +21 -0
- data/spec/autocomplete_generator/app/index.erb +24 -0
- data/spec/autocomplete_generator/app/layout.erb +94 -0
- data/spec/autocomplete_generator/app/loading.html +11 -0
- data/spec/autocomplete_generator/build.yml +41 -0
- data/spec/autocomplete_generator/icon/icon.ico +0 -0
- data/spec/autocomplete_generator/icon/icon.png +0 -0
- data/spec/autocomplete_generator/icon/icon.svg +5334 -0
- data/spec/autocomplete_generator/icon/icon114.png +0 -0
- data/spec/autocomplete_generator/icon/icon57.png +0 -0
- data/spec/autocomplete_generator/icon/icon72.png +0 -0
- data/spec/autocomplete_generator/readme.txt +1 -0
- data/spec/autocomplete_generator/rhoconfig.txt +88 -0
- data/spec/autocomplete_generator/rhosimulator/Databases/Databases.db +0 -0
- data/spec/autocomplete_generator/rhosimulator/WebpageIcons.db +0 -0
- data/spec/autocomplete_generator/rhosimulator/db/syncdbuser.sqlite +0 -0
- data/spec/autocomplete_generator/rhosimulator/db/syncdbuser.sqlite.version +1 -0
- data/spec/autocomplete_generator/rhosimulator/rholog.txt_pos +1 -0
- data/spec/autocomplete_generator/rhosimulator/rhosimconfig.txt +8 -0
- data/spec/framework_spec/app/spec/rhomobile/NetHttp_spec.rb +22 -0
- data/spec/framework_spec/app/spec_runner.rb +12 -0
- data/spec/framework_spec/icon/icon.ico +0 -0
- data/spec/framework_spec/icon/icon.png +0 -0
- data/spec/perfomance_spec/icon/icon.ico +0 -0
- data/spec/perfomance_spec/icon/icon.png +0 -0
- data/spec/phone_spec/app/BlobBulkTest/blob_bulk_test.png +0 -0
- data/spec/phone_spec/app/BlobBulkTest_s/blob_bulk_test_s.png +0 -0
- data/spec/phone_spec/app/PartialTest/_index_partial.erb +5 -0
- data/spec/phone_spec/app/PartialTest/_index_partial_nested.erb +2 -0
- data/spec/phone_spec/app/PartialTest/index.erb +6 -0
- data/spec/phone_spec/app/spec/blob_bulksync_spec.rb +5 -3
- data/spec/phone_spec/app/spec/bulksync_spec.rb +33 -41
- data/spec/phone_spec/app/spec/database_spec.rb +5 -0
- data/spec/phone_spec/app/spec/json_spec.rb +50 -50
- data/spec/phone_spec/app/spec/rho_controller_spec.rb +29 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +184 -47
- data/spec/phone_spec/app/spec_runner.rb +3 -2
- data/spec/phone_spec/icon/icon.ico +0 -0
- data/spec/phone_spec/icon/icon.png +0 -0
- data/spec/phone_spec/rhoconfig.txt +2 -0
- data/version +1 -1
- metadata +339 -47
- data/platform/android/Rhodes/PushReceiver.erb +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +0 -126
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +0 -83
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/Config.java +0 -246
- data/platform/bb/rhodes/src/com/rho/rubyext/PNGEncoder.java +0 -613
- data/res/icons/rho.psd +0 -0
- data/res/icons/rhodes.psd +0 -0
- data/res/icons/rhosim.psd +0 -0
@@ -0,0 +1,236 @@
|
|
1
|
+
package com.audiocapture;
|
2
|
+
|
3
|
+
import java.io.File;
|
4
|
+
import java.io.IOException;
|
5
|
+
import java.util.Timer;
|
6
|
+
import java.util.TimerTask;
|
7
|
+
|
8
|
+
import com.rhomobile.rhodes.RhodesAppOptions;
|
9
|
+
import com.rhomobile.rhodes.file.RhoFileApi;
|
10
|
+
import com.rhomobile.rhodes.util.PerformOnUiThread;
|
11
|
+
|
12
|
+
import android.media.MediaRecorder;
|
13
|
+
|
14
|
+
public class Audiocapture {
|
15
|
+
|
16
|
+
private static Audiocapture ourInstance = null;
|
17
|
+
|
18
|
+
public static Audiocapture getInstance() {
|
19
|
+
if (ourInstance == null) {
|
20
|
+
ourInstance = new Audiocapture();
|
21
|
+
}
|
22
|
+
return ourInstance;
|
23
|
+
}
|
24
|
+
|
25
|
+
public Audiocapture() {
|
26
|
+
mCallbackURL = "";
|
27
|
+
mDuration = 20000;
|
28
|
+
mName = "audiocapture.wav";
|
29
|
+
String dir = RhodesAppOptions.getBlobPath();
|
30
|
+
mDestination = dir + "/" +mName;
|
31
|
+
}
|
32
|
+
|
33
|
+
public final static String AUDIOCAPTURE_CALLBACK = "audioSaveEvent";
|
34
|
+
public final static String AUDIOCAPTURE_DESTINATION = "destination";
|
35
|
+
public final static String AUDIOCAPTURE_DURATION = "duration";
|
36
|
+
public final static String AUDIOCAPTURE_NAME = "name";
|
37
|
+
|
38
|
+
public final static String AUDIOCAPTURE_TMP_NAME_ADDON = "_tmp";
|
39
|
+
|
40
|
+
private String mCallbackURL = null;
|
41
|
+
private String mDestination = null;
|
42
|
+
private String mName = null;
|
43
|
+
private int mDuration = 20000;
|
44
|
+
private boolean mIsSaveFile = false;
|
45
|
+
|
46
|
+
private ExtAudioRecorder mRecorder = null;
|
47
|
+
|
48
|
+
private Timer mTimer = null;
|
49
|
+
|
50
|
+
|
51
|
+
public static void setProperty(String property_name, String value) {
|
52
|
+
try {
|
53
|
+
if (AUDIOCAPTURE_DURATION.equals(property_name) ) {
|
54
|
+
int per = Integer.parseInt(value);
|
55
|
+
getInstance().mDuration = per;
|
56
|
+
}
|
57
|
+
if (AUDIOCAPTURE_CALLBACK.equals(property_name) ) {
|
58
|
+
getInstance().mCallbackURL = value;
|
59
|
+
}
|
60
|
+
if (AUDIOCAPTURE_DESTINATION.equals(property_name) ) {
|
61
|
+
getInstance().mDestination = value;
|
62
|
+
}
|
63
|
+
if (AUDIOCAPTURE_NAME.equals(property_name) ) {
|
64
|
+
String dir = RhodesAppOptions.getBlobPath();
|
65
|
+
getInstance().mDestination = dir + "/" +value;
|
66
|
+
}
|
67
|
+
}
|
68
|
+
catch (Exception e) {
|
69
|
+
e.printStackTrace();
|
70
|
+
}
|
71
|
+
}
|
72
|
+
|
73
|
+
// 1 - string
|
74
|
+
// 3 - int
|
75
|
+
public static int getPropertyType(String property_name) {
|
76
|
+
if (AUDIOCAPTURE_DURATION.equals(property_name) ) {
|
77
|
+
return 3;
|
78
|
+
}
|
79
|
+
if (AUDIOCAPTURE_CALLBACK.equals(property_name) ) {
|
80
|
+
return 1;
|
81
|
+
}
|
82
|
+
if (AUDIOCAPTURE_DESTINATION.equals(property_name) ) {
|
83
|
+
return 1;
|
84
|
+
}
|
85
|
+
if (AUDIOCAPTURE_NAME.equals(property_name) ) {
|
86
|
+
return 1;
|
87
|
+
}
|
88
|
+
return 1;
|
89
|
+
}
|
90
|
+
|
91
|
+
public static int getIntProperty(String property_name) {
|
92
|
+
if (AUDIOCAPTURE_DURATION.equals(property_name) ) {
|
93
|
+
return getInstance().mDuration;
|
94
|
+
}
|
95
|
+
return 0;
|
96
|
+
}
|
97
|
+
|
98
|
+
public static String getStringProperty(String property_name) {
|
99
|
+
if (AUDIOCAPTURE_CALLBACK.equals(property_name) ) {
|
100
|
+
return getInstance().mCallbackURL;
|
101
|
+
}
|
102
|
+
if (AUDIOCAPTURE_DESTINATION.equals(property_name) ) {
|
103
|
+
return getInstance().mDestination;
|
104
|
+
}
|
105
|
+
if (AUDIOCAPTURE_NAME.equals(property_name) ) {
|
106
|
+
return getInstance().mName;
|
107
|
+
}
|
108
|
+
return null;
|
109
|
+
}
|
110
|
+
|
111
|
+
|
112
|
+
|
113
|
+
private class MyTimerTask extends TimerTask {
|
114
|
+
private long mDelay = 0;
|
115
|
+
|
116
|
+
public MyTimerTask(int delay) {
|
117
|
+
mDelay = delay;
|
118
|
+
}
|
119
|
+
|
120
|
+
public void run() {
|
121
|
+
stopCommand();
|
122
|
+
}
|
123
|
+
}
|
124
|
+
|
125
|
+
public void startCommand() {
|
126
|
+
mRecorder = ExtAudioRecorder.getInstanse(false, mDuration);
|
127
|
+
//mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
|
128
|
+
//mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
|
129
|
+
mRecorder.setOutputFile(mDestination+AUDIOCAPTURE_TMP_NAME_ADDON);
|
130
|
+
//mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
|
131
|
+
|
132
|
+
mRecorder.prepare();
|
133
|
+
mRecorder.start();
|
134
|
+
|
135
|
+
mIsSaveFile = true;
|
136
|
+
|
137
|
+
if (mTimer != null) {
|
138
|
+
mTimer.cancel();
|
139
|
+
mTimer = null;
|
140
|
+
}
|
141
|
+
//mTimer = new Timer();
|
142
|
+
//mTimer.schedule( new MyTimerTask (mDuration), (long)mDuration);
|
143
|
+
|
144
|
+
}
|
145
|
+
|
146
|
+
public void stopCommand() {
|
147
|
+
if (mTimer != null) {
|
148
|
+
mTimer.cancel();
|
149
|
+
mTimer = null;
|
150
|
+
}
|
151
|
+
if (mRecorder != null) {
|
152
|
+
mRecorder.stop();
|
153
|
+
mRecorder.release();
|
154
|
+
mRecorder = null;
|
155
|
+
|
156
|
+
if (mIsSaveFile) {
|
157
|
+
// kill if exist
|
158
|
+
File dst_file = new File(mDestination);
|
159
|
+
if (dst_file.exists()) {
|
160
|
+
dst_file.delete();
|
161
|
+
}
|
162
|
+
|
163
|
+
// rename tmp to dst
|
164
|
+
File tmp_file = new File(mDestination+AUDIOCAPTURE_TMP_NAME_ADDON);
|
165
|
+
if (tmp_file.exists()) {
|
166
|
+
tmp_file.renameTo(new File(mDestination));
|
167
|
+
}
|
168
|
+
fireCallback("OK", "filename", mDestination);
|
169
|
+
}
|
170
|
+
else {
|
171
|
+
// kill tmp file
|
172
|
+
File file = new File(mDestination + AUDIOCAPTURE_TMP_NAME_ADDON);
|
173
|
+
if (file.exists()) {
|
174
|
+
file.delete();
|
175
|
+
}
|
176
|
+
fireCallback("CANCEL", null, null);
|
177
|
+
}
|
178
|
+
}
|
179
|
+
else {
|
180
|
+
fireCallback("ERROR", "message", "not any record process");
|
181
|
+
}
|
182
|
+
}
|
183
|
+
|
184
|
+
public void cancelCommand() {
|
185
|
+
mIsSaveFile = false;
|
186
|
+
stopCommand();
|
187
|
+
}
|
188
|
+
|
189
|
+
|
190
|
+
public static void onAudioRecorderFinishedByDuration() {
|
191
|
+
getInstance().stopCommand();
|
192
|
+
}
|
193
|
+
|
194
|
+
|
195
|
+
public static void start() {
|
196
|
+
PerformOnUiThread.exec(new Runnable() {
|
197
|
+
public void run() {
|
198
|
+
getInstance().startCommand();
|
199
|
+
}
|
200
|
+
});
|
201
|
+
}
|
202
|
+
|
203
|
+
public static void stop() {
|
204
|
+
PerformOnUiThread.exec(new Runnable() {
|
205
|
+
public void run() {
|
206
|
+
getInstance().stopCommand();
|
207
|
+
}
|
208
|
+
});
|
209
|
+
}
|
210
|
+
|
211
|
+
public static void cancel() {
|
212
|
+
PerformOnUiThread.exec(new Runnable() {
|
213
|
+
public void run() {
|
214
|
+
getInstance().cancelCommand();
|
215
|
+
}
|
216
|
+
});
|
217
|
+
}
|
218
|
+
|
219
|
+
private void fireCallback(String status, String param_name, String param_value) {
|
220
|
+
StringBuffer strBody = new StringBuffer("&rho_callback=1&status=");
|
221
|
+
|
222
|
+
strBody = strBody.append(status);
|
223
|
+
if (param_name != null) {
|
224
|
+
strBody = strBody.append("&");
|
225
|
+
strBody = strBody.append(param_name);
|
226
|
+
strBody = strBody.append("=");
|
227
|
+
strBody = strBody.append(param_value);
|
228
|
+
}
|
229
|
+
|
230
|
+
fireRhoCallback(mCallbackURL, strBody.toString());
|
231
|
+
}
|
232
|
+
|
233
|
+
private static native void fireRhoCallback(String url, String body);
|
234
|
+
|
235
|
+
|
236
|
+
}
|
@@ -0,0 +1,573 @@
|
|
1
|
+
// source based on http://i-liger.com/article/android-wav-audio-recording
|
2
|
+
|
3
|
+
package com.audiocapture;
|
4
|
+
|
5
|
+
import java.io.File;
|
6
|
+
import java.io.IOException;
|
7
|
+
import java.io.RandomAccessFile;
|
8
|
+
|
9
|
+
import android.R.bool;
|
10
|
+
import android.media.AudioFormat;
|
11
|
+
import android.media.AudioRecord;
|
12
|
+
import android.media.MediaRecorder;
|
13
|
+
import android.media.MediaRecorder.AudioSource;
|
14
|
+
import android.util.Log;
|
15
|
+
|
16
|
+
public class ExtAudioRecorder
|
17
|
+
{
|
18
|
+
private final static int[] sampleRates = {22050, 11025, 8000};
|
19
|
+
|
20
|
+
public static ExtAudioRecorder getInstanse(Boolean recordingCompressed, int duration)
|
21
|
+
{
|
22
|
+
ExtAudioRecorder result = null;
|
23
|
+
|
24
|
+
if(recordingCompressed)
|
25
|
+
{
|
26
|
+
result = new ExtAudioRecorder( false,
|
27
|
+
AudioSource.MIC,
|
28
|
+
sampleRates[2],
|
29
|
+
AudioFormat.CHANNEL_CONFIGURATION_MONO,
|
30
|
+
AudioFormat.ENCODING_PCM_16BIT,
|
31
|
+
duration);
|
32
|
+
}
|
33
|
+
else
|
34
|
+
{
|
35
|
+
int i=0;
|
36
|
+
do
|
37
|
+
{
|
38
|
+
result = new ExtAudioRecorder( true,
|
39
|
+
AudioSource.MIC,
|
40
|
+
sampleRates[i],
|
41
|
+
AudioFormat.CHANNEL_CONFIGURATION_MONO,
|
42
|
+
AudioFormat.ENCODING_PCM_16BIT,
|
43
|
+
duration);
|
44
|
+
|
45
|
+
} while((++i<sampleRates.length) & !(result.getState() == ExtAudioRecorder.State.INITIALIZING));
|
46
|
+
}
|
47
|
+
return result;
|
48
|
+
}
|
49
|
+
|
50
|
+
/**
|
51
|
+
* INITIALIZING : recorder is initializing;
|
52
|
+
* READY : recorder has been initialized, recorder not yet started
|
53
|
+
* RECORDING : recording
|
54
|
+
* ERROR : reconstruction needed
|
55
|
+
* STOPPED: reset needed
|
56
|
+
*/
|
57
|
+
public enum State {INITIALIZING, READY, RECORDING, ERROR, STOPPED};
|
58
|
+
|
59
|
+
public static final boolean RECORDING_UNCOMPRESSED = true;
|
60
|
+
public static final boolean RECORDING_COMPRESSED = false;
|
61
|
+
|
62
|
+
// The interval in which the recorded samples are output to the file
|
63
|
+
// Used only in uncompressed mode
|
64
|
+
private static final int TIMER_INTERVAL = 120;
|
65
|
+
|
66
|
+
// Toggles uncompressed recording on/off; RECORDING_UNCOMPRESSED / RECORDING_COMPRESSED
|
67
|
+
private boolean rUncompressed;
|
68
|
+
|
69
|
+
// Recorder used for uncompressed recording
|
70
|
+
private AudioRecord audioRecorder = null;
|
71
|
+
|
72
|
+
// Recorder used for compressed recording
|
73
|
+
private MediaRecorder mediaRecorder = null;
|
74
|
+
|
75
|
+
// Stores current amplitude (only in uncompressed mode)
|
76
|
+
private int cAmplitude= 0;
|
77
|
+
|
78
|
+
// Output file path
|
79
|
+
private String filePath = null;
|
80
|
+
|
81
|
+
// Recorder state; see State
|
82
|
+
private State state;
|
83
|
+
|
84
|
+
private int mDuration = 0;
|
85
|
+
|
86
|
+
// File writer (only in uncompressed mode)
|
87
|
+
private RandomAccessFile randomAccessWriter;
|
88
|
+
|
89
|
+
// Number of channels, sample rate, sample size(size in bits), buffer size, audio source, sample size(see AudioFormat)
|
90
|
+
private short nChannels;
|
91
|
+
private int sRate;
|
92
|
+
private short bSamples;
|
93
|
+
private int bufferSize;
|
94
|
+
private int aSource;
|
95
|
+
private int aFormat;
|
96
|
+
|
97
|
+
// Number of frames written to file on each output(only in uncompressed mode)
|
98
|
+
private int framePeriod;
|
99
|
+
|
100
|
+
// Buffer for output(only in uncompressed mode)
|
101
|
+
private byte[] buffer;
|
102
|
+
|
103
|
+
// Number of bytes written to file after header(only in uncompressed mode)
|
104
|
+
// after stop() is called, this size is written to the header/data chunk in the wave file
|
105
|
+
private int payloadSize;
|
106
|
+
|
107
|
+
/**
|
108
|
+
*
|
109
|
+
* Returns the state of the recorder in a RehearsalAudioRecord.State typed object.
|
110
|
+
* Useful, as no exceptions are thrown.
|
111
|
+
*
|
112
|
+
* @return recorder state
|
113
|
+
*/
|
114
|
+
public State getState()
|
115
|
+
{
|
116
|
+
return state;
|
117
|
+
}
|
118
|
+
|
119
|
+
/*
|
120
|
+
*
|
121
|
+
* Method used for recording.
|
122
|
+
*
|
123
|
+
*/
|
124
|
+
private AudioRecord.OnRecordPositionUpdateListener updateListener = new AudioRecord.OnRecordPositionUpdateListener()
|
125
|
+
{
|
126
|
+
public void onPeriodicNotification(AudioRecord recorder)
|
127
|
+
{
|
128
|
+
boolean isDurationLimit = false;
|
129
|
+
|
130
|
+
audioRecorder.read(buffer, 0, buffer.length); // Fill buffer
|
131
|
+
try
|
132
|
+
{
|
133
|
+
// check size
|
134
|
+
int count = buffer.length;
|
135
|
+
|
136
|
+
int expectedPayloadSize = (int)((long)((long)bSamples/8)*(long)nChannels*(long)sRate*(long)mDuration/(long)1000);
|
137
|
+
|
138
|
+
if ((payloadSize + count) >= expectedPayloadSize) {
|
139
|
+
isDurationLimit = true;
|
140
|
+
count = expectedPayloadSize - payloadSize;
|
141
|
+
}
|
142
|
+
|
143
|
+
if (count > 0) {
|
144
|
+
//randomAccessWriter.write(buffer); // Write buffer to file
|
145
|
+
randomAccessWriter.write(buffer, 0, count);
|
146
|
+
payloadSize += count;
|
147
|
+
if (bSamples == 16)
|
148
|
+
{
|
149
|
+
for (int i=0; i<count/2; i++)
|
150
|
+
{ // 16bit sample size
|
151
|
+
short curSample = getShort(buffer[i*2], buffer[i*2+1]);
|
152
|
+
if (curSample > cAmplitude)
|
153
|
+
{ // Check amplitude
|
154
|
+
cAmplitude = curSample;
|
155
|
+
}
|
156
|
+
}
|
157
|
+
}
|
158
|
+
else
|
159
|
+
{ // 8bit sample size
|
160
|
+
for (int i=0; i<count; i++)
|
161
|
+
{
|
162
|
+
if (buffer[i] > cAmplitude)
|
163
|
+
{ // Check amplitude
|
164
|
+
cAmplitude = buffer[i];
|
165
|
+
}
|
166
|
+
}
|
167
|
+
}
|
168
|
+
if (isDurationLimit) {
|
169
|
+
Audiocapture.onAudioRecorderFinishedByDuration();
|
170
|
+
}
|
171
|
+
}
|
172
|
+
}
|
173
|
+
catch (IOException e)
|
174
|
+
{
|
175
|
+
Log.e(ExtAudioRecorder.class.getName(), "Error occured in updateListener, recording is aborted");
|
176
|
+
//stop();
|
177
|
+
}
|
178
|
+
}
|
179
|
+
|
180
|
+
public void onMarkerReached(AudioRecord recorder)
|
181
|
+
{
|
182
|
+
// NOT USED
|
183
|
+
}
|
184
|
+
};
|
185
|
+
/**
|
186
|
+
*
|
187
|
+
*
|
188
|
+
* Default constructor
|
189
|
+
*
|
190
|
+
* Instantiates a new recorder, in case of compressed recording the parameters can be left as 0.
|
191
|
+
* In case of errors, no exception is thrown, but the state is set to ERROR
|
192
|
+
*
|
193
|
+
*/
|
194
|
+
public ExtAudioRecorder(boolean uncompressed, int audioSource, int sampleRate, int channelConfig, int audioFormat, int duration)
|
195
|
+
{
|
196
|
+
try
|
197
|
+
{
|
198
|
+
mDuration = duration;
|
199
|
+
rUncompressed = uncompressed;
|
200
|
+
if (rUncompressed)
|
201
|
+
{ // RECORDING_UNCOMPRESSED
|
202
|
+
if (audioFormat == AudioFormat.ENCODING_PCM_16BIT)
|
203
|
+
{
|
204
|
+
bSamples = 16;
|
205
|
+
}
|
206
|
+
else
|
207
|
+
{
|
208
|
+
bSamples = 8;
|
209
|
+
}
|
210
|
+
|
211
|
+
if (channelConfig == AudioFormat.CHANNEL_CONFIGURATION_MONO)
|
212
|
+
{
|
213
|
+
nChannels = 1;
|
214
|
+
}
|
215
|
+
else
|
216
|
+
{
|
217
|
+
nChannels = 2;
|
218
|
+
}
|
219
|
+
|
220
|
+
aSource = audioSource;
|
221
|
+
sRate = sampleRate;
|
222
|
+
aFormat = audioFormat;
|
223
|
+
|
224
|
+
framePeriod = sampleRate * TIMER_INTERVAL / 1000;
|
225
|
+
bufferSize = framePeriod * 2 * bSamples * nChannels / 8;
|
226
|
+
if (bufferSize < AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat))
|
227
|
+
{ // Check to make sure buffer size is not smaller than the smallest allowed one
|
228
|
+
bufferSize = AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat);
|
229
|
+
// Set frame period and timer interval accordingly
|
230
|
+
framePeriod = bufferSize / ( 2 * bSamples * nChannels / 8 );
|
231
|
+
Log.w(ExtAudioRecorder.class.getName(), "Increasing buffer size to " + Integer.toString(bufferSize));
|
232
|
+
}
|
233
|
+
|
234
|
+
audioRecorder = new AudioRecord(audioSource, sampleRate, channelConfig, audioFormat, bufferSize);
|
235
|
+
|
236
|
+
if (audioRecorder.getState() != AudioRecord.STATE_INITIALIZED)
|
237
|
+
throw new Exception("AudioRecord initialization failed");
|
238
|
+
audioRecorder.setRecordPositionUpdateListener(updateListener);
|
239
|
+
audioRecorder.setPositionNotificationPeriod(framePeriod);
|
240
|
+
} else
|
241
|
+
{ // RECORDING_COMPRESSED
|
242
|
+
mediaRecorder = new MediaRecorder();
|
243
|
+
mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
|
244
|
+
mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
|
245
|
+
mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
|
246
|
+
}
|
247
|
+
cAmplitude = 0;
|
248
|
+
filePath = null;
|
249
|
+
state = State.INITIALIZING;
|
250
|
+
} catch (Exception e)
|
251
|
+
{
|
252
|
+
if (e.getMessage() != null)
|
253
|
+
{
|
254
|
+
Log.e(ExtAudioRecorder.class.getName(), e.getMessage());
|
255
|
+
}
|
256
|
+
else
|
257
|
+
{
|
258
|
+
Log.e(ExtAudioRecorder.class.getName(), "Unknown error occured while initializing recording");
|
259
|
+
}
|
260
|
+
state = State.ERROR;
|
261
|
+
}
|
262
|
+
}
|
263
|
+
|
264
|
+
/**
|
265
|
+
* Sets output file path, call directly after construction/reset.
|
266
|
+
*
|
267
|
+
* @param output file path
|
268
|
+
*
|
269
|
+
*/
|
270
|
+
public void setOutputFile(String argPath)
|
271
|
+
{
|
272
|
+
try
|
273
|
+
{
|
274
|
+
if (state == State.INITIALIZING)
|
275
|
+
{
|
276
|
+
filePath = argPath;
|
277
|
+
if (!rUncompressed)
|
278
|
+
{
|
279
|
+
mediaRecorder.setOutputFile(filePath);
|
280
|
+
}
|
281
|
+
}
|
282
|
+
}
|
283
|
+
catch (Exception e)
|
284
|
+
{
|
285
|
+
if (e.getMessage() != null)
|
286
|
+
{
|
287
|
+
Log.e(ExtAudioRecorder.class.getName(), e.getMessage());
|
288
|
+
}
|
289
|
+
else
|
290
|
+
{
|
291
|
+
Log.e(ExtAudioRecorder.class.getName(), "Unknown error occured while setting output path");
|
292
|
+
}
|
293
|
+
state = State.ERROR;
|
294
|
+
}
|
295
|
+
}
|
296
|
+
|
297
|
+
/**
|
298
|
+
*
|
299
|
+
* Returns the largest amplitude sampled since the last call to this method.
|
300
|
+
*
|
301
|
+
* @return returns the largest amplitude since the last call, or 0 when not in recording state.
|
302
|
+
*
|
303
|
+
*/
|
304
|
+
public int getMaxAmplitude()
|
305
|
+
{
|
306
|
+
if (state == State.RECORDING)
|
307
|
+
{
|
308
|
+
if (rUncompressed)
|
309
|
+
{
|
310
|
+
int result = cAmplitude;
|
311
|
+
cAmplitude = 0;
|
312
|
+
return result;
|
313
|
+
}
|
314
|
+
else
|
315
|
+
{
|
316
|
+
try
|
317
|
+
{
|
318
|
+
return mediaRecorder.getMaxAmplitude();
|
319
|
+
}
|
320
|
+
catch (IllegalStateException e)
|
321
|
+
{
|
322
|
+
return 0;
|
323
|
+
}
|
324
|
+
}
|
325
|
+
}
|
326
|
+
else
|
327
|
+
{
|
328
|
+
return 0;
|
329
|
+
}
|
330
|
+
}
|
331
|
+
|
332
|
+
|
333
|
+
/**
|
334
|
+
*
|
335
|
+
* Prepares the recorder for recording, in case the recorder is not in the INITIALIZING state and the file path was not set
|
336
|
+
* the recorder is set to the ERROR state, which makes a reconstruction necessary.
|
337
|
+
* In case uncompressed recording is toggled, the header of the wave file is written.
|
338
|
+
* In case of an exception, the state is changed to ERROR
|
339
|
+
*
|
340
|
+
*/
|
341
|
+
public void prepare()
|
342
|
+
{
|
343
|
+
try
|
344
|
+
{
|
345
|
+
if (state == State.INITIALIZING)
|
346
|
+
{
|
347
|
+
if (rUncompressed)
|
348
|
+
{
|
349
|
+
if ((audioRecorder.getState() == AudioRecord.STATE_INITIALIZED) & (filePath != null))
|
350
|
+
{
|
351
|
+
// write file header
|
352
|
+
|
353
|
+
randomAccessWriter = new RandomAccessFile(filePath, "rw");
|
354
|
+
|
355
|
+
randomAccessWriter.setLength(0); // Set file length to 0, to prevent unexpected behavior in case the file already existed
|
356
|
+
randomAccessWriter.writeBytes("RIFF");
|
357
|
+
randomAccessWriter.writeInt(0); // Final file size not known yet, write 0
|
358
|
+
randomAccessWriter.writeBytes("WAVE");
|
359
|
+
randomAccessWriter.writeBytes("fmt ");
|
360
|
+
randomAccessWriter.writeInt(Integer.reverseBytes(16)); // Sub-chunk size, 16 for PCM
|
361
|
+
randomAccessWriter.writeShort(Short.reverseBytes((short) 1)); // AudioFormat, 1 for PCM
|
362
|
+
randomAccessWriter.writeShort(Short.reverseBytes(nChannels));// Number of channels, 1 for mono, 2 for stereo
|
363
|
+
randomAccessWriter.writeInt(Integer.reverseBytes(sRate)); // Sample rate
|
364
|
+
randomAccessWriter.writeInt(Integer.reverseBytes(sRate*bSamples*nChannels/8)); // Byte rate, SampleRate*NumberOfChannels*BitsPerSample/8
|
365
|
+
randomAccessWriter.writeShort(Short.reverseBytes((short)(nChannels*bSamples/8))); // Block align, NumberOfChannels*BitsPerSample/8
|
366
|
+
randomAccessWriter.writeShort(Short.reverseBytes(bSamples)); // Bits per sample
|
367
|
+
randomAccessWriter.writeBytes("data");
|
368
|
+
randomAccessWriter.writeInt(0); // Data chunk size not known yet, write 0
|
369
|
+
|
370
|
+
buffer = new byte[framePeriod*bSamples/8*nChannels];
|
371
|
+
state = State.READY;
|
372
|
+
}
|
373
|
+
else
|
374
|
+
{
|
375
|
+
Log.e(ExtAudioRecorder.class.getName(), "prepare() method called on uninitialized recorder");
|
376
|
+
state = State.ERROR;
|
377
|
+
}
|
378
|
+
}
|
379
|
+
else
|
380
|
+
{
|
381
|
+
mediaRecorder.prepare();
|
382
|
+
state = State.READY;
|
383
|
+
}
|
384
|
+
}
|
385
|
+
else
|
386
|
+
{
|
387
|
+
Log.e(ExtAudioRecorder.class.getName(), "prepare() method called on illegal state");
|
388
|
+
release();
|
389
|
+
state = State.ERROR;
|
390
|
+
}
|
391
|
+
}
|
392
|
+
catch(Exception e)
|
393
|
+
{
|
394
|
+
if (e.getMessage() != null)
|
395
|
+
{
|
396
|
+
Log.e(ExtAudioRecorder.class.getName(), e.getMessage());
|
397
|
+
}
|
398
|
+
else
|
399
|
+
{
|
400
|
+
Log.e(ExtAudioRecorder.class.getName(), "Unknown error occured in prepare()");
|
401
|
+
}
|
402
|
+
state = State.ERROR;
|
403
|
+
}
|
404
|
+
}
|
405
|
+
|
406
|
+
/**
|
407
|
+
*
|
408
|
+
*
|
409
|
+
* Releases the resources associated with this class, and removes the unnecessary files, when necessary
|
410
|
+
*
|
411
|
+
*/
|
412
|
+
public void release()
|
413
|
+
{
|
414
|
+
if (state == State.RECORDING)
|
415
|
+
{
|
416
|
+
stop();
|
417
|
+
}
|
418
|
+
else
|
419
|
+
{
|
420
|
+
if ((state == State.READY) & (rUncompressed))
|
421
|
+
{
|
422
|
+
try
|
423
|
+
{
|
424
|
+
randomAccessWriter.close(); // Remove prepared file
|
425
|
+
}
|
426
|
+
catch (IOException e)
|
427
|
+
{
|
428
|
+
Log.e(ExtAudioRecorder.class.getName(), "I/O exception occured while closing output file");
|
429
|
+
}
|
430
|
+
(new File(filePath)).delete();
|
431
|
+
}
|
432
|
+
}
|
433
|
+
|
434
|
+
if (rUncompressed)
|
435
|
+
{
|
436
|
+
if (audioRecorder != null)
|
437
|
+
{
|
438
|
+
audioRecorder.release();
|
439
|
+
}
|
440
|
+
}
|
441
|
+
else
|
442
|
+
{
|
443
|
+
if (mediaRecorder != null)
|
444
|
+
{
|
445
|
+
mediaRecorder.release();
|
446
|
+
}
|
447
|
+
}
|
448
|
+
}
|
449
|
+
|
450
|
+
/**
|
451
|
+
*
|
452
|
+
*
|
453
|
+
* Resets the recorder to the INITIALIZING state, as if it was just created.
|
454
|
+
* In case the class was in RECORDING state, the recording is stopped.
|
455
|
+
* In case of exceptions the class is set to the ERROR state.
|
456
|
+
*
|
457
|
+
*/
|
458
|
+
public void reset()
|
459
|
+
{
|
460
|
+
try
|
461
|
+
{
|
462
|
+
if (state != State.ERROR)
|
463
|
+
{
|
464
|
+
release();
|
465
|
+
filePath = null; // Reset file path
|
466
|
+
cAmplitude = 0; // Reset amplitude
|
467
|
+
if (rUncompressed)
|
468
|
+
{
|
469
|
+
audioRecorder = new AudioRecord(aSource, sRate, nChannels+1, aFormat, bufferSize);
|
470
|
+
}
|
471
|
+
else
|
472
|
+
{
|
473
|
+
mediaRecorder = new MediaRecorder();
|
474
|
+
mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
|
475
|
+
mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
|
476
|
+
mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
|
477
|
+
}
|
478
|
+
state = State.INITIALIZING;
|
479
|
+
}
|
480
|
+
}
|
481
|
+
catch (Exception e)
|
482
|
+
{
|
483
|
+
Log.e(ExtAudioRecorder.class.getName(), e.getMessage());
|
484
|
+
state = State.ERROR;
|
485
|
+
}
|
486
|
+
}
|
487
|
+
|
488
|
+
/**
|
489
|
+
*
|
490
|
+
*
|
491
|
+
* Starts the recording, and sets the state to RECORDING.
|
492
|
+
* Call after prepare().
|
493
|
+
*
|
494
|
+
*/
|
495
|
+
public void start()
|
496
|
+
{
|
497
|
+
if (state == State.READY)
|
498
|
+
{
|
499
|
+
if (rUncompressed)
|
500
|
+
{
|
501
|
+
payloadSize = 0;
|
502
|
+
audioRecorder.startRecording();
|
503
|
+
audioRecorder.read(buffer, 0, buffer.length);
|
504
|
+
}
|
505
|
+
else
|
506
|
+
{
|
507
|
+
mediaRecorder.start();
|
508
|
+
}
|
509
|
+
state = State.RECORDING;
|
510
|
+
}
|
511
|
+
else
|
512
|
+
{
|
513
|
+
Log.e(ExtAudioRecorder.class.getName(), "start() called on illegal state");
|
514
|
+
state = State.ERROR;
|
515
|
+
}
|
516
|
+
}
|
517
|
+
|
518
|
+
/**
|
519
|
+
*
|
520
|
+
*
|
521
|
+
* Stops the recording, and sets the state to STOPPED.
|
522
|
+
* In case of further usage, a reset is needed.
|
523
|
+
* Also finalizes the wave file in case of uncompressed recording.
|
524
|
+
*
|
525
|
+
*/
|
526
|
+
public void stop()
|
527
|
+
{
|
528
|
+
if (state == State.RECORDING)
|
529
|
+
{
|
530
|
+
if (rUncompressed)
|
531
|
+
{
|
532
|
+
audioRecorder.stop();
|
533
|
+
|
534
|
+
try
|
535
|
+
{
|
536
|
+
randomAccessWriter.seek(4); // Write size to RIFF header
|
537
|
+
randomAccessWriter.writeInt(Integer.reverseBytes(36+payloadSize));
|
538
|
+
|
539
|
+
randomAccessWriter.seek(40); // Write size to Subchunk2Size field
|
540
|
+
randomAccessWriter.writeInt(Integer.reverseBytes(payloadSize));
|
541
|
+
|
542
|
+
randomAccessWriter.close();
|
543
|
+
}
|
544
|
+
catch(IOException e)
|
545
|
+
{
|
546
|
+
Log.e(ExtAudioRecorder.class.getName(), "I/O exception occured while closing output file");
|
547
|
+
state = State.ERROR;
|
548
|
+
}
|
549
|
+
}
|
550
|
+
else
|
551
|
+
{
|
552
|
+
mediaRecorder.stop();
|
553
|
+
}
|
554
|
+
state = State.STOPPED;
|
555
|
+
}
|
556
|
+
else
|
557
|
+
{
|
558
|
+
Log.e(ExtAudioRecorder.class.getName(), "stop() called on illegal state");
|
559
|
+
state = State.ERROR;
|
560
|
+
}
|
561
|
+
}
|
562
|
+
|
563
|
+
/*
|
564
|
+
*
|
565
|
+
* Converts a byte[2] to a short, in LITTLE_ENDIAN format
|
566
|
+
*
|
567
|
+
*/
|
568
|
+
private short getShort(byte argB1, byte argB2)
|
569
|
+
{
|
570
|
+
return (short)(argB1 | (argB2 << 8));
|
571
|
+
}
|
572
|
+
|
573
|
+
}
|