5x22 - setFullTitle, and fix to NPE in receive broadcast events.

rjmatthews62 · rjmatthews62 · commit 01530b632c8a · 2012-07-06T10:42:04.000+10:00
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/EventFacade.java b/android/Common/src/com/googlecode/android_scripting/facade/EventFacade.java
@@ -360,12 +360,16 @@ public BroadcastListener(EventFacade parent, boolean enqueue) {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-      Bundle data = (Bundle) intent.getExtras().clone();
+      Bundle data;
+      if (intent.getExtras() != null) {
+        data = (Bundle) intent.getExtras().clone();
+      } else {
+        data = new Bundle();
+      }
       data.putString("action", intent.getAction());
       try {
         mParent.eventPost("sl4a", JsonBuilder.build(data).toString(), mEnQueue);
       } catch (JSONException e) {
-        // TODO Auto-generated catch block
         e.printStackTrace();
       }
     }
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
@@ -35,10 +35,16 @@ public class FullScreenTask extends FutureActivityTask<Object> implements OnClic
   protected final CountDownLatch mShowLatch = new CountDownLatch(1);
   protected Handler mHandler = null;
   private List<Integer> mOverrideKeys;
+  protected String mTitle;
 
-  public FullScreenTask(String layout) {
+  public FullScreenTask(String layout, String title) {
     super();
     mLayout = layout;
+    if (title != null) {
+      mTitle = title;
+    } else {
+      mTitle = "SL4a";
+    }
   }
 
   @Override
@@ -60,7 +66,7 @@ public void onCreate() {
       mInflater.setIdList(R.id.class);
     }
     getActivity().setContentView(mView);
-    getActivity().setTitle("SL4A Title");
+    getActivity().setTitle(mTitle);
     mInflater.setClickListener(mView, this, this);
     mShowLatch.countDown();
   }
@@ -240,6 +246,22 @@ public void run() {
     }
   }
 
+  private class SetTitle implements Runnable {
+    String mSetTitle;
+    CountDownLatch mLatch = new CountDownLatch(1);
+
+    SetTitle(String title) {
+      mSetTitle = title;
+    }
+
+    @Override
+    public void run() {
+      mTitle = mSetTitle;
+      getActivity().setTitle(mSetTitle);
+      mLatch.countDown();
+    }
+  }
+
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {
     Map<String, String> data = new HashMap<String, String>();
@@ -279,4 +301,14 @@ public void setLayout(String layout) {
     }
   }
 
+  public void setTitle(String title) {
+    SetTitle p = new SetTitle(title);
+    mHandler.post(p);
+    try {
+      p.mLatch.await();
+    } catch (InterruptedException e) {
+      mInflater.getErrors().add(e.toString());
+    }
+  }
+
 }
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
@@ -549,13 +549,17 @@ public boolean onPrepareOptionsMenu(Menu menu) {
    */
   @Rpc(description = "Show Full Screen.")
   public List<String> fullShow(
-      @RpcParameter(name = "layout", description = "String containing View layout") String layout)
+      @RpcParameter(name = "layout", description = "String containing View layout") String layout,
+      @RpcParameter(name = "title", description = "Activity Title") @RpcOptional String title)
       throws InterruptedException {
     if (mFullScreenTask != null) {
       // fullDismiss();
       mFullScreenTask.setLayout(layout);
+      if (title != null) {
+        mFullScreenTask.setTitle(title);
+      }
     } else {
-      mFullScreenTask = new FullScreenTask(layout);
+      mFullScreenTask = new FullScreenTask(layout, title);
       mFullScreenTask.setEventFacade(mEventFacade);
       mFullScreenTask.setUiFacade(this);
       mFullScreenTask.setOverrideKeys(mOverrideKeys);
@@ -611,6 +615,15 @@ public String fullSetList(
     return mFullScreenTask.setList(id, items);
   }
 
+  @Rpc(description = "Set the Full Screen Activity Title")
+  public void fullSetTitle(
+      @RpcParameter(name = "title", description = "Activity Title") String title) {
+    if (mFullScreenTask == null) {
+      throw new RuntimeException("No screen displayed.");
+    }
+    mFullScreenTask.setTitle(title);
+  }
+
   /**
    * This will override the default behaviour of keys while in the fullscreen mode. ie:
    * 
diff --git a/android/ScriptingLayerForAndroid/AndroidManifest.xml b/android/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.googlecode.android_scripting" android:installLocation="auto"
-	android:versionCode="521" android:versionName="5x21">
+	android:versionCode="522" android:versionName="5x22">
 	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
 	<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
diff --git a/android/ScriptingLayerForAndroid/assets/sl4adoc.zip b/android/ScriptingLayerForAndroid/assets/sl4adoc.zip
