ruboto 0.14.0 → 0.15.0

data/assets/samples/sample_activity.rb

@@ -16,7 +16,7 @@ class SampleActivity
                                  :gravity => :center, :text_size => 48.0
           button :text => 'M-x butterfly', :width => :match_parent, :id => 43, :on_click_listener => proc { butterfly }
         end
-  rescue
+  rescue Exception
     puts "Exception creating activity: #{$!}"
     puts $!.backtrace.join("\n")
   end

data/assets/src/RubotoActivity.java

@@ -22,17 +22,17 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
      */
     @Override
     public void onCreate(Bundle bundle) {
-        System.out.println("THE_RUBOTO_CLASS onCreate(): " + getClass().getName());
+        System.out.println("THE_RUBOTO_CLASS onCreate(): " + getClass().getName() + ", finishing: " + isFinishing());
 
-        // Shut this RubotoActivity down if it's not able to restart 
+        // Shut this RubotoActivity down if it's not able to restart
         if (this.getClass().getName().equals("org.ruboto.THE_RUBOTO_CLASS") && !JRubyAdapter.isInitialized()) {
             super.onCreate(bundle);
-	          System.out.println("Shutting down stale THE_RUBOTO_CLASS: " + getClass().getName());
+            System.out.println("Shutting down stale THE_RUBOTO_CLASS: " + getClass().getName());
             finish();
             return;
         }
-				
-       if (ScriptLoader.isCalledFromJRuby()) {
+
+       if (isFinishing() || ScriptLoader.isCalledFromJRuby()) {
             super.onCreate(bundle);
             return;
         }

data/assets/src/org/ruboto/EntryPointActivity.java

@@ -6,67 +6,24 @@ import android.os.Bundle;
 
 /**
  * This Activity acts as an entry point to the app.  It must initialize the
- * JRuby runtime before continuing its life cycle.
- * While JRuby is initializing, a progress dialog is shown.
- * If R.layout.splash is defined, by adding a res/layout/splash.xml file,
- * this layout is displayed instead of the progress dialog.
+ * JRuby runtime before restarting its life cycle.  While JRuby is initializing,
+ * a progress dialog is shown.  If R.layout.splash is defined, by adding a
+ * res/layout/splash.xml file, this layout is displayed instead of the progress
+ * dialog.
  */
 public class EntryPointActivity extends org.ruboto.RubotoActivity {
 
     public void onCreate(Bundle bundle) {
         Log.d("EntryPointActivity onCreate:");
-        getScriptInfo().setRubyClassName(getClass().getSimpleName());
 
-        if (!JRubyAdapter.isInitialized()) {
-          showSplash();
-          finish();
-        }
-        super.onCreate(bundle);
-    }
-
-    public void onResume() {
-        Log.d("onResume: ");
-
-        if(getScriptInfo().isLoaded()) {
-            Log.d("onResume: App already started!");
-            super.onResume();
-            return;
-        }
-
-        Log.d("onResume: Checking JRuby");
         if (JRubyAdapter.isInitialized()) {
-            Log.d("Already initialized");
-    	    fireRubotoActivity();
+            getScriptInfo().setRubyClassName(getClass().getSimpleName());
         } else {
-            Log.d("Not initialized");
-	    showSplash();
-	    finish();
+            showSplash();
+            finish();
         }
-	super.onResume();
-    }
 
-    public void onPause() {
-        Log.d("onPause: ");
-        super.onPause();
-    }
-
-    public void onDestroy() {
-        Log.d("onDestroy: ");
-        super.onDestroy();
-    }
-
-
-    protected void fireRubotoActivity() {
-        if(getScriptInfo().isLoaded()) return;
-        Log.i("Starting activity");
-        ScriptLoader.loadScript(this);
-        runOnUiThread(new Runnable() {
-		public void run() {
-		    ScriptLoader.callOnCreate(EntryPointActivity.this, args[0]);
-		    onStart();
-		    onResume();
-		}
-	    });
+        super.onCreate(bundle);
     }
 
     private void showSplash() {
@@ -78,6 +35,10 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
     // The Intent to to call when done. Defaults to calling this Activity again.
     // Override to change.
     protected Intent futureIntent() {
-        return new Intent(this, this.getClass());
+        if (getIntent().getAction().equals(Intent.ACTION_MAIN)) {
+            return new Intent(getIntent()).setAction(Intent.ACTION_VIEW);
+        } else {
+            return getIntent();
+        }
     }
 }

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -270,7 +270,7 @@ public class JRubyAdapter {
                 }
 
                 addLoadPath(scriptsDirName(appContext));
-    	          put("$package_name", appContext.getPackageName());
+                put("$package_name", appContext.getPackageName());
 
                 initialized = true;
             } catch (ClassNotFoundException e) {

data/assets/src/org/ruboto/SplashActivity.java

@@ -31,25 +31,25 @@ public class SplashActivity extends Activity {
     private static final int INSTALL_REQUEST_CODE = 4242;
 
     public void onCreate(Bundle bundle) {
-	Log.d("SplashActivity onCreate:");
+        Log.d("SplashActivity onCreate:");
         localFile = new java.io.File(getFilesDir(), RUBOTO_APK);
-	try {
-	    splash = Class.forName(getPackageName() + ".R$layout").getField("splash").getInt(null);
-	} catch (Exception e) {
-	    splash = -1;
-	}
+        try {
+            splash = Class.forName(getPackageName() + ".R$layout").getField("splash").getInt(null);
+        } catch (Exception e) {
+            splash = -1;
+        }
         if (!JRubyAdapter.isInitialized()) {
-	    initJRuby(true);
-	}
-	super.onCreate(bundle);
+            initJRuby(true);
+        }
+        super.onCreate(bundle);
     }
 
     public void onResume() {
         Log.d("onResume: ");
         if (!JRubyAdapter.isInitialized() && receiver == null) {
-	    registerPackageInstallReceiver();
+            registerPackageInstallReceiver();
         }
-	super.onResume();
+        super.onResume();
     }
     
     public void onPause() {
@@ -73,45 +73,43 @@ public class SplashActivity extends Activity {
     private void initJRuby(final boolean firstTime) {
         showProgress();
         new Thread(new Runnable() {
-		public void run() {
-		    final boolean jrubyOk = JRubyAdapter.setUpJRuby(SplashActivity.this);
-		    if (jrubyOk) {
-			Log.d("onResume: JRuby OK");
-			startUserActivity();
-			hideProgress();
-			finish();
-		    } else {
-			registerPackageInstallReceiver();
-			runOnUiThread(new Runnable() {
-				public void run() {
-				    if (localFile.exists()) {
-					installDownload();
-				    } else {
-					if (firstTime) {
-					    Log.d("onResume: Checking JRuby - IN UI thread");
-					    try {
-						setContentView(Class.forName(getPackageName() + ".R$layout").getField("get_ruboto_core").getInt(null));
-						if (hasInternetPermission()) {
-						    getRubotoCore(null);
-						    return;
-						}
-					    } catch (Exception e) {
-					    }
-					} else {
-					    Toast.makeText(SplashActivity.this,"Failed to initialize Ruboto Core.",Toast.LENGTH_LONG).show();
-					    try {
-						TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
-						textView.setText("Woops!  Ruboto Core was installed, but it failed to initialize properly!  I am not sure how to proceed from here.  If you can, please file an error report at http://ruboto.org/");
-					    } catch (Exception e) {
-					    }
-					}
-				    }
-				    hideProgress();
-				}
-			    });
-		    }
-		}
-	    }).start();
+            public void run() {
+                final boolean jrubyOk = JRubyAdapter.setUpJRuby(SplashActivity.this);
+                if (jrubyOk) {
+                    Log.d("onResume: JRuby OK");
+                    startUserActivity();
+                } else {
+                    registerPackageInstallReceiver();
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            if (localFile.exists()) {
+                                installDownload();
+                            } else {
+                                if (firstTime) {
+                                    Log.d("onResume: Checking JRuby - IN UI thread");
+                                    try {
+                                        setContentView(Class.forName(getPackageName() + ".R$layout").getField("get_ruboto_core").getInt(null));
+                                        if (hasInternetPermission()) {
+                                            getRubotoCore(null);
+                                            return;
+                                        }
+                                    } catch (Exception e) {
+                                    }
+                                } else {
+                                    Toast.makeText(SplashActivity.this,"Failed to initialize Ruboto Core.",Toast.LENGTH_LONG).show();
+                                    try {
+                                        TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
+                                        textView.setText("Woops!  Ruboto Core was installed, but it failed to initialize properly!  I am not sure how to proceed from here.  If you can, please file an error report at http://ruboto.org/");
+                                    } catch (Exception e) {
+                                    }
+                                }
+                            }
+                            hideProgress();
+                        }
+                    });
+                }
+            }
+        }).start();
     }
 
     private static final String RUBOTO_APK = "RubotoCore-release.apk";
