rhodes 3.0.1.beta.5 → 3.0.1.beta.6

data/doc/nfc.txt

@@ -5,6 +5,8 @@ NFC (Near Field Communication). NFC API provide access to NFC functionality. You
 NFC API implemented in native extension. You should add "nfc" to extension list in your nuild.yml before start using NFC in your application. And also do not forget enable NFC for start process NFC events - Rho::NFCManager.enable.
 NFC Ruby API based on Android NFC API. We recommended investigate Android doc for understand NFC Techs etc. See [Android NFC](http://developer.android.com/guide/topics/nfc/index.html)
 
+NOTE: Before start using of NFC functionality, do not forget check current platform for supporting of NFC ! Use this :   Rho::NFCManager.is_supported
+
 ## NFC events
 There are two different NFC callback can be received (you should setup callbacks before!) :
 * NFC callback : it executed when Android ACTION_NDEF_DISCOVERED or ACTION_TAG_DISCOVERED events processed.

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

@@ -33,8 +33,6 @@
     
     </application >
 
-    <uses-sdk android:minSdkVersion="10" />
-    
     <uses-feature android:name="android.hardware.nfc" android:required="false" />
 
     <uses-permission android:name="android.permission.NFC" />

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

@@ -29,6 +29,24 @@ void loge(const char* text) {
 } 
 
 
+static bool checkSDK() {
+     bool sdk_ok = false;
+    JNIEnv *env = jnienv();
+    jclass cls = rho_find_class(env, "com/rhomobile/nfc/NfcActivity");
+    if (!cls) {
+        loge("NfcActivity class not found !");
+        return false;
+    }
+    jmethodID mid = env->GetStaticMethodID(cls, "getSDKVersion", "()I");
+    if (!mid) { 
+        loge("NfcActivity.getSDKVersion() NOT FOUND !");
+        return false;
+    }
+    int version = env->CallStaticIntMethod(cls, mid);
+    env->DeleteLocalRef(cls);
+    return (version >= 9);
+}
+
 class CNfcJavaClass {
 public:
     CNfcJavaClass() {
@@ -608,6 +626,9 @@ private:
 
 
 extern "C" void rho_nfc_set_callback(const char* callback_url) {
+	if (!checkSDK()) {
+		return;
+	} 
 	JNIEnv *env = jnienv();
 	CNfcJavaClass cls;
 	if (!cls.get()) return;
@@ -619,6 +640,9 @@ extern "C" void rho_nfc_set_callback(const char* callback_url) {
 }
 
 extern "C" void rho_nfc_enable(int enable) {
+	if (!checkSDK()) {
+		return;
+	} 
 	JNIEnv *env = jnienv();
 	CNfcJavaClass cls;
 	if (!cls.get()) return;
@@ -628,14 +652,23 @@ extern "C" void rho_nfc_enable(int enable) {
 }
 
 extern "C" int rho_nfc_is_enabled(void) {
+	if (!checkSDK()) {
+		return 0;
+	} 
     return JavaHelper_exec_int_void("isEnabled");    
 }
 
 extern "C" int rho_nfc_is_supported(void) {
+	if (!checkSDK()) {
+		return 0;
+	} 
     return JavaHelper_exec_int_void("isSupported");    
 }
 
 extern "C" void rho_nfc_set_tech_callback(const char* callback_url) {
+	if (!checkSDK()) {
+		return;
+	} 
 	JNIEnv *env = jnienv();
 	CNfcJavaClass cls;
 	if (!cls.get()) return;
@@ -647,6 +680,9 @@ extern "C" void rho_nfc_set_tech_callback(const char* callback_url) {
 }
 
 extern "C" void rho_nfc_perform_open_application_event() {
+	if (!checkSDK()) {
+		return;
+	} 
 	JNIEnv *env = jnienv();
 	CNfcJavaClass cls;
 	if (!cls.get()) return;
@@ -664,6 +700,9 @@ extern "C" void rho_nfc_set_listen_tech_list(VALUE tech_list) {
 extern "C" VALUE rho_nfc_get_tech_list() {
 
     logi("rho_nfc_get_tech_list START");
+	if (!checkSDK()) {
+		return rho_ruby_get_NIL();
+	} 
 	JNIEnv *env = jnienv();
 	CNfcJavaClass cls;
 	if (!cls.get()) return rho_ruby_get_NIL();
@@ -928,6 +967,9 @@ extern "C" VALUE rho_nfc_tech_NfcA_transceive(VALUE data) {
 
 // return HASH
 extern "C" VALUE rho_nfc_convert_byte_array_to_NdeRecord_hash(VALUE array) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     initJavaIds();
     
     JNIEnv *env = jnienv();
@@ -954,6 +996,9 @@ extern "C" VALUE rho_nfc_convert_byte_array_to_NdeRecord_hash(VALUE array) {
 
 // return byte array
 extern "C" VALUE rho_nfc_convert_NdeRecord_hash_to_byte_array(VALUE hash) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     initJavaIds();
 
     VALUE ruby_id = rho_ruby_hash_aref(hash, "id");
@@ -981,6 +1026,9 @@ extern "C" VALUE rho_nfc_convert_NdeRecord_hash_to_byte_array(VALUE hash) {
 
 // return array of byte array
 extern "C" VALUE rho_nfc_convert_NdeMessage_byte_array_to_NdeRecords_array(VALUE array) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     
     initJavaIds();
 
@@ -1011,6 +1059,9 @@ extern "C" VALUE rho_nfc_convert_NdeMessage_byte_array_to_NdeRecords_array(VALUE
 
 // return byte array
 extern "C" VALUE rho_nfc_convert_NdeRecords_array_to_NdeMessage_byte_array(VALUE array) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     initJavaIds();
     
     JNIEnv *env = jnienv();
@@ -1044,6 +1095,9 @@ extern "C" VALUE rho_nfc_convert_NdeRecords_array_to_NdeMessage_byte_array(VALUE
 // String make_string_from_payload(byte[] payload, int tnf, byte[] type)
 // return string
 extern "C" VALUE rho_nfc_make_string_from_payload(VALUE payload, int tnf, VALUE type) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     
     CRubyByteArray c_payload(payload);
     CRubyByteArray c_type(type);
@@ -1063,6 +1117,9 @@ extern "C" VALUE rho_nfc_make_string_from_payload(VALUE payload, int tnf, VALUE
 
 // return byte[]
 extern "C" VALUE rho_nfc_make_payload_with_absolute_uri(const char* str) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     
     CRubyString c_s(str);
     
@@ -1082,6 +1139,9 @@ extern "C" VALUE rho_nfc_make_payload_with_absolute_uri(const char* str) {
 
 // return byte[]
 extern "C" VALUE rho_nfc_make_payload_with_well_known_text(const char* language, const char* str) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     CRubyString c_lang(language);
     CRubyString c_s(str);
     
@@ -1101,6 +1161,9 @@ extern "C" VALUE rho_nfc_make_payload_with_well_known_text(const char* language,
 
 // return byte[]
 extern "C" VALUE rho_nfc_make_payload_with_well_known_uri(int prefix, const char* str) {
+    if (!checkSDK()) {
+         return rho_ruby_get_NIL();
+    } 
     CRubyString c_s(str);
     
     JNIEnv *env = jnienv();
@@ -1117,10 +1180,16 @@ extern "C" VALUE rho_nfc_make_payload_with_well_known_uri(int prefix, const char
 }
 
 extern "C" void rho_nfc_p2p_enable_foreground_nde_push(VALUE nde_message_byte_array) {
+    if (!checkSDK()) {
+         return;
+    } 
     JavaHelper_exec_void_bytearray(nde_message_byte_array, "p2p_enable_foreground_nde_push");
 }
 
 extern "C" void rho_nfc_p2p_disable_foreground_nde_push() {
+    if (!checkSDK()) {
+         return;
+    } 
     JNIEnv *env = jnienv();
     CNfcJavaClass cls;
     if (!cls.get()) return;

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

@@ -123,21 +123,31 @@ public class Nfc implements RhodesActivityListener {
 		return ourInstance;
 	}
 	
-	
-	public static int isSupported() {
+	public static NfcAdapter getDefaultAdapter(Context ctx) {
+		Context context = ctx;
+		if (ctx == null) {
+			context = RhodesActivity.getContext();
+		}
 		NfcAdapter da = null;
 		try {
-			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+			int sdkVersion = Build.VERSION.SDK_INT;
 			if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) {
-				da = NfcAdapter.getDefaultAdapter(RhodesService.getContext());
-			}
+				da = NfcAdapter.getDefaultAdapter(RhodesActivity.getContext());
+			} 
 			else if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD) {
 				da = NfcAdapter.getDefaultAdapter();
 			}
 		}
 		catch (Exception e) {
 			// nothing
+			Utils.platformLog(TAG, "Exception during get NFCAdapter");
+			e.printStackTrace();
 		}
+		return da;
+	}
+	
+	public static int isSupported() {
+		NfcAdapter da = getDefaultAdapter(null);
 		if (da == null) {
 			return 0;
 		}
@@ -194,7 +204,7 @@ public class Nfc implements RhodesActivityListener {
 	
 	public void onPause(RhodesActivity activity) {
 		log(" $$$$$$$$$ onPause() ");
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(RhodesActivity.getContext());
+		NfcAdapter nfcAdapter = getDefaultAdapter(RhodesActivity.getContext());
 		if (nfcAdapter != null) {
 			nfcAdapter.disableForegroundDispatch(activity);
 			nfcAdapter.disableForegroundNdefPush(activity);
@@ -203,7 +213,7 @@ public class Nfc implements RhodesActivityListener {
 	
 	public void onResume(RhodesActivity activity) {
 		log(" $$$$$$$$$ onResume() ");
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(RhodesActivity.getContext());
+		NfcAdapter nfcAdapter = getDefaultAdapter(RhodesActivity.getContext());
 		if ((nfcAdapter != null) && (ourIsEnable)) {
 			IntentFilter[] filters = new IntentFilter[1];
 			filters[0] = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);

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

@@ -1,26 +1,10 @@
 package com.rhomobile.nfc;
 
-import java.util.Iterator;
-
 import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.Tag;
 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.RhodesActivityListener;
-import com.rhomobile.rhodes.RhodesApplication;
-import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.Utils;
 
 public class NfcActivity  extends Activity {
@@ -30,6 +14,10 @@ public class NfcActivity  extends Activity {
 	
 	private static Intent ourIntent = null;
 	
+	private static int getSDKVersion() {
+		return Build.VERSION.SDK_INT;
+	}
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		Utils.platformLog(TAG, " $$$$$$$  NfcActivity onCreate !!! START ");
@@ -89,6 +77,7 @@ public class NfcActivity  extends Activity {
 	}	
 	
 	private void processNewIntent(Intent intent) {
+		/*
 	    super.onNewIntent(intent);
 		String action = intent.getAction();
 		
@@ -108,6 +97,7 @@ public class NfcActivity  extends Activity {
 	     	startActivity(run_intent);
 		     	
 		}
+		*/
 	}
 	
 	

data/platform/android/build/android.rake

@@ -1468,20 +1468,15 @@ namespace "device" do
       final_apkfile =  $targetdir + "/" + $appname + "-debug.apk"
       resourcepkg =  $bindir + "/rhodes.ap_"
 
-      puts "Building APK file"
-      Jake.run($apkbuilder, [simple_apkfile, "-z", resourcepkg, "-f", dexfile])
-      unless $?.success?
-        puts "Error building APK file"
-        exit 1
-      end
-
+      apk_build $androidsdkpath, simple_apkfile, resourcepkg, dexfile, true
+      
       puts "Align Debug APK file"
       args = []
       args << "-f"
       args << "-v"
       args << "4"
-      args << '"' + simple_apkfile + '"'
-      args << '"' + final_apkfile + '"'
+      args << simple_apkfile
+      args << final_apkfile
       puts Jake.run($zipalign, args)
       unless $?.success?
         puts "Error running zipalign"
@@ -1515,12 +1510,7 @@ namespace "device" do
       signed_apkfile =  $targetdir + "/" + $appname + "_tmp_signed.apk"
       resourcepkg =  $bindir + "/rhodes.ap_"
 
-      puts "Building APK file"
-      Jake.run($apkbuilder, [simple_apkfile, "-u", "-z", resourcepkg, "-f", dexfile])
-      unless $?.success?
-        puts "Error building APK file"
-        exit 1
-      end
+      apk_build $androidsdkpath, simple_apkfile, resourcepkg, dexfile, false
 
       if not File.exists? $keystore
         puts "Generating private keystore..."

data/platform/android/build/androidcommon.rb

@@ -207,7 +207,7 @@ def cc_run(command, args, chdir = nil)
   cmdstr = argv.map! { |x| x.to_s }.map! { |x| x =~ / / ? '"' + x + '"' : x }.join(' ')
   puts cmdstr
   $stdout.flush
-  argv = cmdstr if RUBY_VERSION =~ /^1\.8/
+  argv = cmdstr if RUBY_VERSION =~ /^1\.[89]/
   IO.popen(argv) do |f|
     while data = f.gets
       puts data
@@ -335,3 +335,24 @@ def cc_clean(name)
     rm_rf x if File.exists? x
   end
 end
+
+def apk_build(sdk, apk_name, res_name, dex_name, debug)
+    puts "Building APK file..."
+    prev_dir = Dir.pwd
+    Dir.chdir File.join(sdk, "tools")
+    #"-classpath", File.join("lib", "sdklib.jar"), "com.android.sdklib.build.ApkBuilderMain", 
+    if debug
+        params = [apk_name, "-z", res_name, "-f", dex_name]
+    else
+        params = [apk_name, "-u", "-z", res_name, "-f", dex_name]
+    end
+    
+    Jake.run("apkbuilder" + $bat_ext, params)
+    
+    unless $?.success?
+        Dir.chdir prev_dir
+        puts "Error building APK file"
+        exit 1
+    end
+    Dir.chdir prev_dir
+end

data/platform/shared/net/HttpServer.cpp

@@ -1051,7 +1051,11 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
 
 #ifdef OS_ANDROID
     //Work around malformed Android WebView URLs
-    if ((uri.find("/app") != 0) && (uri.find("/public") != 0) && (uri.find("/rhodata/apps/") == String::npos)) {
+    if (!String_startsWith(uri, "/app") &&
+        !String_startsWith(uri, "/public") &&
+        !String_startsWith(uri, "/data")) 
+    {
+        RAWTRACE1("Malformed URL: '%s', adding '/app' prefix.", uri.c_str());
         uri = CFilePath::join("/app", uri);
     }
 #endif

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.0.1.beta.5"
+  s.version = "3.0.1.beta.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196417
+  hash: 62196423
   prerelease: true
   segments: 
   - 3
   - 0
   - 1
   - beta
-  - 5
-  version: 3.0.1.beta.5
+  - 6
+  version: 3.0.1.beta.6
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency