rhodes 3.0.0.beta.4 → 3.0.0.beta.5

data/Manifest.txt

@@ -723,10 +723,13 @@ 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/src/com/nfc/Nfc.java
-lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcMessage.java
-lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcMessagePack.java
-lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/NfcRecord.java
+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
+lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessagePack.java
+lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcRecord.java
+lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java
 lib/extensions/nfc/ext/nfc/shared/ruby/nfc.i
 lib/extensions/nfc/ext/nfc/shared/ruby/nfc_wrap.c
 lib/extensions/nfc/ext.yml
@@ -1040,6 +1043,7 @@ 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
@@ -4104,6 +4108,7 @@ platform/win32/RhoSimulator/imageformats/qgif4.dll
 platform/win32/RhoSimulator/imageformats/qjpeg4.dll
 platform/win32/RhoSimulator/QtCore4.dll
 platform/win32/RhoSimulator/QtGui4.dll
+platform/win32/RhoSimulator/QTLICENSE.LGPL
 platform/win32/RhoSimulator/QtNetwork4.dll
 platform/win32/RhoSimulator/QtWebKit4.dll
 platform/win32/RhoSimulator/rhosimulator.exe

data/doc/build.txt

@@ -267,7 +267,13 @@ List of capabilities related to changes in AndroidManifest - add or remove this
   	sdcard
   	push
 
+### Set up minimal Andoid SDK API level
 
+The minimal API level supported by Rhodes is 4 (Android 1.6)
+It is possible to set greated minimal API level with build.yml. This will restrict installing an application on any Android OS prior to 3.0:
+
+   android:
+     minSDK: 11
 
 ### Building app and running it in emulator from the command line
 

data/lib/extensions/debugger/debugger.rb

@@ -17,7 +17,7 @@ end
 
 def execute_cmd(cmd, advanced)
   cmd = URI.unescape(cmd.gsub(/\+/,' ')) if advanced
-  puts "[Debugger] Executing: #{cmd}"
+  puts "[Debugger] Executing: #{cmd.inspect}"
   result = ""
   error = '0';
   begin

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

@@ -5,18 +5,30 @@
     android:versionCode="29"
     android:versionName="2.3.1">
     
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="10" />
     
     <uses-feature android:name="android.hardware.nfc" android:required="false" />
 
     <application>
         
-        <receiver  android:name="com.nfc.Nfc">
+        <activity  android:name="com.rhomobile.nfc.NfcActivity">
             <intent-filter>
                 <action android:name="android.nfc.action.TAG_DISCOVERED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-        </receiver>
+        </activity>
+
+        <activity  android:name="com.rhomobile.nfc.NfcTechActivity">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.nfc.action.TECH_DISCOVERED" />
+            </intent-filter>
+
+            <meta-data android:name="android.nfc.action.TECH_DISCOVERED"
+                android:resource="@xml/filter_nfc"
+            />
+
+        </activity>
         
     </application>
     

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

@@ -51,6 +51,8 @@ namespace "build" do
     raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
     $rootdir = ENV['RHO_ROOT']
     raise "RHO_ROOT is not set" if $rootdir.nil?
+    $rho_build_dir = ENV['RHO_ANDROID_TMP_DIR']
+    raise "RHO_ANDROID_TMP_DIR is not set" if $rho_build_dir.nil?
 
     require File.join($rootdir, 'platform/android/build/androidcommon.rb')
 
@@ -88,6 +90,10 @@ namespace "build" do
 
     cp_r mymaniname, maniname
 
+    # copy xml NFC filter
+    myres = $nfcdir + '/ext/nfc/platform/android/res'  
+    cp_r myres, $rho_build_dir
+
   end
 end
 

data/lib/extensions/nfc/ext/nfc/platform/android/ext_build.files

@@ -1,4 +1,6 @@
-ext/nfc/platform/android/src/com/nfc/Nfc.java
-ext/nfc/platform/android/src/com/nfc/NfcMessagePack.java
-ext/nfc/platform/android/src/com/nfc/NfcMessage.java
-ext/nfc/platform/android/src/com/nfc/NfcRecord.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/NfcActivity.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessagePack.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessage.java
+ext/nfc/platform/android/src/com/rhomobile/nfc/NfcRecord.java

