rhodes 3.3.3.beta.4 → 3.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (497) hide show
  1. data/CHANGELOG +7 -5
  2. data/CREDITS +2215 -0
  3. data/Rakefile +225 -59
  4. data/bin/c2dm.rb +0 -0
  5. data/bin/get-rhodes-info.bat +0 -0
  6. data/bin/migrate-rhodes-app +0 -0
  7. data/bin/migrate-rhodes-app.bat +0 -0
  8. data/bin/rhodes +0 -0
  9. data/bin/rhodes-setup +0 -0
  10. data/bin/rhodes-setup.bat +0 -0
  11. data/bin/rhogen +0 -0
  12. data/bin/rhogen.bat +0 -0
  13. data/bin/set-rhodes-sdk +0 -0
  14. data/bin/set-rhodes-sdk.bat +0 -0
  15. data/bin/upgrade-rhodes-app +0 -0
  16. data/bin/upgrade-rhodes-app.bat +0 -0
  17. data/doc/build.txt +20 -9
  18. data/doc/configuration.txt +8 -8
  19. data/doc/connect-to-web-services.txt +1 -1
  20. data/doc/device-caps.txt +63 -26
  21. data/doc/extensions.txt +14 -2
  22. data/doc/install.txt +28 -19
  23. data/doc/introduction.txt +6 -3
  24. data/doc/jqt-jqm-transition.txt +10 -9
  25. data/doc/release.txt +5 -1
  26. data/doc/rhodes-command-line.txt +130 -0
  27. data/doc/rhom.txt +16 -11
  28. data/doc/rhostudio-eclipse.txt +3 -3
  29. data/doc/simulator.txt +28 -31
  30. data/doc/syncengine-ajax-api.txt +246 -0
  31. data/doc/synchronization.txt +21 -3
  32. data/doc/test-log-debug.txt +3 -1
  33. data/doc/ui.txt +16 -16
  34. data/ext/extconf.rb +8 -0
  35. data/lib/build/jake.rb +5 -5
  36. data/lib/extensions/barcode/ext/barcode/platform/android/Rakefile +9 -9
  37. data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp +81 -1
  38. data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivityHandler.java +6 -13
  39. data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeHandler.java +2 -6
  40. data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +12 -1
  41. data/lib/extensions/barcode/ext/barcode/platform/bb/run.bat +0 -0
  42. data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.h +2 -0
  43. data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.mm +36 -0
  44. data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.h +0 -0
  45. data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.m +15 -5
  46. data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m +64 -1
  47. data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i +35 -1
  48. data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c +126 -2
  49. data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c +18 -1
  50. data/lib/extensions/barcode/ext/build +0 -0
  51. data/lib/extensions/barcode/ext/build.bat +0 -0
  52. data/lib/extensions/digest-md5/ext/Rakefile +12 -10
  53. data/lib/extensions/digest-md5/ext/build +0 -0
  54. data/lib/extensions/digest-md5/ext/build.bat +0 -0
  55. data/lib/extensions/digest-md5/ext/digest-md5.sln +2 -2
  56. data/lib/extensions/digest-md5/ext/digest-md5.vcproj +41 -28
  57. data/lib/extensions/digest-sha1/ext/Rakefile +11 -10
  58. data/lib/extensions/digest-sha1/ext/build +0 -0
  59. data/lib/extensions/digest-sha1/ext/build.bat +0 -0
  60. data/lib/extensions/digest-sha1/ext/digest-sha1.sln +2 -2
  61. data/lib/extensions/digest-sha1/ext/digest-sha1.vcproj +41 -28
  62. data/lib/extensions/digest/ext/Rakefile +12 -11
  63. data/lib/extensions/digest/ext/build +0 -0
  64. data/lib/extensions/digest/ext/build.bat +0 -0
  65. data/lib/extensions/digest/ext/digest.sln +44 -0
  66. data/lib/extensions/digest/ext/digest.vcproj +40 -27
  67. data/lib/extensions/esri/ext/build +0 -0
  68. data/lib/extensions/esri/ext/build.bat +0 -0
  69. data/lib/extensions/fcntl/ext/Rakefile +10 -9
  70. data/lib/extensions/fcntl/ext/build +0 -0
  71. data/lib/extensions/fcntl/ext/build.bat +0 -0
  72. data/lib/extensions/fcntl/ext/fcntl.vcproj +1 -1
  73. data/lib/extensions/nfc/ext/build +0 -0
  74. data/lib/extensions/nfc/ext/build.bat +0 -0
  75. data/lib/extensions/nfc/ext/nfc/platform/android/Rakefile +11 -11
  76. data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp +0 -0
  77. data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java +12 -10
  78. data/lib/extensions/nfc/ext/nfc/shared/ruby/nfc_wrap.c +16 -9
  79. data/lib/extensions/pdf-writer/color.rb +145 -0
  80. data/lib/extensions/pdf-writer/color/cmyk.rb +279 -0
  81. data/lib/extensions/pdf-writer/color/css.rb +28 -0
  82. data/lib/extensions/pdf-writer/color/grayscale.rb +212 -0
  83. data/lib/extensions/pdf-writer/color/hsl.rb +221 -0
  84. data/lib/extensions/pdf-writer/color/palette.rb +16 -0
  85. data/lib/extensions/pdf-writer/color/palette/adobecolor.rb +272 -0
  86. data/lib/extensions/pdf-writer/color/palette/gimp.rb +116 -0
  87. data/lib/extensions/pdf-writer/color/palette/monocontrast.rb +180 -0
  88. data/lib/extensions/pdf-writer/color/rgb-colors.rb +355 -0
  89. data/lib/extensions/pdf-writer/color/rgb.rb +453 -0
  90. data/lib/extensions/pdf-writer/color/rgb/metallic.rb +43 -0
  91. data/lib/extensions/pdf-writer/color/yiq.rb +84 -0
  92. data/lib/extensions/pdf-writer/ext/LICENSES/color/Licence.txt +27 -0
  93. data/lib/extensions/pdf-writer/ext/LICENSES/color/README.txt +32 -0
  94. data/lib/extensions/pdf-writer/ext/LICENSES/pdf-writer/LICENCE +131 -0
  95. data/lib/extensions/pdf-writer/ext/LICENSES/pdf-writer/README +33 -0
  96. data/lib/extensions/pdf-writer/ext/LICENSES/transaction-simple/Licence.txt +25 -0
  97. data/lib/extensions/pdf-writer/ext/LICENSES/transaction-simple/Readme.txt +204 -0
  98. data/lib/extensions/pdf-writer/pdf/charts.rb +13 -0
  99. data/lib/extensions/pdf-writer/pdf/charts/stddev.rb +430 -0
  100. data/lib/extensions/pdf-writer/pdf/math.rb +108 -0
  101. data/lib/extensions/pdf-writer/pdf/quickref.rb +332 -0
  102. data/lib/extensions/pdf-writer/pdf/simpletable.rb +947 -0
  103. data/lib/extensions/pdf-writer/pdf/techbook.rb +901 -0
  104. data/lib/extensions/pdf-writer/pdf/writer.rb +2729 -0
  105. data/lib/extensions/pdf-writer/pdf/writer/arc4.rb +63 -0
  106. data/lib/extensions/pdf-writer/pdf/writer/fontmetrics.rb +203 -0
  107. data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-Bold.afm +342 -0
  108. data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-BoldOblique.afm +342 -0
  109. data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier-Oblique.afm +342 -0
  110. data/lib/extensions/pdf-writer/pdf/writer/fonts/Courier.afm +342 -0
  111. data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-Bold.afm +2827 -0
  112. data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-BoldOblique.afm +2827 -0
  113. data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica-Oblique.afm +3051 -0
  114. data/lib/extensions/pdf-writer/pdf/writer/fonts/Helvetica.afm +3051 -0
  115. data/lib/extensions/pdf-writer/pdf/writer/fonts/MustRead.html +19 -0
  116. data/lib/extensions/pdf-writer/pdf/writer/fonts/Symbol.afm +213 -0
  117. data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Bold.afm +2588 -0
  118. data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-BoldItalic.afm +2384 -0
  119. data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Italic.afm +2667 -0
  120. data/lib/extensions/pdf-writer/pdf/writer/fonts/Times-Roman.afm +2419 -0
  121. data/lib/extensions/pdf-writer/pdf/writer/fonts/ZapfDingbats.afm +225 -0
  122. data/lib/extensions/pdf-writer/pdf/writer/graphics.rb +813 -0
  123. data/lib/extensions/pdf-writer/pdf/writer/graphics/imageinfo.rb +365 -0
  124. data/lib/extensions/pdf-writer/pdf/writer/lang.rb +43 -0
  125. data/lib/extensions/pdf-writer/pdf/writer/lang/en.rb +99 -0
  126. data/lib/extensions/pdf-writer/pdf/writer/object.rb +23 -0
  127. data/lib/extensions/pdf-writer/pdf/writer/object/action.rb +35 -0
  128. data/lib/extensions/pdf-writer/pdf/writer/object/annotation.rb +42 -0
  129. data/lib/extensions/pdf-writer/pdf/writer/object/catalog.rb +39 -0
  130. data/lib/extensions/pdf-writer/pdf/writer/object/contents.rb +65 -0
  131. data/lib/extensions/pdf-writer/pdf/writer/object/destination.rb +40 -0
  132. data/lib/extensions/pdf-writer/pdf/writer/object/encryption.rb +53 -0
  133. data/lib/extensions/pdf-writer/pdf/writer/object/font.rb +72 -0
  134. data/lib/extensions/pdf-writer/pdf/writer/object/fontdescriptor.rb +34 -0
  135. data/lib/extensions/pdf-writer/pdf/writer/object/fontencoding.rb +40 -0
  136. data/lib/extensions/pdf-writer/pdf/writer/object/image.rb +304 -0
  137. data/lib/extensions/pdf-writer/pdf/writer/object/info.rb +51 -0
  138. data/lib/extensions/pdf-writer/pdf/writer/object/outline.rb +30 -0
  139. data/lib/extensions/pdf-writer/pdf/writer/object/outlines.rb +30 -0
  140. data/lib/extensions/pdf-writer/pdf/writer/object/page.rb +195 -0
  141. data/lib/extensions/pdf-writer/pdf/writer/object/pages.rb +115 -0
  142. data/lib/extensions/pdf-writer/pdf/writer/object/procset.rb +46 -0
  143. data/lib/extensions/pdf-writer/pdf/writer/object/viewerpreferences.rb +74 -0
  144. data/lib/extensions/pdf-writer/pdf/writer/ohash.rb +58 -0
  145. data/lib/extensions/pdf-writer/pdf/writer/oreader.rb +25 -0
  146. data/lib/extensions/pdf-writer/pdf/writer/state.rb +48 -0
  147. data/lib/extensions/pdf-writer/pdf/writer/strokestyle.rb +138 -0
  148. data/lib/extensions/pdf-writer/transaction/simple.rb +486 -0
  149. data/lib/extensions/pdf-writer/transaction/simple/group.rb +146 -0
  150. data/lib/extensions/pdf-writer/transaction/simple/threadsafe.rb +68 -0
  151. data/lib/extensions/pdf-writer/transaction/simple/threadsafe/group.rb +36 -0
  152. data/lib/framework/builtinME.rb +0 -0
  153. data/lib/framework/dateOrig.rb +8 -2
  154. data/lib/framework/rational.rb +0 -0
  155. data/lib/framework/res/esri.wm.png +0 -0
  156. data/lib/framework/rho/rho.rb +6 -0
  157. data/lib/framework/rho/rhobluetooth.rb +0 -0
  158. data/lib/framework/rho/rhofsconnector.rb +0 -0
  159. data/lib/framework/rho/rhonativeviewmanager.rb +0 -0
  160. data/lib/framework/rhofsconnector.rb +0 -0
  161. data/lib/framework/rhom/rhom_object_factory.rb +8 -0
  162. data/lib/framework/rhomotoapi.rb +3 -2
  163. data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +9 -1
  164. data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc +1 -0
  165. data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h +26 -2
  166. data/platform/android/Rhodes/jni/src/callbacks.cpp +0 -5
  167. data/platform/android/Rhodes/jni/src/camera.cpp +1 -1
  168. data/platform/android/Rhodes/jni/src/fileapi.cpp +39 -19
  169. data/platform/android/Rhodes/jni/src/geolocation.cpp +3 -3
  170. data/platform/android/Rhodes/jni/src/mapview.cpp +206 -64
  171. data/platform/android/Rhodes/jni/src/nativeview.cpp +1 -1
  172. data/platform/android/Rhodes/jni/src/rhodes.cpp +13 -0
  173. data/platform/android/Rhodes/jni/src/rhodesapp.cpp +20 -0
  174. data/platform/android/Rhodes/jni/src/rhodessystem.cpp +36 -3
  175. data/platform/android/Rhodes/jni/src/signature.cpp +22 -2
  176. data/platform/android/Rhodes/res/drawable/alert_info.png +0 -0
  177. data/platform/android/Rhodes/res/drawable/esri.png +0 -0
  178. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java +17 -16
  179. data/platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java +4 -1
  180. data/platform/android/Rhodes/src/com/rhomobile/rhodes/MemoryInfoCollector.java +67 -0
  181. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +139 -114
  182. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +106 -13
  183. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +11 -3
  184. data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +71 -16
  185. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java +4 -1
  186. data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java +4 -1
  187. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java +22 -1
  188. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/Config.java +243 -0
  189. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java +19 -1
  190. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java +9 -1
  191. data/platform/android/Rhodes/src/com/rhomobile/rhodes/{RhodesActivityListener.java → extmanager/IRhoListener.java} +16 -12
  192. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java +63 -1
  193. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java +239 -14
  194. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhodesStartupListeners.java +9 -0
  195. data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/WebkitExtension.java +53 -0
  196. data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +27 -12
  197. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +124 -62
  198. data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +49 -137
  199. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +84 -114
  200. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SplashScreen.java +75 -82
  201. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +3 -2
  202. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Callout.java +4 -0
  203. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapBitmapManager.java +124 -0
  204. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +232 -43
  205. data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Request.java +193 -0
  206. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/IRhoCustomView.java +13 -0
  207. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +32 -23
  208. data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoVideoView.java +74 -0
  209. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java +6 -7
  210. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java +37 -0
  211. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality03.java +14 -1
  212. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality05.java +51 -38
  213. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality07.java +9 -1
  214. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java +48 -31
  215. data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java +15 -16
  216. data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +52 -15
  217. data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +20 -2
  218. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +1 -0
  219. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java +77 -34
  220. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java +9 -0
  221. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebChromeClient.java +105 -0
  222. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java +1 -1
  223. data/platform/android/build/RhodesSRC_build.files +8 -7
  224. data/platform/android/build/android.rake +326 -216
  225. data/platform/android/build/androidcommon.rb +27 -13
  226. data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java +27 -1
  227. data/platform/bb/RubyVM/src/j2me/io/File.java +104 -38
  228. data/platform/bb/build/bb.rake +1 -0
  229. data/platform/bb/build/runRAPC.bat +0 -0
  230. data/platform/bb/rhodes/resources/background.png +0 -0
  231. data/platform/bb/rhodes/resources/esri.png +0 -0
  232. data/platform/bb/rhodes/resources/mappin.png +0 -0
  233. data/platform/bb/rhodes/src/com/rho/rubyext/System.java +5 -1
  234. data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +2 -2
  235. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +0 -0
  236. data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +0 -0
  237. data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +0 -0
  238. data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +0 -0
  239. data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +0 -0
  240. data/platform/iphone/Classes/AppManager/AppManager.m +7 -1
  241. data/platform/iphone/Classes/Camera/PickImageDelegate.h +9 -0
  242. data/platform/iphone/Classes/Camera/PickImageDelegate.m +75 -4
  243. data/platform/iphone/Classes/GeoLocation/LocationController.h +8 -2
  244. data/platform/iphone/Classes/GeoLocation/LocationController.m +74 -76
  245. data/platform/iphone/Classes/InitMemoryInfoCollector.h +33 -0
  246. data/platform/iphone/Classes/InitMemoryInfoCollector.mm +52 -0
  247. data/platform/iphone/Classes/NativeView/NVViewController.h +0 -0
  248. data/platform/iphone/Classes/NativeView/NVViewController.m +34 -2
  249. data/platform/iphone/Classes/Rhodes.m +22 -2
  250. data/platform/iphone/Classes/Signature/SignatureDelegate.m +19 -0
  251. data/platform/iphone/Classes/Signature/SignatureViewController.h +0 -0
  252. data/platform/iphone/Classes/Signature/SignatureViewController.m +0 -0
  253. data/platform/iphone/Classes/SimpleMainView.h +0 -0
  254. data/platform/iphone/Classes/SimpleMainView.m +3 -3
  255. data/platform/iphone/ESRI/BluePushpin.png +0 -0
  256. data/platform/iphone/ESRI/BluePushpin@2x.png +0 -0
  257. data/platform/iphone/ESRI/esri.png +0 -0
  258. data/platform/iphone/ESRI/esri@2x.png +0 -0
  259. data/platform/iphone/rbuild/iphone.rake +75 -7
  260. data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +13 -4
  261. data/platform/linux/target/compiler/rubylinux +0 -0
  262. data/platform/mac/target/compiler/RubyMac +0 -0
  263. data/platform/osx/Rhodes Launcher/rhorunner.app/rhorunner b/data/platform/osx/Rhodes → Launcher/rhorunner.app/rhorunner +0 -0
  264. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
  265. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/keyedobjects.nib +0 -0
  266. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
  267. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
  268. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
  269. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +1 -1
  270. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
  271. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib +0 -0
  272. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqcorewlanbearer.dylib +0 -0
  273. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib +0 -0
  274. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib +0 -0
  275. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib +0 -0
  276. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib +0 -0
  277. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib +0 -0
  278. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib +0 -0
  279. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
  280. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
  281. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
  282. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
  283. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtga.dylib +0 -0
  284. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
  285. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_inspector.dylib +0 -0
  286. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_tcp.dylib +0 -0
  287. data/platform/osx/build/osx.rake +6 -8
  288. data/platform/shared/RhoConnectClient/RhoConnectClient.cpp +165 -33
  289. data/platform/shared/RhoConnectClient/RhoConnectClient.h +10 -1
  290. data/platform/shared/common/BundleManager.cpp +27 -16
  291. data/platform/shared/common/ExtManager.h +15 -2
  292. data/platform/shared/common/RhoConf.cpp +17 -2
  293. data/platform/shared/common/RhoConf.h +3 -1
  294. data/platform/shared/common/RhoDefs.h +6 -6
  295. data/platform/shared/common/RhoFatalError.h +1 -1
  296. data/platform/shared/common/RhoFile.cpp +9 -9
  297. data/platform/shared/common/RhoFilePath.h +7 -3
  298. data/platform/shared/common/RhoPort.h +3 -3
  299. data/platform/shared/common/RhoSystem.h +1 -1
  300. data/platform/shared/common/RhodesApp.cpp +426 -26
  301. data/platform/shared/common/RhodesApp.h +11 -3
  302. data/platform/shared/common/RhodesAppBase.cpp +4 -1
  303. data/platform/shared/common/StringConverter.h +3 -3
  304. data/platform/shared/common/app_build_capabilities.h +8 -0
  305. data/platform/shared/common/map/BaseMapEngine.cpp +302 -21
  306. data/platform/shared/common/map/BaseMapEngine.h +132 -6
  307. data/platform/shared/common/map/ESRIMapEngine.cpp +2 -1
  308. data/platform/shared/common/map/GeocodingMapEngine.cpp +22 -4
  309. data/platform/shared/common/map/GeocodingMapEngine.h +40 -0
  310. data/platform/shared/common/map/GoogleMapEngine.cpp +13 -1
  311. data/platform/shared/common/map/MapEngine.h +7 -0
  312. data/platform/shared/common/map/OSMMapEngine.cpp +12 -1
  313. data/platform/shared/json/JSONIterator.cpp +1 -1
  314. data/platform/shared/json/RJSONTokener.c +2 -0
  315. data/platform/shared/json/config.h +3 -3
  316. data/platform/shared/logging/RhoLog.cpp +12 -3
  317. data/platform/shared/logging/RhoLog.h +2 -1
  318. data/platform/shared/logging/RhoLogConf.cpp +147 -11
  319. data/platform/shared/logging/RhoLogConf.h +39 -1
  320. data/platform/shared/logging/RhoLogSink.cpp +1 -1
  321. data/platform/shared/net/HttpServer.cpp +8 -4
  322. data/platform/shared/net/INetRequest.cpp +7 -0
  323. data/platform/shared/net/INetRequest.h +2 -0
  324. data/platform/shared/net/RawSocket.cpp +1 -1
  325. data/platform/shared/qt/pbxproj2pro.pl +0 -0
  326. data/platform/shared/qt/pro_vcproj_diff.pl +0 -0
  327. data/platform/shared/qt/rhodes/QtMainWindow.cpp +1 -1
  328. data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h +2 -2
  329. data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp +2 -2
  330. data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +11 -1
  331. data/platform/shared/qt/rhodes/main.cpp +5 -5
  332. data/platform/shared/ruby/ext/alert/alert_wrap.c +8 -8
  333. data/platform/shared/ruby/ext/bluetooth/bluetooth.i +0 -0
  334. data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c +16 -9
  335. data/platform/shared/ruby/ext/camera/camera.i +2 -2
  336. data/platform/shared/ruby/ext/camera/camera_wrap.c +18 -3
  337. data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +37 -8
  338. data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +8 -8
  339. data/platform/shared/ruby/ext/mapview/mapview_wrap.c +16 -9
  340. data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +16 -9
  341. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager.i +0 -0
  342. data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +16 -9
  343. data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +8 -1
  344. data/platform/shared/ruby/ext/rho/rhoruby.c +7 -1
  345. data/platform/shared/ruby/ext/rho/rhoruby.h +1 -0
  346. data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +16 -9
  347. data/platform/shared/ruby/ext/signature/signature.i +0 -0
  348. data/platform/shared/ruby/ext/signature/signature_wrap.c +9 -9
  349. data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +16 -9
  350. data/platform/shared/ruby/ext/system/system_wrap.c +16 -9
  351. data/platform/shared/ruby/ext/webview/webview_wrap.c +16 -9
  352. data/platform/shared/ruby/gc.c +1 -0
  353. data/platform/shared/ruby/regint.h +6 -4
  354. data/platform/shared/ruby/vm.c +1 -0
  355. data/platform/shared/ruby/wince/wince.h +1 -1
  356. data/platform/shared/rubyext/System.cpp +1 -1
  357. data/platform/shared/shttpd/src/rdispatcher.c +3 -3
  358. data/platform/shared/shttpd/src/std_includes.h +1 -1
  359. data/platform/shared/sqlite/sqlite3.c +1 -0
  360. data/platform/shared/statistic/test/TestProfiling.cpp +1 -1
  361. data/platform/shared/stlport/build/lib/configure +0 -0
  362. data/platform/shared/stlport/build/lib/configure.bat +0 -0
  363. data/platform/shared/sync/SyncEngine.cpp +9 -12
  364. data/platform/shared/sync/SyncNotify.cpp +36 -3
  365. data/platform/shared/sync/SyncNotify.h +11 -4
  366. data/platform/shared/sync/SyncSource.cpp +32 -16
  367. data/platform/shared/sync/SyncSource.h +2 -3
  368. data/platform/shared/sync/SyncThread.cpp +13 -4
  369. data/platform/shared/sync/SyncThread.h +4 -0
  370. data/platform/shared/tcmalloc/page_heap.h +1 -1
  371. data/platform/shared/tcmalloc/rhomem.h +1 -1
  372. data/platform/shared/tcmalloc/windows/port.cpp +12 -3
  373. data/platform/shared/test/Tests.cpp +4 -4
  374. data/platform/shared/test/test_helper.cpp +4 -4
  375. data/platform/symbian/sqlite3/src/sqlite3.h +1 -1
  376. data/platform/win32/RhoSimulator/Microsoft.VC90.CRT.manifest +6 -0
  377. data/platform/win32/RhoSimulator/Microsoft.VC90.OpenMP.manifest +6 -0
  378. data/platform/win32/RhoSimulator/QtCore4.dll +0 -0
  379. data/platform/win32/RhoSimulator/QtGui4.dll +0 -0
  380. data/platform/win32/RhoSimulator/QtNetwork4.dll +0 -0
  381. data/platform/win32/RhoSimulator/QtWebKit4.dll +0 -0
  382. data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
  383. data/platform/win32/RhoSimulator/imageformats/qgif4.dll +0 -0
  384. data/platform/win32/RhoSimulator/imageformats/qico4.dll +0 -0
  385. data/platform/win32/RhoSimulator/imageformats/qjpeg4.dll +0 -0
  386. data/platform/win32/RhoSimulator/imageformats/qmng4.dll +0 -0
  387. data/platform/win32/RhoSimulator/imageformats/qsvg4.dll +0 -0
  388. data/platform/win32/RhoSimulator/imageformats/qtiff4.dll +0 -0
  389. data/platform/win32/RhoSimulator/libeay32.dll +0 -0
  390. data/platform/win32/RhoSimulator/msvcm90.dll +0 -0
  391. data/platform/win32/RhoSimulator/msvcp90.dll +0 -0
  392. data/platform/win32/RhoSimulator/msvcr90.dll +0 -0
  393. data/platform/win32/RhoSimulator/phonon4.dll +0 -0
  394. data/platform/win32/RhoSimulator/ssleay32.dll +0 -0
  395. data/platform/win32/RhoSimulator/vcomp90.dll +0 -0
  396. data/platform/win32/target/replaceicon/replaceicon.exe +0 -0
  397. data/platform/win32/target/updateresstring/updateresstring.exe +0 -0
  398. data/platform/wm/RhoLib/RhoLib.vcproj +394 -69
  399. data/platform/wm/build/build_inf.js +83 -23
  400. data/platform/wm/build/wm.rake +127 -81
  401. data/platform/wm/rhodes.sln +6 -6
  402. data/platform/wm/rhodes/DateTimePicker.h +2 -2
  403. data/platform/wm/rhodes/IBrowserEngine.h +3 -0
  404. data/platform/wm/rhodes/IEBrowserEngine.cpp +34 -2
  405. data/platform/wm/rhodes/IEBrowserEngine.h +4 -1
  406. data/platform/wm/rhodes/LicenseStub.cpp +73 -0
  407. data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java → wm/rhodes/LogMemory.cpp} +32 -20
  408. data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java → wm/rhodes/LogMemory.h} +11 -8
  409. data/platform/wm/rhodes/LogOptionsDlg.h +1 -1
  410. data/platform/wm/rhodes/LogView.cpp +10 -10
  411. data/platform/wm/rhodes/LogView.h +10 -10
  412. data/platform/wm/rhodes/MainWindow.cpp +431 -173
  413. data/platform/wm/rhodes/MainWindow.h +37 -19
  414. data/platform/wm/rhodes/MapView/MapViewManager.h +1 -1
  415. data/platform/wm/rhodes/OkCancelModalDialog.h +1 -1
  416. data/platform/wm/rhodes/Rhodes.cpp +210 -47
  417. data/platform/wm/rhodes/Rhodes.rc +38 -0
  418. data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +2 -2
  419. data/platform/wm/rhodes/bluetooth/Bluetooth.h +3 -3
  420. data/platform/wm/rhodes/camera/Camera.cpp +2 -1
  421. data/platform/wm/rhodes/camera/Camera.h +1 -1
  422. data/platform/wm/rhodes/resource.h +1 -1
  423. data/platform/wm/rhodes/rho/common/ExtManager.cpp +93 -5
  424. data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +2 -2
  425. data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +2 -2
  426. data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +13 -7
  427. data/platform/wm/rhodes/rhodes.vcproj +1409 -1008
  428. data/platform/wm/rhodes/simulator/MainWindowQt.h +1 -1
  429. data/platform/wm/rhodes/stdafx.h +2 -2
  430. data/platform/wm/rhoelements.sln +7 -9
  431. data/platform/wm/rubylib/rubylib.vcproj +62 -1
  432. data/platform/wm/sqlite3/sqlite3.vcproj +62 -1
  433. data/platform/wm/syncengine/syncengine.vcproj +62 -1
  434. data/platform/wm/tcmalloc/tcmalloc.vcproj +72 -53
  435. data/platform/wm/tools/detool/detool.cpp +1435 -1357
  436. data/platform/wp7/RhoRubyExtGen/GenerateInitializers.cmd +0 -0
  437. data/platform/wp7/RhoRubyLib/common/RhoLicense.cs +105 -0
  438. data/platform/wp7/RhoRubyLib/common/RhodesApp.cs +23 -5
  439. data/platform/wp7/RhoRubyLib/sync/SyncNotify.cs +5 -0
  440. data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs +22 -3
  441. data/platform/wp7/build/wp.rake +1 -0
  442. data/platform/wp7/rhodes/MainPage.xaml.cs +11 -0
  443. data/rakefile.rb +225 -59
  444. data/res/build-tools/7za.exe +0 -0
  445. data/res/build-tools/RhoAppRunner.exe +0 -0
  446. data/res/build-tools/RhoLogServer.exe +0 -0
  447. data/res/build-tools/RhoRuby.exe +0 -0
  448. data/res/build-tools/RubyMac +0 -0
  449. data/res/build-tools/detool.exe +0 -0
  450. data/res/build-tools/iphonesim/Source/iPhoneSimulator.m +1 -1
  451. data/res/build-tools/iphonesim/build/Release/iphonesim +0 -0
  452. data/res/build-tools/iphonesim/build/Release/iphonesim_43 +0 -0
  453. data/res/build-tools/license_rc.dll +0 -0
  454. data/res/build-tools/make.exe +0 -0
  455. data/res/build-tools/rubylinux +0 -0
  456. data/res/build-tools/swig_patch/Lib/typemaps/fragments.swg +235 -0
  457. data/res/build-tools/wmdc_connect.exe +0 -0
  458. data/res/build-tools/wp7explorer.exe +0 -0
  459. data/res/generators/rhogen.rb +2 -2
  460. data/res/generators/templates/application/app/Settings/controller.rb +1 -1
  461. data/res/generators/templates/application/app/layout.erb +1 -1
  462. data/res/generators/templates/application/app/loading.png +0 -0
  463. data/res/generators/templates/application/public/css/re_webkit.css +736 -0
  464. data/res/generators/templates/application/public/css/windows_mobile.css +0 -0
  465. data/res/generators/templates/application/public/images/listArrow.png +0 -0
  466. data/res/generators/templates/application/public/jqmobile/images/ajax-loader.png +0 -0
  467. data/res/generators/templates/application/public/jqmobile/images/icons-18-black.png +0 -0
  468. data/res/generators/templates/application/public/jqmobile/images/icons-18-white.png +0 -0
  469. data/res/generators/templates/application/public/jqmobile/images/icons-36-black.png +0 -0
  470. data/res/generators/templates/application/public/jqmobile/images/icons-36-white.png +0 -0
  471. data/res/generators/templates/application/public/js/syncengine.js +409 -52
  472. data/res/generators/templates/extension/extensions/montana/ext/build +0 -0
  473. data/res/generators/templates/extension/extensions/montana/ext/build.bat +0 -0
  474. data/res/generators/templates/extension/extensions/montana/ext/montana/platform/android/Rakefile +10 -10
  475. data/res/generators/templates/spec/app/SpecRunner/controller.rb +2 -0
  476. data/res/libs/motorolalicence/android/MotorolaLicence.h +13 -0
  477. data/res/libs/motorolalicence/android/libMotorolaLicence.a +0 -0
  478. data/res/libs/motorolalicence/iphone/MotorolaLicence.h +13 -0
  479. data/res/libs/motorolalicence/iphone/libMotorolaLicence.a +0 -0
  480. data/rhodes.gemspec +1 -1
  481. data/spec/framework_spec/app/SpecRunner/controller.rb +2 -0
  482. data/spec/phone_spec/app/SpecRunner/controller.rb +2 -0
  483. data/version +1 -1
  484. metadata +487 -412
  485. data/Manifest.txt +0 -7960
  486. data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java +0 -12
  487. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +0 -52
  488. data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java +0 -62
  489. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/phonon.framework/Versions/4/phonon +0 -0
  490. data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/phonon_backend/libphonon_qt7.dylib +0 -0
  491. data/platform/win32/RhoSimulator/Microsoft.VC80.CRT.manifest +0 -8
  492. data/platform/win32/RhoSimulator/Microsoft.VC80.OpenMP.manifest +0 -7
  493. data/platform/win32/RhoSimulator/msvcm80.dll +0 -0
  494. data/platform/win32/RhoSimulator/msvcp80.dll +0 -0
  495. data/platform/win32/RhoSimulator/msvcr80.dll +0 -0
  496. data/platform/win32/RhoSimulator/vcomp.dll +0 -0
  497. data/rhomobile-debug-1.0.6.gem +0 -0