@@ -128,18 +126,18 @@ public class SplashActivity extends Activity {
                     hideProgress();
                     showDownloadProgress("Downloading RubotoCore...");
                     new Thread(new Runnable() {
-			    public void run() {
-				while (loadingDialog != null && enqueue > 0) {
-				    // FIXME(uwe):  Also set total bytes and bytes downloaded.
-				    loadingDialog.setProgress(getProgressPercentage());
-				    try {
-					Thread.sleep(1000);
-				    } catch (InterruptedException ie) {
-					Log.e("Interupted!");
-				    }
-				}
-			    }
-			}).start();
+                        public void run() {
+                            while (loadingDialog != null && enqueue > 0) {
+                                // FIXME(uwe):  Also set total bytes and bytes downloaded.
+                                loadingDialog.setProgress(getProgressPercentage());
+                                try {
+                                    Thread.sleep(1000);
+                                } catch (InterruptedException ie) {
+                                    Log.e("Interupted!");
+                                }
+                            }
+                        }
+                    }).start();
                 }
                 return;
             }
@@ -165,11 +163,11 @@ public class SplashActivity extends Activity {
                 loadingDialog = ProgressDialog.show(this, null, "Starting...", true, true);
                 loadingDialog.setCanceledOnTouchOutside(false);
                 loadingDialog.setOnCancelListener(new OnCancelListener() {
-			public void onCancel(DialogInterface dialog) {
-			    dialogCancelled = true;
-			    finish();
-			}
-		    });
+                    public void onCancel(DialogInterface dialog) {
+                        dialogCancelled = true;
+                        finish();
+                    }
+                });
             }
         }
     }