data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp

@@ -29,7 +29,7 @@ void logi(const char* text) {
 
 extern "C" void rho_nfc_set_callback(const char* callback_url) {
 	JNIEnv *env = jnienv();
-	jclass cls = rho_find_class(env, "com/nfc/Nfc");
+	jclass cls = rho_find_class(env, "com/rhomobile/nfc/Nfc");
 	if (!cls) return;
 	jmethodID mid = env->GetStaticMethodID( cls, "setCallback", "(Ljava/lang/String;)V");
 	if (!mid) return;
@@ -40,7 +40,7 @@ extern "C" void rho_nfc_set_callback(const char* callback_url) {
 
 extern "C" void rho_nfc_enable(int enable) {
 	JNIEnv *env = jnienv();
-	jclass cls = rho_find_class(env, "com/nfc/Nfc");
+	jclass cls = rho_find_class(env, "com/rhomobile/nfc/Nfc");
 	if (!cls) return;
 	jmethodID mid = env->GetStaticMethodID( cls, "setEnable", "(I)V");
 	if (!mid) return;
@@ -49,7 +49,7 @@ extern "C" void rho_nfc_enable(int enable) {
 
 extern "C" int rho_nfc_is_enabled(void) {
 	JNIEnv *env = jnienv();
-	jclass cls = rho_find_class(env, "com/nfc/Nfc");
+	jclass cls = rho_find_class(env, "com/rhomobile/nfc/Nfc");
 	if (!cls) return 0;
 	jmethodID mid = env->GetStaticMethodID( cls, "isEnabled", "()I");
 	if (!mid) return 0;
@@ -58,7 +58,7 @@ extern "C" int rho_nfc_is_enabled(void) {
 
 extern "C" int rho_nfc_is_supported(void) {
 	JNIEnv *env = jnienv();
-	jclass cls = rho_find_class(env, "com/nfc/Nfc");
+	jclass cls = rho_find_class(env, "com/rhomobile/nfc/Nfc");
 	if (!cls) return 0;
 	jmethodID mid = env->GetStaticMethodID( cls, "isSupported", "()I");
 	if (!mid) return 0;
@@ -66,6 +66,93 @@ extern "C" int rho_nfc_is_supported(void) {
 }
 
 
+
+extern "C" void rho_nfc_set_tech_callback(const char* callback_url) {
+	JNIEnv *env = jnienv();
+	jclass cls = rho_find_class(env, "com/rhomobile/nfc/Nfc");
+	if (!cls) return;
+	jmethodID mid = env->GetStaticMethodID( cls, "setTechCallback", "(Ljava/lang/String;)V");
+	if (!mid) return;
+	jstring objCallback = env->NewStringUTF(callback_url);
+	env->CallStaticVoidMethod(cls, mid, objCallback);
+	env->DeleteLocalRef(objCallback);
+}
+
+extern "C" void rho_nfc_set_listen_tech_list(VALUE tech_list) {
+
+}
+
+extern "C" VALUE rho_nfc_get_tech_list() {
+      return rho_ruby_get_NIL();
+}
+
+extern "C" void rho_nfc_tech_connect(const char* name) {
+
+}
+
+extern "C" void rho_nfc_tech_close(const char* name) {
+
+}
+
+extern "C" int rho_nfc_tech_is_connected(const char* name) {
+       return 0;
+}
+
+extern "C" int rho_nfc_tech_MifareClassic_get_size() {
+       return 0;
+}
+
+extern "C" void rho_nfc_tech_MifareClassic_write_block(int index, VALUE block) {
+
+}
+
+extern "C" VALUE rho_nfc_tech_MifareClassic_read_block(int index) {
+       return rho_ruby_get_NIL();
+}
+
+extern "C" int rho_nfc_tech_MifareUltralight_get_size() {
+       return 0;
+}
+
+extern "C" void rho_nfc_tech_MifareUltralight_write_page(int index, VALUE block) {
+
+}
+
+extern "C" VALUE rho_nfc_tech_MifareUltralight_read_pages(int index) {
+       return rho_ruby_get_NIL();
+}
+
+
+//  private native void callTechCallback(String callback_url, String event);
+extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_callTechCallback
+(JNIEnv *env, jclass, jstring js_callback_url, jstring js_event)
+{
+	char url[2048];
+	char body[2048];
+
+	const char* jurl = env->GetStringUTFChars(js_callback_url,0);
+	const char* jevent = env->GetStringUTFChars(js_event,0);
+	strcpy(url, jurl);
+	env->ReleaseStringUTFChars(js_callback_url, jurl);
+
+	strcpy(body, "&rho_callback=1");
+	strcat(body, "&");
+	strcat(body, "Tag_event=");
+	strcat(body, jevent);
+	env->ReleaseStringUTFChars(js_event, jevent);
+
+	rho_net_request_with_data(rho_http_normalizeurl(url), body);
+}
+
+
+
+
+
+
+
+
+
+
 static jclass jclass_NfcMessagePack = NULL;
 static jclass jclass_NfcMessage = NULL;
 static jclass jclass_NfcRecord = NULL;
@@ -350,20 +437,20 @@ private:
 
 
 //  private native void callCallback(String callback_url, NfcMessagePack msgpack);
-extern "C" void JNICALL Java_com_nfc_Nfc_callCallback
+extern "C" void JNICALL Java_com_rhomobile_nfc_Nfc_callCallback
 (JNIEnv *env, jclass, jstring js_callback_url, jobject jo_msgpack)
 {
 	logi("native callback START");
 	// fill java ids
-	jclass_NfcMessagePack = env->FindClass("com/nfc/NfcMessagePack");
-	jclass_NfcMessage = env->FindClass("com/nfc/NfcMessage");
-	jclass_NfcRecord = env->FindClass("com/nfc/NfcRecord");
+	jclass_NfcMessagePack = env->FindClass("com/rhomobile/nfc/NfcMessagePack");
+	jclass_NfcMessage = env->FindClass("com/rhomobile/nfc/NfcMessage");
+	jclass_NfcRecord = env->FindClass("com/rhomobile/nfc/NfcRecord");
 
 	jmethod_NfcMessagePack_getItemCount = env->GetMethodID( jclass_NfcMessagePack, "getItemCount", "()I");
-	jmethod_NfcMessagePack_getItem = env->GetMethodID( jclass_NfcMessagePack, "getItem", "(I)Lcom/nfc/NfcMessage;");
+	jmethod_NfcMessagePack_getItem = env->GetMethodID( jclass_NfcMessagePack, "getItem", "(I)Lcom/rhomobile/nfc/NfcMessage;");
 
 	jmethod_NfcMessage_getItemCount = env->GetMethodID( jclass_NfcMessage, "getItemCount", "()I");
-	jmethod_NfcMessage_getItem = env->GetMethodID( jclass_NfcMessage, "getItem", "(I)Lcom/nfc/NfcRecord;");
+	jmethod_NfcMessage_getItem = env->GetMethodID( jclass_NfcMessage, "getItem", "(I)Lcom/rhomobile/nfc/NfcRecord;");
 	jmethod_NfcMessage_getByteArray = env->GetMethodID( jclass_NfcMessage, "getByteArray", "()[B");
 
 	jmethod_NfcRecord_getId = env->GetMethodID( jclass_NfcRecord, "getId", "()[B");
@@ -372,7 +459,7 @@ extern "C" void JNICALL Java_com_nfc_Nfc_callCallback
 	jmethod_NfcRecord_getTnf = env->GetMethodID( jclass_NfcRecord, "getTnf", "()I");
 	jmethod_NfcRecord_getType = env->GetMethodID( jclass_NfcRecord, "getType", "()[B");
 	jmethod_NfcRecord_getByteArray = env->GetMethodID( jclass_NfcRecord, "getByteArray", "()[B");
-	jmethod_NfcRecord_getSubrecords = env->GetMethodID( jclass_NfcRecord, "getSubrecords", "()Lcom/nfc/NfcMessage;");
+	jmethod_NfcRecord_getSubrecords = env->GetMethodID( jclass_NfcRecord, "getSubrecords", "()Lcom/rhomobile/nfc/NfcMessage;");
 
 	logi("native callback TMP 01 java IDs collected");
 

data/lib/extensions/nfc/ext/nfc/platform/android/res/xml/filter_nfc.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <tech-list>
+        <tech>android.nfc.tech.MifareClassic</tech>
+    </tech-list>
+    <tech-list>
+        <tech>android.nfc.tech.MifareUltralight</tech>
+    </tech-list>
+    <tech-list>
+        <tech>android.nfc.tech.MifareClassic</tech>
+        <tech>android.nfc.tech.MifareUltralight</tech>
+    </tech-list>
+</resources>

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

@@ -0,0 +1,291 @@
+package com.rhomobile.nfc;
+
+import java.io.IOException;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
+import android.nfc.Tag;
+import android.nfc.tech.MifareClassic;
+import android.nfc.tech.MifareUltralight;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+
+import com.rhomobile.rhodes.PushService;
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.Utils;
+
+public class Nfc  {
+
+	
+	private static final String TAG = Nfc.class.getSimpleName();
+	
+	private static boolean ourIsEnable = false;
+	private static String ourCallback = null;
+	private static String ourTechCallback = null;
+	
+	private static Nfc ourInstance = null;
+
+	private static native void callCallback(String callback_url, NfcMessagePack msgpack);
+	private static native void callTechCallback(String callback_url, String tech_event);
+	
+	private static Tag ourTag = null;
+	
+	
+	private MifareClassic mMifareClassic = null;
+	private MifareUltralight mMifareUltralight = null;
+	
+	private String[] mTechList = null;
+	
+	
+	public static Nfc getInstance() {
+		if (ourInstance == null) {
+			ourInstance = new Nfc();
+		}
+		return ourInstance;
+	}
+	
+	
+	public static int isSupported() {
+		NfcAdapter da = null;
+		try {
+			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+			if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) {
+				da = NfcAdapter.getDefaultAdapter(RhodesService.getContext());
+			}
+			else if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD) {
+				da = NfcAdapter.getDefaultAdapter();
+			}
+		}
+		catch (Exception e) {
+			// nothing
+		}
+		if (da == null) {
+			return 0;
+		}
+		int res = 0;
+		if (da.isEnabled()) {
+			res = 1;
+		}
+		return res;
+	}
+	
+	public static int isEnabled() {
+		int res = 0;
+		if (ourIsEnable) {
+			res = 1;
+		}
+		return res;
+	}
+	
+	public static void setEnable(int enable) {
+		ourIsEnable = (enable != 0);
+	}
+	
+	public static void setCallback(String callback) {
+		ourCallback = callback;
+	}
+
+	public static void setTechCallback(String callback) {
+		ourTechCallback = callback;
+	}
+	
+	//@Override
+	//public void onReceive(Context context, Intent intent) {
+	
+	private static boolean isRhodesApplicationRun() {
+		return RhodesService.getInstance()!=null;
+	}
+
+	
+	public void onReceiveTag(Tag tag) {
+		if (tag == null) {
+			return;
+		}
+		
+		ourTag = tag;
+		
+		int count = 0;
+		mMifareClassic = MifareClassic.get(tag);
+		mMifareUltralight = MifareUltralight.get(tag);
+		
+		if (mMifareClassic != null) {
+			count++;
+		}
+		if (mMifareUltralight != null) {
+			count++;
+		}
+		mTechList = new String[count];
+		
+		count = 0;
+		if (mMifareClassic != null) {
+			mTechList[count++] = "MifareClassic";
+		}
+		if (mMifareUltralight != null) {
+			mTechList[count++] = "MifareUltralight";
+		}
+		
+        Utils.platformLog(TAG, "NFC TAG Tech Received ! Service started = "+String.valueOf(isRhodesApplicationRun()));
+        
+        if (isRhodesApplicationRun()) {
+        	if (ourIsEnable) {
+        		if (ourTechCallback != null) {
+        			if (ourTechCallback.length() > 0) {
+        				callTechCallback(ourTechCallback, "discovered");
+        			}
+                	else {
+                        Utils.platformLog(TAG, "Nfc callback is empty");
+                	}
+        		}
+            	else {
+                    Utils.platformLog(TAG, "Nfc callback is null");
+            	}
+        	}
+        	else {
+                Utils.platformLog(TAG, "Nfc is not enabled");
+        	}
+        }
+        
+	}
+	
+	public void onReceiveMessages(NdefMessage[] msgs) {
+        if (msgs == null || msgs.length == 0) {
+            return;
+        }
+		
+        Utils.platformLog(TAG, "NFC TAG Received ! Service started = "+String.valueOf(isRhodesApplicationRun()));
+        
+        NfcMessagePack pack = new NfcMessagePack(msgs);
+        
+        Utils.platformLog(TAG, "Message Pack created");
+        if (isRhodesApplicationRun()) {
+        	if (ourIsEnable) {
+        		if (ourCallback != null) {
+        			if (ourCallback.length() > 0) {
+        				callCallback(ourCallback, pack);
+        			}
+                	else {
+                        Utils.platformLog(TAG, "Nfc callback is empty");
+                	}
+        		}
+            	else {
+                    Utils.platformLog(TAG, "Nfc callback is null");
+            	}
+        	}
+        	else {
+                Utils.platformLog(TAG, "Nfc is not enabled");
+        	}
+        }
+        
+	}
+	
+
+	public static void clear_listen_tech_list() {
+		// listen all now
+	}
+	
+	public static void add_listen_tech(String tech_name) {
+		// listen all now
+	}
+	
+	public static int get_tech_list_count() {
+		return getInstance().mTechList.length;
+	}
+	
+	public static String get_tech_list(int index) {
+		return getInstance().mTechList[index];
+	}
+
+	public static void tech_connect(String tech_name) {
+		if (tech_name.equals("MifareClassic")) {
+			try {
+				if (getInstance().mMifareClassic != null)
+					getInstance().mMifareClassic.connect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		if (tech_name.equals("MifareUltralight")) {
+			try {
+				if (getInstance().mMifareUltralight != null)
+					getInstance().mMifareUltralight.connect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	public static void tech_close(String tech_name) {
+		if (tech_name.equals("MifareClassic")) {
+			try {
+				if (getInstance().mMifareClassic != null)
+					getInstance().mMifareClassic.close();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		if (tech_name.equals("MifareUltralight")) {
+			try {
+				if (getInstance().mMifareUltralight != null)
+					getInstance().mMifareUltralight.close();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	public static int tech_is_connected(String tech_name) {
+		if (tech_name.equals("MifareClassic")) {
+			if (getInstance().mMifareClassic != null)
+				if (getInstance().mMifareClassic.isConnected() )
+					return 1;
+		}
+		if (tech_name.equals("MifareUltralight")) {
+			if (getInstance().mMifareUltralight != null)
+				if (getInstance().mMifareUltralight.isConnected() ) 
+					return 1;
+		}
+		return 0;
+	}
+	
+	public static int tech_MifareClassic_get_size() {
+		return 0;
+	}
+	
+	public static void tech_MifareClassic_write_block(int index, byte[] block) {
+		
+	}
+	
+	public static void tech_MifareClassic_read_block(int index, byte[] block) {
+		
+	}
+	
+
+	public static int tech_MifareUltralight_get_size() {
+		return 0;
+	}
+	
+	public static void tech_MifareUltralight_write_page(int index, byte[] page) {
+		
+	}
+	
+	public static void tech_MifareUltralight_read_pages(int index, byte[] pages) {
+		
+	}
+	
+	
+	
+	
+
+}