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

data/platform/wp7/build/wp.rake

@@ -167,19 +167,19 @@ end
 			chdir $startdir
 		end 
 
-		task :devrhobundleRelease => [:rhobundle, :rhobundlemap, "device:wp:addbundletoxapRelease"] do
-			out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
-			doc = REXML::Document.new(File.open(out_dir + "XapCacheFile.xml"))
-			chdir $srcdir
-			Dir.glob(File.join("**", '*.*')).each do |f|
-				doc.root[1,0] = REXML::Element.new "file lastWriteTime='" + File.mtime(f).strftime("%m/%d/%Y %I:%M:%S %p") + "' source='" + $srcdir.gsub("/", "\\") + "\\" + f.gsub("/", "\\") + "' archivePath='" + f.gsub("/", "\\") + "'" 
-			end
-			File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
+		task :devrhobundleRelease do #=> [:rhobundle, :rhobundlemap, "device:wp:addbundletoxapRelease"] do
+			#out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+			#doc = REXML::Document.new(File.open(out_dir + "XapCacheFile.xml"))
+			#chdir $srcdir
+			#Dir.glob(File.join("**", '*.*')).each do |f|
+		#		doc.root[1,0] = REXML::Element.new "file lastWriteTime='" + File.mtime(f).strftime("%m/%d/%Y %I:%M:%S %p") + "' source='" + $srcdir.gsub("/", "\\") + "\\" + f.gsub("/", "\\") + "' archivePath='" + f.gsub("/", "\\") + "'" 
+		#	end
+		#	File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
 			
-			chdir $startdir
+		#	chdir $startdir
 
-			mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
-			cp out_dir + "XapCacheFile.xml", $config["build"]["wppath"] + "/rhodes/obj/Release"
+		#	mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
+	#		cp out_dir + "XapCacheFile.xml", $config["build"]["wppath"] + "/rhodes/obj/Release"
 		end
 
 		task :devrhobundleDebug => [:rhobundle, :rhobundlemap, "device:wp:addbundletoxapDebug"] do

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.0.0.beta.4"
+  s.version = "3.0.0.beta.5"
 
   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: 62196427
+  hash: 62196425
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
   - beta
-  - 4
-  version: 3.0.0.beta.4
+  - 5
+  version: 3.0.0.beta.5
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 -07:00
+date: 2011-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -855,10 +855,13 @@ files:
 - 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
@@ -1172,6 +1175,7 @@ files:
 - 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
@@ -4236,6 +4240,7 @@ files:
 - 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/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/Nfc.java

@@ -1,150 +0,0 @@
-package com.nfc;
-
-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.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  extends BroadcastReceiver {
-
-	
-	private static final String TAG = Nfc.class.getSimpleName();
-	
-	private static boolean ourIsEnable = false;
-	private static String ourCallback = null;
-	
-	private static Nfc ourInstance = null;
-
-	private static native void callCallback(String callback_url, NfcMessagePack msgpack);
-	
-	
-	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;
-	}
-	
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		String action = intent.getAction();
-		
-		if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)) {
-            Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
-            NdefMessage[] msgs;
-            if (rawMsgs != null) {
-                msgs = new NdefMessage[rawMsgs.length];
-                for (int i = 0; i < rawMsgs.length; i++) {
-                    msgs[i] = (NdefMessage) rawMsgs[i];
-                }
-            } else {
-                // Unknown tag type
-                byte[] empty = new byte[] {};
-                NdefRecord record = new NdefRecord(NdefRecord.TNF_UNKNOWN, empty, empty, empty);
-                NdefMessage msg = new NdefMessage(new NdefRecord[] {record});
-                msgs = new NdefMessage[] {msg};
-            }
-            onReceiveMessages(msgs);
-        }
-	}
-	
-	private static boolean isRhodesApplicationRun() {
-		return RhodesService.getInstance()!=null;
-	}
-	
-	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);
-        
-        if (isRhodesApplicationRun()) {
-        	if (ourIsEnable) {
-        		if (ourCallback != null) {
-        			if (ourCallback.length() > 0) {
-        				callCallback(ourCallback, pack);
-        			}
-        		}
-        	}
-        }
-        
-        
-	}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-}