@@ -27,12 +27,19 @@
27
27
  package com.rhomobile.rhodes;
28
28
 
29
29
  import java.io.File;
30
+ import java.io.FileInputStream;
30
31
  import java.io.IOException;
32
+ import java.io.InputStream;
33
+ import java.net.URI;
31
34
  import java.util.Collection;
32
35
  import java.util.Vector;
33
36
 
37
+ import com.rhomobile.rhodes.extmanager.Config;
34
38
  import com.rhomobile.rhodes.extmanager.RhoExtManager;
39
+ import com.rhomobile.rhodes.extmanager.RhoExtManagerImpl;
40
+ import com.rhomobile.rhodes.extmanager.WebkitExtension;
35
41
  import com.rhomobile.rhodes.file.RhoFileApi;
42
+ import com.rhomobile.rhodes.signature.Signature;
36
43
  import com.rhomobile.rhodes.util.Utils;
37
44
  import com.rhomobile.rhodes.util.Utils.AssetsSource;
38
45
  import com.rhomobile.rhodes.util.Utils.FileSource;
@@ -41,6 +48,7 @@ import android.app.Application;
41
48
  import android.content.Context;
42
49
  import android.content.pm.ApplicationInfo;
43
50
  import android.content.pm.PackageManager.NameNotFoundException;