@@ -191,11 +189,11 @@ public class SplashActivity extends Activity {
                 loadingDialog.setCancelable(true);
                 loadingDialog.setCanceledOnTouchOutside(false);
                 loadingDialog.setOnCancelListener(new OnCancelListener() {
-			public void onCancel(DialogInterface dialog) {
-			    dialogCancelled = true;
-			    finish();
-			}
-		    });
+                    public void onCancel(DialogInterface dialog) {
+                        dialogCancelled = true;
+                        finish();
+                    }
+                });
                 loadingDialog.show();
             }
         } else {
@@ -213,48 +211,48 @@ public class SplashActivity extends Activity {
 
     private void registerPackageInstallReceiver() {
         receiver = new BroadcastReceiver(){
-		public void onReceive(Context context, Intent intent) {
-		    Log.d("Received intent: " + intent + " (" + intent.getExtras() + ")");
-		    if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
-			long downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0);
-			if (downloadId == enqueue) {
-			    if (localFile.exists()) {
-				return;
-			    }
-			    Query query = new Query();
-			    query.setFilterById(enqueue);
-			    DownloadManager dm = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
-			    Cursor c = dm.query(query);
-			    if (c.moveToFirst()) {
-				hideProgress();
-				int status = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
-				if (DownloadManager.STATUS_SUCCESSFUL == status) {
-				    storeDownload(dm, downloadId);
-				    installDownload();
-				} else {
-				    int reason = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON));
-				    Toast.makeText(context,"Download failed (" + status + "): " + reason, Toast.LENGTH_LONG).show();
-				}
-			    } else {
-				Toast.makeText(context,"Download diappeared!", Toast.LENGTH_LONG).show();
-			    }
-			    c.close();
-			}
-		    } else if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
-			if (intent.getData().toString().equals("package:org.ruboto.core")) {
-			    Toast.makeText(context,"Ruboto Core is now installed.",Toast.LENGTH_LONG).show();
-			    deleteFile(RUBOTO_APK);
-			    if (receiver != null) {
-        	                unregisterReceiver(receiver);
-        	                receiver = null;
-			    }
-			    initJRuby(false);
-			} else {
-			    Toast.makeText(context,"Installed: " + intent.getData().toString(),Toast.LENGTH_LONG).show();
-			}
-		    }
-		}
-	    };
+            public void onReceive(Context context, Intent intent) {
+                Log.d("Received intent: " + intent + " (" + intent.getExtras() + ")");
+                if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
+                    long downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0);
+                    if (downloadId == enqueue) {
+                        if (localFile.exists()) {
+                            return;
+                        }
+                        Query query = new Query();
+                        query.setFilterById(enqueue);
+                        DownloadManager dm = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+                        Cursor c = dm.query(query);
+                        if (c.moveToFirst()) {
+                            hideProgress();
+                            int status = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
+                            if (DownloadManager.STATUS_SUCCESSFUL == status) {
+                                storeDownload(dm, downloadId);
+                                installDownload();
+                            } else {
+                                int reason = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON));
+                                Toast.makeText(context,"Download failed (" + status + "): " + reason, Toast.LENGTH_LONG).show();
+                            }
+                        } else {
+                            Toast.makeText(context,"Download diappeared!", Toast.LENGTH_LONG).show();
+                        }
+                        c.close();
+                    }
+                } else if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
+                    if (intent.getData().toString().equals("package:org.ruboto.core")) {
+                        Toast.makeText(context,"Ruboto Core is now installed.",Toast.LENGTH_LONG).show();
+                        deleteFile(RUBOTO_APK);
+                        if (receiver != null) {
+                            unregisterReceiver(receiver);
+                            receiver = null;
+                        }
+                        initJRuby(false);
+                    } else {
+                        Toast.makeText(context,"Installed: " + intent.getData().toString(),Toast.LENGTH_LONG).show();
+                    }
+                }
+            }
+            };
         IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
         filter.addDataScheme("package");
         registerReceiver(receiver, filter);
