rhodes 3.0.1.beta.4 → 3.0.1.beta.5

data/CHANGELOG

@@ -1,6 +1,8 @@
 ## 3.0.1
 * Fix customer issues
 * Android: fix push issues
+* Support Android 3.1
+* Support Windows Phone 7.1(Mango)
 
 ## 3.0
 * RhoSimulator: simulator for fast Rhodes application development, support debugging using Rhodes Eclipse plug-in.(Windows only)

data/Manifest.txt

@@ -1,4 +1,6 @@
 bin/c2dm.rb
+bin/get-rhodes-info
+bin/get-rhodes-info.bat
 bin/rhodes
 bin/rhodes-setup
 bin/rhodes-setup.bat
@@ -721,11 +723,11 @@ lib/extensions/net-http/uri/mailto.rb
 lib/extensions/net-http/uri.rb
 lib/extensions/nfc/ext/build
 lib/extensions/nfc/ext/build.bat
+lib/extensions/nfc/ext/nfc/platform/android/additional_files/res/xml/filter_nfc.xml
 lib/extensions/nfc/ext/nfc/platform/android/AndroidManifest.xml
 lib/extensions/nfc/ext/nfc/platform/android/ext_build.files
 lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp
 lib/extensions/nfc/ext/nfc/platform/android/Rakefile
-lib/extensions/nfc/ext/nfc/platform/android/res/xml/filter_nfc.xml
 lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java
 lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcActivity.java
 lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessage.java
@@ -870,25 +872,24 @@ lib/framework/rational.rb
 lib/framework/rational18.rb
 lib/framework/rationalME.rb
 lib/framework/res/back_btn.wm.png
-lib/framework/res/back_btn.wp7.png
+lib/framework/res/back_btn.wp.png
 lib/framework/res/blue_pushpin.wm.png
-lib/framework/res/blue_pushpin.wp7.png
 lib/framework/res/blue_pushpin_small.wm.png
-lib/framework/res/blue_pushpin_small.wp7.png
+lib/framework/res/blue_pushpin_small.wp.png
 lib/framework/res/callout.wm.png
-lib/framework/res/callout.wp7.png
+lib/framework/res/callout.wp.png
 lib/framework/res/callout_link.wm.png
-lib/framework/res/callout_link.wp7.png
+lib/framework/res/callout_link.wp.png
 lib/framework/res/esri.wm.png
-lib/framework/res/esri.wp7.png
+lib/framework/res/esri.wp.png
 lib/framework/res/forward_btn.wm.png
-lib/framework/res/forward_btn.wp7.png
+lib/framework/res/forward_btn.wp.png
 lib/framework/res/home_btn.wm.png
-lib/framework/res/home_btn.wp7.png
+lib/framework/res/home_btn.wp.png
 lib/framework/res/options_btn.wm.png
-lib/framework/res/options_btn.wp7.png
+lib/framework/res/options_btn.wp.png
 lib/framework/res/refresh_btn.wm.png
-lib/framework/res/refresh_btn.wp7.png
+lib/framework/res/refresh_btn.wp.png
 lib/framework/rho/mapview.rb
 lib/framework/rho/render.rb
 lib/framework/rho/rho.rb
@@ -1048,7 +1049,6 @@ platform/android/Rhodes/res/layout/status_bar_ongoing_event_progress_bar.xml
 platform/android/Rhodes/res/menu/options.xml
 platform/android/Rhodes/res/values/strings.xml
 platform/android/Rhodes/res/values/styles.xml
-platform/android/Rhodes/res/xml/filter_nfc.xml
 platform/android/Rhodes/rhobundle.xml
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java
@@ -1108,6 +1108,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

data/Rakefile

@@ -207,7 +207,7 @@ namespace "config" do
     extpaths << $app_config["paths"]["extensions"] if $app_config["paths"] and $app_config["paths"]["extensions"]
     extpaths << $config["env"]["paths"]["extensions"] if $config["env"]["paths"]["extensions"]
     extpaths << File.join($app_path, "extensions")
-    extpaths << "lib/extensions"
+    extpaths << File.join($startdir, "lib","extensions")
     $app_config["extpaths"] = extpaths
 
     if $app_config["build"] and $app_config["build"] == "release"