51
+ import android.os.Environment;
44
52
  import android.os.Handler;
45
53
  import android.os.Process;
46
54
  import android.util.Log;
@@ -49,6 +57,7 @@ public class RhodesApplication extends Application{
49
57
 
50
58
  private static final String TAG = RhodesApplication.class.getSimpleName();
51
59
  private static Handler mHandler;
60
+
52
61
  static AppEventObserver sRhodesAppActiveWatcher;
53
62
  static {
54
63
  NativeLibraries.load();
@@ -132,12 +141,88 @@ public class RhodesApplication extends Application{
132
141
  initClassLoader(getClassLoader());
133
142
 
134
143
  ApplicationInfo appInfo = getAppInfo();
144
+ //File sharedDir = getExternalFilesDir(null);
145
+ String sharedPath = null;
135
146
  String rootPath;
136
147
 
148
+ rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir, sharedPath);
149
+ Log.d(TAG, "Root path: " + rootPath);
150
+
151
+ InputStream configIs = null;
152
+ Config config = new Config();
137
153
  try {
138
- rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
139
- Log.d(TAG, "Root path: " + rootPath);
154
+ if (Capabilities.MOTOROLA_ENABLED || Capabilities.WEBKIT_BROWSER_ENABLED || Capabilities.MOTOROLA_BROWSER_ENABLED) {
155
+ String externalSharedPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + appInfo.packageName;
156
+ File configXmlFile = new File(externalSharedPath, "Config.xml");
157
+ if (configXmlFile.exists()) {
158
+ Log.i(TAG, "Loading Config.xml from " + configXmlFile.getAbsolutePath());
159
+ configIs = new FileInputStream(configXmlFile);
160
+ config.load(configIs, configXmlFile.getParent());
161
+ } else {
162
+ Log.i(TAG, "Loading Config.xml from resources");
163
+ configIs = getResources().openRawResource(RhoExtManager.getResourceId("raw", "config"));
164
+ config.load(configIs, externalSharedPath);
165
+ }
166
+ if (Capabilities.SHARED_RUNTIME_ENABLED) {
167
+ String startPage = config.getSetting("startpage");
168
+ Log.i(TAG,"Start page: " + startPage);
169
+ if (startPage != null) {
170
+ URI startUri = new URI(startPage);
171
+ sharedPath = new File(startUri.getPath()).getParent();
172
+ rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir, sharedPath);
173
+ }
174
+ String logURI = config.getSetting("LogURI");
175
+ Log.i(TAG, "Log URI: " + logURI);
176
+ if (logURI != null) {
177
+ URI logUri = new URI(logURI);
178
+ if (logUri.getScheme().equalsIgnoreCase("file")) {
179
+ String logPath = new File(logUri.getPath()).getParent();
180
+ RhoFileApi.initLogPath(logPath);
181
+ }
182
+ }
183
+ }
184
+ RhoExtManagerImpl extManager = RhoExtManager.getImplementationInstance();
185
+
186
+ String logError = config.getSetting("LogError");
187
+ if (logError != null)
188
+ extManager.enableLogLevelError(logError.equals("1"));
189
+
190
+ String logWarning = config.getSetting("LogWarning");
191
+ if (logWarning != null)
192
+ extManager.enableLogLevelWarning(logWarning.equals("1"));
193
+
194
+ String logInfo = config.getSetting("LogInfo");
195
+ if (logInfo != null)
196
+ extManager.enableLogLevelInfo(logInfo.equals("1"));
197
+
198
+ String logUser = config.getSetting("LogUser");
199
+ if (logUser != null)
200
+ extManager.enableLogLevelUser(logUser.equals("1"));
201
+
202
+ String logDebug = config.getSetting("LogDebug");
203
+ if (logDebug != null)
204
+ extManager.enableLogLevelDebug(logDebug.equals("1"));
205
+ }
206
+ } catch (Throwable e) {
207
+ Log.e(TAG, "Error loading RhoElements configuraiton ("+e.getClass().getSimpleName()+"): " + e.getMessage());
208
+ } finally {
209
+ if (configIs != null) {
210
+ try {
211
+ configIs.close();
212
+ } catch (IOException e) {
213
+ // just nothing to do
214
+ }
215
+ }
216
+ }
140
217
 
218
+ boolean hashChanged = isAppHashChanged(rootPath);
219
+ if (hashChanged) {
220
+ Log.i(TAG, "Application hash was changed");
221
+
222
+ RhoFileApi.initialCopy(this, new String[] {"hash", "rho.dat", "apps/rhoconfig.txt"});
223
+ }
224
+
225
+ try {
141
226
  RhoFileApi.init(this);
142
227
  } catch (IOException e) {
143
228
  Log.e(TAG, e.getMessage());
@@ -145,32 +230,40 @@ public class RhodesApplication extends Application{
145
230
  return;
146
231
  }
147
232
 
148
- if (this.isAppHashChanged(rootPath)) {
233
+ setupRhodesApp();
234
+
235
+ if (hashChanged) {
149
236
  try {
150
- Log.i(TAG, "Application hash was changed");
237
+ RhoFileApi.removeBundleUpgrade();
238
+ RhoFileApi.copy("apps/rhoconfig.txt");
151
239
 
152
240
  File libDir = new File(rootPath, "lib");
153
241
  File testLib = new File(libDir.getPath(), "rhoframework.iseq");
154
242
  if(libDir.isDirectory() && testLib.isFile())
155
243
  {
156
- Log.i(TAG, "Updating from very old rhodes version, clean filesystem.");
244
+ Logger.I(TAG, "Updating from very old rhodes version, clean filesystem.");
157
245
  Utils.deleteChildrenIgnoreFirstLevel(new File(rootPath, "apps"), "rhoconfig.txt");
158
246
  Utils.deleteRecursively(libDir);
159
247
  }
160
248
 
161
- rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
162
- Log.d(TAG, "Root path: " + rootPath);
163
-
164
- RhoFileApi.init(this);
165
- RhoFileApi.copy("hash");
249
+ rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir, sharedPath);
166
250
  } catch (IOException e) {
167
- Log.e(TAG, e.getMessage());
251
+ Logger.E(TAG, e.getMessage());
168
252
  stop();
169
253
  return;
170
254
  }
171
255
  }
172
-
173
- setupRhodesApp();
256
+
257
+ Logger.T(TAG, "Root path: " + rootPath);
258
+
259
+ RhoFileApi.setFsModeTransparrent(true);
260
+
261
+ if(Capabilities.WEBKIT_BROWSER_ENABLED || Capabilities.MOTOROLA_BROWSER_ENABLED) {
262
+ WebkitExtension.registerWebkitExtension(config);
263
+ }
264
+ Signature.registerSignatureCaptureExtension();
265
+ RhoExtManager.getImplementationInstance().createRhoListeners();
266
+
174
267
  Logger.I(TAG, "Initialized");
175
268
  }
176
269
  private static boolean sRhodesActivityStarted = false;
@@ -248,6 +248,11 @@ public class RhodesService extends Service {
248
248
 
249
249
  public static native String getInvalidSecurityTokenMessage();
250
250
 
251
+ public static native void resetHttpLogging(String http_log_url);
252
+
253
+ public static native boolean isMotorolaLicencePassed();
254
+
255
+
251
256
  public static RhodesService getInstance() {
252
257
  return sInstance;
253
258
  }
@@ -408,6 +413,9 @@ public class RhodesService extends Service {
408
413
  }
409
414
 
410
415
  private void handleCommand(Intent intent, int startId) {
416
+ if (intent == null) {
417
+ return;
418
+ }
411
419
  String source = intent.getStringExtra(INTENT_SOURCE);
412
420
  Log.i(TAG, "handleCommand: startId=" + startId + ", source=" + source);
413
421
  if (source == null)
@@ -804,7 +812,7 @@ public class RhodesService extends Service {
804
812
  }
805
813
  else if (name.equalsIgnoreCase("webview_framework")) {
806
814
  //return "WEBKIT/" + Build.VERSION.RELEASE;
807
- return RhodesActivity.safeGetInstance().getMainView().getWebView(-1).getView().getClass().getCanonicalName();
815
+ return RhodesActivity.safeGetInstance().getMainView().getWebView(-1).getEngineId();
808
816
  }
809
817
  }
810
818
  catch (Exception e) {
@@ -1259,14 +1267,14 @@ public class RhodesService extends Service {
1259
1267
 
1260
1268
  private void restartGeoLocationIfNeeded() {
1261
1269
  if (mNeedGeoLocationRestart) {
1262
- GeoLocation.restart();
1270
+ //GeoLocation.restart();
1263
1271
  mNeedGeoLocationRestart = false;
1264
1272
  }
1265
1273
  }
1266
1274
 
1267
1275
  private void stopGeoLocation() {
1268
1276
  mNeedGeoLocationRestart = GeoLocation.isAvailable();
1269
- GeoLocation.stop();
1277
+ //GeoLocation.stop();
1270
1278
  }
1271
1279
 
1272
1280
  private void restoreWakeLockIfNeeded() {
@@ -26,6 +26,7 @@
26
26
 
27
27
  package com.rhomobile.rhodes;
28
28
 
29
+ import com.rhomobile.rhodes.mainview.MainView;
29
30
  import com.rhomobile.rhodes.util.PerformOnUiThread;
30
31
 
31
32
  import android.net.Uri;
@@ -45,10 +46,14 @@ public class WebView {
45
46
  url = u;
46
47
  index = i;
47
48
  }
48
-
49
- public void run() {
50
- RhodesService r = RhodesService.getInstance();
51
- r.getMainView().navigate(url, index);
49
+
50
+ public void run() {
51
+ try {
52
+ MainView mainView = RhodesActivity.safeGetInstance().getMainView();
53
+ mainView.navigate(url, index);
54
+ } catch (Throwable ex) {
55
+ Logger.E(TAG, ex);
56
+ }
52
57
  }
53
58
  };
54
59
 
@@ -126,6 +131,38 @@ public class WebView {
126
131
  }
127
132
  };
128
133
 
134
+
135
+ ///*** SetZoomTask ***
136
+ ///
137
+ private static class SetZoomTask implements Runnable {
138
+ private int zoom;
139
+ private int index;
140
+ SetZoomTask(int z, int i) {zoom = z; index = i;}
141
+ @Override
142
+ public void run() {
143
+ try {
144
+ RhodesActivity.safeGetInstance().getMainView().getWebView(index).setZoom(zoom);
145
+ } catch (Throwable e) {
146
+ Logger.E(TAG, e);
147
+ }
148
+ }
149
+ };
150
+
151
+ ///*** SetTextZoomTask ***
152
+ ///
153
+ private static class SetTextZoomTask implements Runnable {
154
+ private int zoom;
155
+ private int index;
156
+ SetTextZoomTask(int z, int i) {zoom = z; index = i;}
157
+ @Override
158
+ public void run() {
159
+ try {
160
+ RhodesActivity.safeGetInstance().getMainView().getWebView(index).setTextZoom(zoom);
161
+ } catch (Throwable e) {
162
+ Logger.E(TAG, e);
163
+ }
164
+ }
165
+ };
129
166
 
130
167
  public static void navigate(String url, int index) {
131
168
  try {
@@ -162,19 +199,19 @@ public class WebView {
162
199
  Logger.E(TAG, e);
163
200
  }
164
201
  }
165
-
166
- public static int activeTab() {
167
- try {
168
- RhodesService r = RhodesService.getInstance();
169
- return r.getMainView().activeTab();
170
- }
171
- catch (Exception e) {
202
+
203
+ public static int activeTab() {
204
+ try {
205
+ MainView mainView = RhodesActivity.safeGetInstance().getMainView();
206
+ return mainView != null ? mainView.activeTab() : 0;
207
+ }
208
+ catch (Exception e) {
172
209
  Logger.E(TAG, e);
173
- }
174
-
175
- return 0;
176
- }
177
-
210
+ }
211
+
212
+ return 0;
213
+ }
214
+
178
215
  public static void executeJs(String js, int index) {
179
216
  try {
180
217
  PerformOnUiThread.exec(new NavigateTask("javascript:" + js, index));
@@ -201,4 +238,22 @@ public class WebView {
201
238
  Logger.E(TAG, e);
202
239
  }
203
240
  }
241
+
242
+ public static void setZoom(int zoom) {
243
+ try {
244
+ PerformOnUiThread.exec(new SetZoomTask(zoom, activeTab()));
245
+ }
246
+ catch (Exception e) {
247
+ Logger.E(TAG, e);
248
+ }
249
+ }
250
+
251
+ public static void setTextZoom(int zoom) {
252
+ try {
253
+ PerformOnUiThread.exec(new SetTextZoomTask(zoom, activeTab()));
254
+ }
255
+ catch (Exception e) {
256
+ Logger.E(TAG, e);
257
+ }
258
+ }
204
259
  }
@@ -169,7 +169,10 @@ class CameraNewService implements CameraService {
169
169
 
170
170
  public boolean isAutoFocusSupported(android.hardware.Camera camera) {
171
171
  String focus_mode = camera.getParameters().getFocusMode();
172
- boolean auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
172
+ boolean auto_focus_supported = false;
173
+ if ( focus_mode != null ) {
174
+ auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
175
+ }
173
176
  return auto_focus_supported;
174
177
  }
175
178
 
@@ -139,7 +139,10 @@ class CameraSemiService implements CameraService {
139
139
 
140
140
  public boolean isAutoFocusSupported(android.hardware.Camera camera) {
141
141
  String focus_mode = camera.getParameters().getFocusMode();
142
- boolean auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
142
+ boolean auto_focus_supported = false;
143
+ if ( focus_mode != null ) {
144
+ auto_focus_supported = (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focus_mode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
145
+ }
143
146
  return auto_focus_supported;
144
147
  }
145
148
 
@@ -1,5 +1,7 @@
1
1
  package com.rhomobile.rhodes.extmanager;
2
2
 
3
+ import android.graphics.Rect;
4
+
3
5
  public abstract class AbstractRhoExtension implements IRhoExtension {
4
6
 
5
7
  @Override
@@ -39,6 +41,10 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
39
41
  public void onConfirm(IRhoExtManager extManager, String message, IRhoExtData ext) {
40
42
  }
41
43
 
44
+ @Override
45
+ public void onPrompt(IRhoExtManager extManager, String message, String defaultResponse, IRhoExtData ext) {
46
+ }
47
+
42
48
  @Override
43
49
  public void onSelect(IRhoExtManager extManager, String[] items, int selected, IRhoExtData ext) {
44
50
  }
@@ -56,7 +62,7 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
56
62
  }
57
63
 
58
64
  @Override
59
- public void onInputMethod(IRhoExtManager extManager, boolean enabled, IRhoExtData ext) {
65
+ public void onInputMethod(IRhoExtManager extManager, boolean enabled, String type, Rect rect, IRhoExtData ext) {
60
66
  }
61
67
 
62
68
  @Override
@@ -67,4 +73,19 @@ public abstract class AbstractRhoExtension implements IRhoExtension {
67
73
  public void onAppActivate(IRhoExtManager extManager, boolean bActivate) {
68
74
  }
69
75
 
76
+ //@Override
77
+ //EkiohLocation getCachedLocation(IRhoExtManager extManager, IRhoExtData ext);
78
+
79
+ @Override
80
+ public void startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoExtData ext) {
81
+ }
82
+
83
+ @Override
84
+ public void stopLocationUpdates(IRhoExtManager extManager, IRhoExtData ext) {
85
+ }
86
+
87
+ @Override
88
+ public void onAuthRequired(IRhoExtManager extManager, String type, String url, String realm, IRhoExtData ext) {
89
+ }
90
+
70
91
  }
@@ -0,0 +1,243 @@
1
+ package com.rhomobile.rhodes.extmanager;
2
+
3
+ import java.io.BufferedReader;
4
+ import java.io.FileNotFoundException;
5
+ import java.io.IOException;
6
+ import java.io.InputStream;
7
+ import java.io.InputStreamReader;
8
+ import java.util.ArrayList;
9
+ import java.util.HashMap;
10
+
11
+ import org.xml.sax.Attributes;
12
+ import org.xml.sax.ContentHandler;
13
+ import org.xml.sax.Locator;
14
+ import org.xml.sax.SAXException;
15
+ import android.util.Xml;
16
+
17
+ import com.rhomobile.rhodes.Logger;
18
+
19
+
20
+ // TODO - make access to map thread-safe
21
+
22
+ /**
23
+ * @author Geoff Day (XFH386, Initial Creation)
24
+ * @author Ben Kennedy (NCVT73, Added resource control to load())
25
+ */
26
+ public class Config
27
+ {
28
+ private static final String TAG = Config.class.getSimpleName();
29
+
30
+ public static final String SETTING_AUTOROTATE = "autorotate";
31
+ public static final String SETTING_BADLINK_FILE = "badlinkuri";
32
+ public static final String SETTING_DEBUG_BUTTONS_ENABLED = "debugbuttonsenabled";
33
+ public static final String SETTING_FULLSCREEN = "fullscreen";
34
+ public static final String SETTING_LOG_ERROR = "logerror";
35
+ public static final String SETTING_LOG_WARNING = "logwarning";
36
+ public static final String SETTING_LOG_INFO = "loginfo";
37
+ public static final String SETTING_LOG_USER = "loguser";
38
+ public static final String SETTING_LOG_DEBUG = "logdebug";
39
+ public static final String SETTING_LOG_URI = "loguri";
40
+ public static final String SETTING_LOG_PORT = "logport";
41
+ public static final String SETTING_LOG_PROTOCOL = "logprotocol";
42
+ public static final String SETTING_LOG_SIZE = "logmaxsize";
43
+ public static final String SETTING_NAV_TIMEOUT = "navtimeout";
44
+ public static final String SETTING_HTTP_PROXY = "http_proxy";
45
+ public static final String SETTING_HTTPS_PROXY = "https_proxy";
46
+ public static final String SETTING_PROXY_EXCEPTIONS = "no_proxy";
47
+ public static final String SETTING_REGEX_FILE = "regexfile";
48
+ public static final String SETTING_SIGNAL_REFRESH = "signalrefresh";
49
+ public static final String SETTING_SIP_ENABLE = "enablesip";
50
+ public static final String SETTING_START_PAGE = "startpage";
51
+ public static final String SETTING_HOURGLASS_LEFT = "hourglassleft";
52
+ public static final String SETTING_HOURGLASS_TOP = "hourglasstop";
53
+ public static final String SETTING_HOURGLASS_ENABLED = "hourglassenabled";
54
+ public static final String SETTING_P1_ENABLED = "enablefunctionkey_f1";
55
+ public static final String SETTING_P2_ENABLED = "enablefunctionkey_f2";
56
+ public static final String SETTING_P3_ENABLED = "enablefunctionkey_f3";
57
+ public static final String METATAG = "metatag";
58
+ public static final String GEOLOCATION_ENABLED = "geolocationenabled";
59
+
60
+ public static final String[] REQUIRED_OPTIONS = { };
61
+
62
+ public static final String ERROR_TAG_NOT_FOUND = "Required tag: \"%1$s\" not found.";
63
+ public static final String ERROR_TAG_EMPTY = "Required tag: \"%1$s\" cannot be empty.";
64
+ public static final String ERROR_CONFIG_READ = "Config.xml read error";
65
+ public static final String ERROR_BAD_XML = "Bad xml in Config.xml: ";
66
+ public static final String ERROR_FILE_NOT_FOUND = "Config.xml cannot be found and attempts in creating Config.xml have failed. Make sure the device is not connected to a PC";
67
+
68
+ private static ArrayList<String> defaultMetaTag = null;
69
+
70
+ private HashMap<String, String> settings;
71
+
72
+ /**
73
+ * Initialises the config class
74
+ */
75
+ public Config() {
76
+ settings = new HashMap<String, String>();
77
+ }
78
+
79
+ /**
80
+ * Loads the configuration file from the input stream
81
+ */
82
+ public void load(InputStream is, String installDir) throws ConfigException
83
+ {
84
+ BufferedReader reader = null;
85
+ try
86
+ {
87
+ reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
88
+ Xml.parse(reader, new ConfigHandler(installDir));
89
+ }
90
+ catch (SAXException e)
91
+ {
92
+ e.printStackTrace();
93
+ throw new ConfigException(ERROR_BAD_XML);
94
+ }
95
+ catch (FileNotFoundException e)
96
+ {
97
+ e.printStackTrace();
98
+ throw new ConfigException(ERROR_FILE_NOT_FOUND);
99
+ }
100
+ catch (IOException e)
101
+ {
102
+ e.printStackTrace();
103
+ throw new ConfigException(ERROR_CONFIG_READ);
104
+ }
105
+ finally
106
+ {
107
+ if(reader != null)
108
+ {
109
+ try
110
+ {
111
+ reader.close();
112
+ }
113
+ catch (IOException e)
114
+ {
115
+ //Cant do anything
116
+ }
117
+ }
118
+ }
119
+
120
+ //Check to see if start page and bad link are there.
121
+ for(String requiredSetting: REQUIRED_OPTIONS)
122
+ {
123
+ if(settings.get(requiredSetting) == null)
124
+ {
125
+ throw new ConfigException(String.format(ERROR_TAG_NOT_FOUND, requiredSetting));
126
+ }
127
+ else if(settings.get(requiredSetting).equals(""))
128
+ {
129
+ throw new ConfigException(String.format(ERROR_TAG_EMPTY, requiredSetting));
130
+ }
131
+ }
132
+ }
133
+ /**
134
+ * Get string setting value from the name
135
+ * @param name in lowercase
136
+ * @return setting string value
137
+ */
138
+ public String getSetting(String name) {
139
+ if (name == null) {
140
+ return null;
141
+ }
142
+ String value = settings.get(name.toLowerCase());
143
+ if (value == null) {
144
+ int slashindex = name.lastIndexOf("\\");
145
+ if (slashindex >= 0) {
146
+ String fixedname = name.substring(slashindex+1);
147
+ value = settings.get(fixedname.toLowerCase());
148
+ }
149
+ }
150
+ Logger.T(TAG, "getSettings: " + name + "=>" + value);
151
+ return value;
152
+ }
153
+
154
+ /**
155
+ * Get string setting value from the name
156
+ * @param name in lowercase
157
+ * @return setting boolean value
158
+ */
159
+ boolean getBooleanSetting(String name) {
160
+ try {
161
+ return getSetting(name).equals("1");
162
+ }
163
+ catch(Exception e){return false;}
164
+ }
165
+
166
+ private class ConfigHandler implements ContentHandler
167
+ {
168
+ private String mInstallDir = "";
169
+
170
+ public ConfigHandler(String installDir) {
171
+ mInstallDir = installDir;
172
+ }
173
+
174
+ @Override
175
+ public void characters(char[] ch, int start, int length) throws SAXException {}
176
+
177
+ @Override
178
+ public void endDocument() throws SAXException {}
179
+
180
+ @Override
181
+ public void endElement(String uri, String localName, String qName) throws SAXException {}
182
+
183
+ @Override
184
+ public void endPrefixMapping(String prefix) throws SAXException {}
185
+
186
+ @Override
187
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
188
+
189
+ @Override
190
+ public void processingInstruction(String target, String data) throws SAXException {}
191
+
192
+ @Override
193
+ public void setDocumentLocator(Locator locator) {}
194
+
195
+ @Override
196
+ public void skippedEntity(String name) throws SAXException {}
197
+
198
+ @Override
199
+ public void startDocument() throws SAXException {}
200
+
201
+ @Override
202
+ public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
203
+ // For now add each setting to the map
204
+ String setting = null;
205
+ int length = atts.getLength();
206
+ for (int i = 0; i < length; i++) {
207
+ if (atts.getQName(i).equalsIgnoreCase("value")) {
208
+ setting = atts.getValue(i);
209
+ }
210
+ }
211
+
212
+ if (setting != null) {
213
+ if (qName.equalsIgnoreCase(METATAG)) {
214
+ if (defaultMetaTag == null) {
215
+ defaultMetaTag = new ArrayList<String>();
216
+ }
217
+ defaultMetaTag.add(setting);
218
+ } else {
219
+ String value = setting.replace("%INSTALLDIR%", mInstallDir);
220
+ String name = qName.toLowerCase();//localName.toLowerCase();
221
+ settings.put(name, value);
222
+ Logger.T(TAG, "Set RhoElements config value: " + name + "=>" + value);
223
+ }
224
+ } else {
225
+ String name = qName.toLowerCase();//localName.toLowerCase();
226
+ settings.put(name, null);
227
+ Logger.T(TAG, "Set RhoElements config value: " + name + "=> null");
228
+ }
229
+ }
230
+
231
+ @Override
232
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {}
233
+ }
234
+
235
+ public class ConfigException extends Exception {
236
+ private static final long serialVersionUID = 262061320448820494L;
237
+
238
+ public ConfigException(String detailMessage) {
239
+ super(detailMessage);
240
+ }
241
+
242
+ }
243
+ }