@@ -359,7 +357,7 @@ public class SplashActivity extends Activity {
         // EMXIF
 
         Cursor query = getContentResolver().query(settingsUri, projection,
-						  selection, selectionArgs, null);
+                                                  selection, selectionArgs, null);
         return query.getCount() == 1;
     }
 
@@ -376,7 +374,7 @@ public class SplashActivity extends Activity {
                 totalBytes = (int) c.getLong(totalSizeIndex);
             }
             System.out.println("PERCEN ------" + downloadedBytesSoFar
-			       + " ------ " + totalBytes + "****" + percentage);
+                               + " ------ " + totalBytes + "****" + percentage);
             percentage = (downloadedBytesSoFar * 100 / totalBytes);
             System.out.println("percentage % " + percentage);
         } catch (Exception e) {
@@ -386,9 +384,9 @@ public class SplashActivity extends Activity {
     }
 
     private void startUserActivity() {
-      if (getIntent().hasExtra(Intent.EXTRA_INTENT)) {
-        startActivity((Intent)getIntent().getParcelableExtra(Intent.EXTRA_INTENT));
-      }
+        if (getIntent().hasExtra(Intent.EXTRA_INTENT)) {
+            startActivity((Intent)getIntent().getParcelableExtra(Intent.EXTRA_INTENT));
+        }
     }
 
 }

data/assets/src/ruboto/activity/reload.rb

@@ -0,0 +1,66 @@
+module Ruboto::Activity::Reload
+  import org.ruboto.Log
+
+  def onResume
+    Log.d "Ruboto::Activity::Reload onResume"
+    super
+
+    @ruboto_activity_reload_receiver = ReloadReceiver.new(self)
+    filter = android.content.IntentFilter.new(android.content.Intent::ACTION_VIEW)
+    registerReceiver(@ruboto_activity_reload_receiver, filter)
+    Log.d "Ruboto::Activity::Reload registered reload receiver"
+  rescue Exception
+    Log.e "Exception registering reload listener: #{$!.message}"
+    Log.e $!.backtrace.join("\n")
+  end
+
+  def onPause
+    super
+    unregisterReceiver(@ruboto_activity_reload_receiver)
+    @ruboto_activity_reload_receiver = nil
+    Log.d "Ruboto::Activity::Reload unregistered reload receiver"
+  rescue Exception
+    Log.e "Exception unregistering reload listener: #{$!.message}"
+    Log.e $!.backtrace.join("\n")
+  end
+
+  def ruboto_activity_reload(scripts)
+    Log.d "Got reload intent: #{scripts}"
+  end
+
+  class ReloadReceiver < android.content.BroadcastReceiver
+    def initialize(activity)
+      super()
+      @activity = activity
+    end
+
+    # FIXME(uwe):  I would like to receive a string array,
+    #              but have not found a way to do that.
+    def onReceive(context, reload_intent)
+      Log.d "Got reload intent: #{reload_intent.inspect}"
+      file = reload_intent.get_string_extra('file')
+      if file
+        Log.d "load file: #{file.inspect}"
+        load file
+      end
+      if (reload_intent.get_string_extra('restart'))
+        Log.d 'restart activity'
+        if @activity.intent.action == android.content.Intent::ACTION_MAIN
+           restart_intent = android.content.Intent.new(@activity.intent).setAction(android.content.Intent::ACTION_VIEW)
+        else
+           restart_intent = @activity.intent
+        end
+        @activity.startActivity(restart_intent)
+        @activity.finish
+        Log.d 'activity restarted'
+      end
+      Log.d 'reload complete.'
+      true
+    rescue Exception
+      Log.e "Exception handling reload broadcast: #{$!.message}"
+      Log.e $!.backtrace.join("\n")
+    end
+  end
+
+end
+