Merge branch 'master' of github.com:mit-cml/app-inventor-private into videocapture

README

+Welcome to the Source code of MIT App Inventor.
+
+You can learn more about MIT App Inventor at http://appinventor.mit.edu.
+
+This code is designed to be run in Google's App Engine. MIT runs a
+public instance that all are welcome to use to build App Inventor
+Applications. You do not need to compile or use this code if you wish
+to build MIT App Inventor applications.
+
+We provide this code for reference and for experienced people who wish
+to operate their own App Inventor instance.
+
+To build: cd to appinventor and type "ant."
+
+This code is tested and known to work with Sun Java 6. There are
+issues with using OpenJDK.

appinventor/components/src/com/google/appinventor/components/runtime/WebViewer.java

@@ -168,7 +168,7 @@ public final class WebViewer extends AndroidViewComponent {
       "Home URL if new pages were visited by following links.",
       category = PropertyCategory.BEHAVIOR)
   public String CurrentUrl() {
-    return webview.getUrl();
+    return (webview.getUrl() == null) ? "" : webview.getUrl();
   }
 
   /**
@@ -180,7 +180,7 @@ public final class WebViewer extends AndroidViewComponent {
       description = "Title of the page currently viewed",
       category = PropertyCategory.BEHAVIOR)
   public String CurrentPageTitle() {
-    return webview.getTitle();
+    return (webview.getTitle() == null) ? "" : webview.getTitle();
   }