data/bin/get-rhodes-info

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'templater'
+require File.join(File.dirname(__FILE__), '..', 'res', 'generators', 'rhogen')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'rhodes')
+
+# Stub this method to force 1.8 compatibility (come on templater!)
+class Encoding
+  def find
+    "utf-8"
+  end
+
+  def dummy?
+    false
+  end
+end
+
+class String
+  def force_encoding(enc)
+    return self
+  end
+
+  def encoding
+    if RUBY_VERSION =~ /1\.8/ and Encoding.responds_to?('new')
+      Encoding.new
+    else
+      Encoding.default_external
+    end
+  end
+end
+
+params = ["--rhodes-ver"]
+
+def findParam(paramArray, paramId)
+   i=0
+   until i == paramArray.size do
+
+     param = paramArray[i]
+     paramPair = param.split('=')
+
+     if paramPair.size > 1
+       if paramId == paramPair[0] then
+         return paramPair[1].to_s
+       end 
+     end
+
+     i += 1
+   end
+
+   return nil
+end
+
+requestVer = findParam(ARGV, params[0])
+
+if requestVer >= Rhodes::VERSION
+  puts 1
+else
+  puts 0
+end
+

data/bin/get-rhodes-info.bat

@@ -0,0 +1 @@
+@ruby %~dp0get-rhodes-info %*

data/doc/connect-to-web-services.txt

@@ -9,7 +9,11 @@ Below is the list of available `AsyncHttp` methods you can use to asyncrhonously
 * `:url` - URL of the request.
 * `:headers` - Hash of headers to send with the request.
 * `:callback` - Callback action to execute when the request is done.
-* `:callback_param` - (optional) Parameters to send to the callback.
+* `:callback_param` - (optional) Parameters to send to the callback. Parameters values should be url encoded:
+
+        :callback_param => "action=text&title=#{Rho::RhoSupport.url_encode(@params['page_title'])}"
+        #values will be decoded automatically in callback
+
 * `:authentication` - (optional) Send Basic Auth header with request.  This takes the form:
 		
 		:authentication => {

data/doc/device-caps.txt

@@ -1117,6 +1117,18 @@ Open link in external application (browser for http:// links):
 
 Open appstore on iphone: [http://wiki.akosma.com/IPhone_URL_Schemes#App_Store](http://wiki.akosma.com/IPhone_URL_Schemes#App_Store)
 
+### jQuery/JQtouch
+When using jQuery/JQtouch in application code, you cannot use usual html links for hyperlinks. You need to call controller action and call WebView.navigate from there:
+
+    #Ajax call of controller method:
+    $.get("/app/TestController/send_mail",function(data) {});
+    
+    #TestController method:
+    def send_mail
+        WebView.navigate( 'mailto:test@host.com' )        
+        #to open url inexternal application you can use System.open_url
+    end
+
 ### Blackberry
 On Blackberry 5.0 and later you can use JavaScript [blackberry.launch object](http://docs.blackberry.com/en/developers/deliverables/18446/blackberry_launch_971534_11.jsp#blackberry_launch_newMap_971532_11)
 to create SMS, make Phone call etc.

data/doc/nfc.txt

@@ -10,7 +10,7 @@ There are two different NFC callback can be received (you should setup callbacks
 * NFC callback : it executed when Android ACTION_NDEF_DISCOVERED or ACTION_TAG_DISCOVERED events processed.
 * NFC Tech callback : it executed when Android ACTION_TECH_DISCOVERED event processed.
 In case of current state of NFC support in Android you can receive NFC callback only if your application in foreground. If your application is not run or in background - only ACTION_TECH_DISCOVERED is processed. 
-For process ACTION_TECH_DISCOVERED event you should setup list of techs in special resource file : [Rhodes ROOT]/platform/android/Rhodes/res/xml/filter_nfc.xml. See according Android documentation - [Android ACTION_TECH_DISCOVERED description](http://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_TECH_DISCOVERED)
+For process ACTION_TECH_DISCOVERED event you should setup list of techs in special resource file : [Rhodes ROOT]/lib/extensions/nfc/ext/nfc/platform/android/additional_files/res/xml/filter_nfc.xml. See according Android documentation - [Android ACTION_TECH_DISCOVERED description](http://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_TECH_DISCOVERED)
 For processing events received when application not run or in background, after start/activate use special method of NfcManager : 
 
 	:::ruby

data/doc/rhom.txt

@@ -226,10 +226,12 @@ Below is a full list of options available to fixed schema models:
 
 ## Data Migrations
 To clean all client data at startup - change `app_db_version` in `rhoconfig.txt`.
-This scenario will work for Property Bag and Fixed Schema models
+This scenario will work for Property Bag and Fixed Schema models.
+
+**NOTE: All local client changes will be lost **
 
 ### Fixed Schema Data Migrations
-Rhom provides an application hook to migrate the data manually, overriding the default behavior which deletes the data.  You can also use this hook to run business logic related to updating the database.  For example, your application may want to display a customized alert notifying the user that a migration is in progress and it may take a few moments.
+Rhom provides an application hook to migrate the data manually.  You can also use this hook to run business logic related to updating the database.  For example, your application may want to display a customized alert notifying the user that a migration is in progress and it may take a few moments.
 
 To use this hook, first we need to track the `:schema_version` in our model:
 
@@ -254,26 +256,26 @@ This is called on application start when `:schema_version` has changed.
 	  #					new_src['schema']['sql'] contains new schema sql
 	  def on_migrate_source(old_version, new_src)
 	    # ... do something like alert user ...
-	    super
+	    
+        db = Rho::RHO.get_src_db(new_src['name'])
+        db.execute_sql("ALTER TABLE #{new_src['name']} ADD COLUMN mytest VARCHAR DEFAULT null")
+	    
+	    true # does not create table
 	  end
 	end
-	
-To let Rhom automatically delete the table and replace the schema:
 
-	:::ruby
-	def on_migrate_source(old_version, new_src)
-	  # ... do something like alert user ...
-	  super
-	end
+**NOTE: To modify schema without recreate table, you can use only ADD COLUMN command, you cannot remove column or change type(This is sqlite limitation) **
 
 Return `false` to run the custom sql specified by the new_src['schema']['sql'] string:
     
 	:::ruby
 	def on_migrate_source(old_version, new_src)
 	  # ... do something like alert user ...
-	  false
+	  false # create table by source schema - useful only for non-synced models
 	end
 
+**NOTE: For sync sources, you cannot just recreate table without data copy. Because server will not send this data at sync time. **
+
 	
 ## Rhom API
 Below is the full list of methods available to Rhom models:

data/doc/ui.txt

@@ -603,6 +603,11 @@ Get current tab index
 	:::ruby
 	Rho::NativeTabbar.get_current_tab 
 
+Set iPhone badge to Tab (worked only on iOS devices!) 
+	:::ruby
+	# set badge '12' to tab 1
+	Rho::NativeTabbar.set_tab_badge( 1, '12')
+
 
 Rho::NativeTabbar.create() create native tab bar UI element and activate its first tab. If you want to see another tab, call Rho::NativeTabbar.switch_tab explicitly just after NativeBar.create:
 

data/lib/build/jake.rb

@@ -37,8 +37,11 @@ class Jake
   end
 
   def self.get_absolute(path)
+    get_absolute_ex(path, Dir.pwd())
+  end
+    
+  def self.get_absolute_ex(path, currentdir)
     return File.expand_path(path) if File.exists?(path)
-    currentdir = Dir.pwd()
     
     path = currentdir + "/" + path
   
@@ -211,7 +214,7 @@ class Jake
   	wd = options[:directory]
   	if not wd.nil?
       currentdir = Dir.pwd()
-      chdir wd
+      Dir.chdir wd
     end
 
     cmdstr = argv.map { |x| x =~ / |\|/ ? '"' + x + '"' : x }.join(' ')
@@ -256,7 +259,7 @@ class Jake
     end
 
     if not wd.nil?
-      chdir currentdir
+      Dir.chdir currentdir
     end
 
     retval
@@ -286,9 +289,9 @@ class Jake
     args << "xf"
     args << src.to_s
   
-    chdir targetdir
+    Dir.chdir targetdir
     puts run(cmd,args)
-    chdir currentdir
+    Dir.chdir currentdir
   end
   
   def self.jarfilelist(target)
@@ -347,7 +350,7 @@ class Jake
     currentdir = Dir.pwd()
   
   
-    chdir destdir
+    Dir.chdir destdir
   
     if output and title and version and vendor
       f = File.new(output + ".rapc", "w")
@@ -403,7 +406,7 @@ class Jake
     cmd.gsub!(/\//,"\\")
     outputstring = run(cmd, args)
     puts outputstring unless $? == 0
-    chdir currentdir
+    Dir.chdir currentdir
   
   end
   

data/lib/extensions/nfc/ext/nfc/platform/android/AndroidManifest.xml

@@ -3,15 +3,13 @@
     package="com.rhomobile.rhodes"
     android:installLocation="auto"
     android:versionCode="29"
-    android:versionName="2.3.1">
-    
-    <uses-sdk android:minSdkVersion="10" />
-    
-    <uses-feature android:name="android.hardware.nfc" android:required="false" />
+    android:versionName="2.3.3">
+
+  <application >
 
-    <application>
+        <activity
+            android:name="com.rhomobile.rhodes.RhodesActivity">
 
-        <activity  android:name="com.rhomobile.nfc.NfcActivity">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
@@ -30,10 +28,15 @@
             <meta-data android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/filter_nfc"
             />
+
         </activity>
+    
+    </application >
 
-    </application>
+    <uses-sdk android:minSdkVersion="10" />
     
+    <uses-feature android:name="android.hardware.nfc" android:required="false" />
+
     <uses-permission android:name="android.permission.NFC" />
 
 </manifest> 

data/lib/extensions/nfc/ext/nfc/platform/android/Rakefile

@@ -71,28 +71,28 @@ namespace "build" do
     build_extension('Nfc', $arch, src_files)
 
     #build java part
-    javafiles = []	
-    File.open('ext_build.files', "r") do |f|
-        while line = f.gets
-           javafiles << line
-        end
-    end
+    #javafiles = []	
+    #File.open('ext_build.files', "r") do |f|
+    #    while line = f.gets
+    #       javafiles << line
+    #    end
+    #end
 
-    flname = $targetdir + '/ext_build.files'
-    File.open(flname, "a") do |f|
-        javafiles.each do |j|
-            f.puts $nfcdir + '/' + j
-        end
-    end
+    #flname = $targetdir + '/ext_build.files'
+    #File.open(flname, "a") do |f|
+    #    javafiles.each do |j|
+    #        f.puts $nfcdir + '/' + j
+    #    end
+    #end
 
-    mymaniname = $nfcdir + '/ext/nfc/platform/android/AndroidManifest.xml'  
-    maniname = $targetdir + '/AndroidManifest.xml'
+    #mymaniname = $nfcdir + '/ext/nfc/platform/android/AndroidManifest.xml'  
+    #maniname = $targetdir + '/AndroidManifest.xml'
 
-    cp_r mymaniname, maniname
+    #cp_r mymaniname, maniname
 
     # copy xml NFC filter
-    myres = $nfcdir + '/ext/nfc/platform/android/res'  
-    cp_r myres, $rho_build_dir
+    #myres = $nfcdir + '/ext/nfc/platform/android/res'  
+    #cp_r myres, $rho_build_dir
 
   end
 end

data/lib/extensions/nfc/ext/nfc/platform/android/{res → additional_files/res}/xml/filter_nfc.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- capture all MIFARE Classics with NDEF payloads -->
     <tech-list>
         <tech>android.nfc.tech.MifareClassic</tech>
-    </tech-list>
-    <tech-list>
         <tech>android.nfc.tech.Ndef</tech>
     </tech-list>
 </resources>

data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java

@@ -78,6 +78,7 @@ public class Nfc implements RhodesActivityListener {
 	private static NdefMessage[] ourApplicationStartupMessages = null;
 	private static Tag ourApplicationStartupTag = null;
 	
+	
 	public static void setApplicationStartupIntent(Intent intent) {
 		getInstance().onNewIntent(null, intent, true);
 	}
@@ -89,10 +90,16 @@ public class Nfc implements RhodesActivityListener {
 					getInstance().onReceiveMessages(ourApplicationStartupMessages);
 					ourApplicationStartupMessages = null;
 				}
+				else {
+					log("ourApplicationStartupMessages is NULL !");
+				}
 				if (ourApplicationStartupTag != null) {
 					getInstance().onReceiveTag(ourApplicationStartupTag);
 					ourApplicationStartupTag = null;
 				}
+				else {
+					log("ourApplicationStartupTag is NULL !");
+				}
 			}
 		}, 100);
 	}
@@ -154,7 +161,7 @@ public class Nfc implements RhodesActivityListener {
 		boolean oldEnable = ourIsEnable;
 		ourIsEnable = (enable != 0);
 		if ((oldEnable == false) && (ourIsEnable == true)) {
-			RhodesActivity.safeGetInstance().addRhodesActivityListener(getInstance());
+			//RhodesActivity.safeGetInstance().addRhodesActivityListener(getInstance());
 			PerformOnUiThread.exec( new Runnable() {
 				public void run() {
 					if (RhodesActivity.safeGetInstance().isForegroundNow()) {
@@ -164,7 +171,7 @@ public class Nfc implements RhodesActivityListener {
 			});
 		}
 		if ((oldEnable == true) && (ourIsEnable == false)) {
-			RhodesActivity.safeGetInstance().removeRhodesActivityListener(getInstance());
+			//RhodesActivity.safeGetInstance().removeRhodesActivityListener(getInstance());
 			PerformOnUiThread.exec( new Runnable() {
 				public void run() {
 					if (RhodesActivity.safeGetInstance().isForegroundNow()) {
@@ -176,6 +183,15 @@ public class Nfc implements RhodesActivityListener {
 		log(" $$$$$$$$$ setEnable() FINISH() ");
 	}
 	
+	public void onCreate(RhodesActivity activity, Intent intent) {
+		getInstance().onNewIntent(activity, intent, true);
+	}
+	
+	public void onRhodesActivityStartup(RhodesActivity activity) {
+		activity.addRhodesActivityListener(getInstance());
+	}
+	
+	
 	public void onPause(RhodesActivity activity) {
 		log(" $$$$$$$$$ onPause() ");
 		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(RhodesActivity.getContext());
@@ -188,7 +204,7 @@ public class Nfc implements RhodesActivityListener {
 	public void onResume(RhodesActivity activity) {
 		log(" $$$$$$$$$ onResume() ");
 		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(RhodesActivity.getContext());
-		if (nfcAdapter != null) {
+		if ((nfcAdapter != null) && (ourIsEnable)) {
 			IntentFilter[] filters = new IntentFilter[1];
 			filters[0] = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);
 			
@@ -207,7 +223,7 @@ public class Nfc implements RhodesActivityListener {
 	public void onNewIntent(RhodesActivity activity, Intent intent, boolean postpone) {
 		String action = intent.getAction();
 		
-		log(" $$$$$$$$$ onNewIntent !!! Action = "+action);
+		Utils.platformLog("Nfc", "onNewIntent !!! Action = "+action+"     postpone="+String.valueOf(postpone));
 		
 		if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)) {
 			log("ACTION_TAG_DISCOVERED !");
@@ -320,7 +336,12 @@ public class Nfc implements RhodesActivityListener {
 	}
 	
 	public void onNewIntent(RhodesActivity activity, Intent intent) {
-		onNewIntent(activity, intent, false);
+		if (activity.isInsideStartStop()) {
+			onNewIntent(activity, intent, false);
+		}
+		else {
+			onNewIntent(activity, intent, true);
+		}
 	}
 	
 	

data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcActivity.java

@@ -1,5 +1,7 @@
 package com.rhomobile.nfc;
 
+import java.util.Iterator;
+
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -16,6 +18,8 @@ import android.util.Log;
 
 import com.rhomobile.rhodes.PushService;
 import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesActivityListener;
+import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.Utils;
 
@@ -28,74 +32,85 @@ public class NfcActivity  extends Activity {
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onCreate !!! START ");
 		super.onCreate(savedInstanceState);
 		Intent intent = getIntent();
 		String action = intent.getAction();
+		Utils.platformLog(TAG, " NfcActivity onCreate !!! Action = "+action);
+		processNewIntent(intent);
+		finish();
+	}
+
+	
+	@Override
+	public void onStart() {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onStart !!! START ");
+		super.onStart();
+	}
+	
+	@Override
+	public void onResume() {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onResume !!! START ");
+ 		super.onResume();
+ 		//finish();
+ 	}
+
+    @Override
+    public void onPause() 
+    {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onPause !!! START ");
+    	super.onPause();
+    }
+
+    @Override
+	public void onStop() 
+	{
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onStop !!! START ");
+		super.onStop();
+	}
+	
+	@Override
+	public void onDestroy() {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onDestroy !!! START ");
+		super.onDestroy();
+	}
+	
+	
+	
+	
+	
+	@Override
+	protected void onNewIntent(Intent intent) {
+		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onNewIntent !!! START ");
+	    super.onNewIntent(intent);
+		String action = intent.getAction();
+		Utils.platformLog(TAG, " NfcActivity onNewIntent !!! Action = "+action);
+	    processNewIntent(intent);
+	}	
+	
+	private void processNewIntent(Intent intent) {
+	    super.onNewIntent(intent);
+		String action = intent.getAction();
 		
-		Utils.platformLog(TAG, " $$$$$$$$$ NfcActivity STARTED !!! Action = "+action);
+		Utils.platformLog(TAG, " NfcActivity processNewIntent !!! Action = "+action);
 		
 		
 		if ( (NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)) ||
 		(NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action))  ||
 		(NfcAdapter.ACTION_TECH_DISCOVERED.equals(action)) ) {
 
-			RhodesActivity rhodes_activity = null;
-			// check RhodesActivity state
-			try {
-				rhodes_activity = RhodesActivity.safeGetInstance();
-			}
-			catch(NullPointerException e) {
-				
-			}
-			boolean isForeground = false;
-			if (rhodes_activity != null) {
-				isForeground = rhodes_activity.isForegroundNow();
-			}
-			if (isForeground) {
-				Nfc.getInstance().onNewIntent(rhodes_activity, intent);
-				finish();
-			}
-			else {
-				/*
-				ourIntent = intent;
-				Thread thread = new Thread() {
-					public void run() {
-						
-						while (!isRhodesActivityOnForeground()) {
-							try {
-								sleep(100);
-							} catch (InterruptedException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
-							}
-						}
-						
-						Nfc.getInstance().onNewIntent(RhodesActivity.safeGetInstance(), ourIntent);
-						//finish();
-						//this.stop();
-					}
-				};
-				thread.start();
-				*/
-				Nfc.setApplicationStartupIntent(intent);
-				
-		        Intent run_intent = new Intent();
-		        run_intent.setClass(this, RhodesActivity.class);
-		     	startActivity(run_intent);
-		     	
-		     	finish();
+			Nfc.log("NfcActivity: RhodesActivity is not Foreground - save messages and start Activity");
 
-			}
-			
-			
+			Nfc.setApplicationStartupIntent(intent);
 			
+	        Intent run_intent = new Intent();
+	        run_intent.setClass(this, RhodesActivity.class);
+	     	startActivity(run_intent);
+		     	
 		}
-		
-		
-		
-		//finish();
 	}
 	
+	
 	public static boolean isRhodesActivityOnForeground() {
 		RhodesActivity rhodes_activity = null;
 		// check RhodesActivity state

data/lib/extensions/nfc/ext.yml

@@ -1,2 +1,6 @@
 entry: Init_Nfc	
+android_rhodes_activity_listener: com.rhomobile.nfc.Nfc
+android_manifest_changes: ext/nfc/platform/android/AndroidManifest.xml
+android_resources_addons: ext/nfc/platform/android/additional_files
+android_additional_sources_list: ext/nfc/platform/android/ext_build.files
 libraries: ["Nfc"]