rhodes 3.3.3.beta.4 → 3.3.3

data/lib/extensions/digest/ext/Rakefile

@@ -6,27 +6,28 @@ def build_extension(name, arch)
 
   Dir.glob("*.c").each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
-    objects << objname
+    objects << ('"'+objname+'"')
 
     args = []
     args << "-I."
-    args << "-I#{$rootdir}/platform/shared/ruby/include"
-    args << "-I#{$rootdir}/platform/shared"
+    args << "-I\"#{$rootdir}/platform/shared/ruby/include\""
+    args << "-I\"#{$rootdir}/platform/shared\""
+    args << "-I\"#{$rootdir}/platform/shared/common\""
 
     if ENV['RHO_PLATFORM'] == 'android'
-      args << "-I#{$rootdir}/platform/shared/ruby/android"
-      args << "-I#{$rootdir}/platform/shared/ruby/generated"
+      args << "-I\"#{$rootdir}/platform/shared/ruby/android\""
+      args << "-I\"#{$rootdir}/platform/shared/ruby/generated\""
       cc_compile f, $tempdir, args or exit 1
 
     elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
-      args << "-I#{$rootdir}/platform/shared/ruby/iphone"
+      args << "-I\"#{$rootdir}/platform/shared/ruby/iphone\""
       args << "-D_XOPEN_SOURCE"
       args << "-D_DARWIN_C_SOURCE"
-      args << "-isysroot #{$sdkroot}"
+      args << "-isysroot \"#{$sdkroot}\""
       args << "-fno-common"
       args << "-arch #{arch}"
       args << "-O2"
-      args << "-o #{objname}"
+      args << "-o \"#{objname}\""
       args << "-c"
       args << f
       cmdline = $gccbin + ' ' + args.join(' ')
@@ -40,7 +41,7 @@ def build_extension(name, arch)
   mkdir_p $targetdir unless File.exist? $targetdir
 
   if ENV['RHO_PLATFORM'] == 'android'
-    cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+    cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
 
   elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
     args = []
@@ -55,7 +56,7 @@ def build_extension(name, arch)
   elsif ENV['RHO_PLATFORM'] == 'wm'
     args = []
     args << "/M4"
-    args << name + ".vcproj"
+    args << name + ".sln"
     args << "\"Release|#{$sdk}\""
     cmdline = "\"" + $vcbuild + "\"" + ' ' + args.join(' ')
     puts cmdline
@@ -67,7 +68,7 @@ def build_extension(name, arch)
   elsif ENV['RHO_PLATFORM'] == 'win32'
     args = []
     args << "/M4"
-    args << name + ".vcproj"
+    args << name + ".sln"
     args << "\"#{ENV['RHO_BUILD_CONFIG']}|Win32\""
     cmdline = "\"" + $vcbuild + "\"" + ' ' + args.join(' ')
     puts cmdline

data/lib/extensions/digest/ext/digest.sln

@@ -0,0 +1,44 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "digest", "digest.vcproj", "{73453E27-E84A-40C4-BD6A-51A8373D7044}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|MC3000c50b (ARMV4I) = Debug|MC3000c50b (ARMV4I)
+		Debug|Win32 = Debug|Win32
+		Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
+		Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I) = Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		Release|MC3000c50b (ARMV4I) = Release|MC3000c50b (ARMV4I)
+		Release|Win32 = Release|Win32
+		Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I)
+		Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I) = Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|MC3000c50b (ARMV4I).ActiveCfg = Debug|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|MC3000c50b (ARMV4I).Build.0 = Debug|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|MC3000c50b (ARMV4I).Deploy.0 = Debug|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Win32.Build.0 = Debug|Win32
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I).Build.0 = Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|MC3000c50b (ARMV4I).ActiveCfg = Release|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|MC3000c50b (ARMV4I).Build.0 = Release|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|MC3000c50b (ARMV4I).Deploy.0 = Release|MC3000c50b (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Win32.ActiveCfg = Release|Win32
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Win32.Build.0 = Release|Win32
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I).ActiveCfg = Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I).Build.0 = Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+		{73453E27-E84A-40C4-BD6A-51A8373D7044}.Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I).Deploy.0 = Release|Windows Mobile 6.5.3 Professional DTK (ARMV4I)
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/lib/extensions/digest/ext/digest.vcproj

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="digest"
 	ProjectGUID="{73453E27-E84A-40C4-BD6A-51A8373D7044}"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -83,6 +84,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -225,6 +229,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -241,7 +248,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -261,16 +268,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
 				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -280,7 +285,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -301,6 +306,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -317,7 +325,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Release|Win32"
 			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -340,10 +348,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
 				Optimization="2"
 				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -376,22 +383,14 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release|MC3000c50b (ARMV4I)"
 			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -411,12 +410,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="2"
 				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
-				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -451,12 +452,23 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
-			Name="Release|MC3000c50b (ARMV4I)"
+			Name="Debug|Windows Mobile 6.5.3 Professional DTK (ARMV4I)"
 			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -481,10 +493,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -494,7 +507,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>

data/lib/extensions/fcntl/ext/Rakefile

@@ -6,27 +6,27 @@ def build_extension(name, arch)
 
   Dir.glob("*.c").each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
-    objects << objname
+     objects << ('"'+objname+'"')
 
     args = []
     args << "-I."
-    args << "-I#{$rootdir}/platform/shared/ruby/include"
-    args << "-I#{$rootdir}/platform/shared"
+    args << "-I\"#{$rootdir}/platform/shared/ruby/include\""
+    args << "-I\"#{$rootdir}/platform/shared\""
 
     if ENV['RHO_PLATFORM'] == 'android'
-      args << "-I#{$rootdir}/platform/shared/ruby/android"
-      args << "-I#{$rootdir}/platform/shared/ruby/generated"
+      args << "-I\"#{$rootdir}/platform/shared/ruby/android\""
+      args << "-I\"#{$rootdir}/platform/shared/ruby/generated\""
       cc_compile f, $tempdir, args or exit 1
 
     elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
-      args << "-I#{$rootdir}/platform/shared/ruby/iphone"
+      args << "-I\"#{$rootdir}/platform/shared/ruby/iphone\""
       args << "-D_XOPEN_SOURCE"
       args << "-D_DARWIN_C_SOURCE"
-      args << "-isysroot #{$sdkroot}"
+      args << "-isysroot \"#{$sdkroot}\""
       args << "-fno-common"
       args << "-arch #{arch}"
       args << "-O2"
-      args << "-o #{objname}"
+      args << "-o \"#{objname}\""
       args << "-c"
       args << f
       cmdline = $gccbin + ' ' + args.join(' ')
@@ -34,13 +34,14 @@ def build_extension(name, arch)
       puts `#{cmdline}`
       exit unless $? == 0
 
+
     end
   end
 
   mkdir_p $targetdir unless File.exist? $targetdir
 
   if ENV['RHO_PLATFORM'] == 'android'
-    cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+    cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
 
   elsif (ENV['RHO_PLATFORM'] == 'iphone') or (ENV['RHO_PLATFORM'] == 'osx')
     args = []

data/lib/extensions/fcntl/ext/fcntl.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="fcntl"
 	ProjectGUID="{73453E27-E84A-40C4-BD6A-51A8373D7044}"
 	Keyword="Win32Proj"

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

@@ -15,21 +15,21 @@ def build_extension(name, arch, src_files)
   #Dir.glob("*.c").each do |f|
   src_files.each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
-    objects << objname
+    objects << ('"'+objname+'"')
 
     args = []
     args << "-I."
-    args << "-I#{$rootdir}/platform/android/Rhodes/jni/include"
-    args << "-I#{$rootdir}/platform/shared/ruby/include"
-    args << "-I#{$rootdir}/platform/shared"
-    args << "-I#{$rootdir}/platform/shared/common"
+    args << "-I\"#{$rootdir}/platform/shared/ruby/include\""
+    args << "-I\"#{$rootdir}/platform/shared\""
+    args << "-I\"#{$rootdir}/platform/shared/common\""
 
-    args << "-I#{$std_includes}" unless $std_includes.nil?
+    args << "-I\"#{$std_includes}\"" unless $std_includes.nil?
     args << "-D__NEW__" if use_own_stlport
-    args << "-I#{$stlport_includes}" if use_own_stlport
-
-    args << "-I#{$rootdir}/platform/shared/ruby/android"
-    args << "-I#{$rootdir}/platform/shared/ruby/generated"
+    args << "-I\"#{$stlport_includes}\"" if use_own_stlport
+    
+    args << "-I\"#{$rootdir}/platform/shared/ruby/android\""
+    args << "-I\"#{$rootdir}/platform/shared/ruby/generated\""
+    args << "-I\"#{$rootdir}/platform/android/Rhodes/jni/include\""
 
     cc_compile f, $tempdir, args or exit 1
 
@@ -37,7 +37,7 @@ def build_extension(name, arch, src_files)
 
   mkdir_p $targetdir unless File.exist? $targetdir
 
-  cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+  cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
 
 end
 

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Set;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -36,12 +37,14 @@ import android.os.Parcelable;
 import android.util.Log;
 
 import com.rhomobile.rhodes.RhodesActivity;
-import com.rhomobile.rhodes.RhodesActivityListener;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.IRhoExtManager;;
+import com.rhomobile.rhodes.extmanager.IRhoListener;
+import com.rhomobile.rhodes.extmanager.RhoExtManager;;
 import com.rhomobile.rhodes.util.Utils;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
-public class Nfc implements RhodesActivityListener {
+public class Nfc implements IRhoListener {
 
 	private static final String TAG = Nfc.class.getSimpleName();
 	
@@ -117,9 +120,6 @@ public class Nfc implements RhodesActivityListener {
 	}
 	
 	public static Nfc getInstance() {
-		if (ourInstance == null) {
-			ourInstance = new Nfc();
-		}
 		return ourInstance;
 	}
 	
@@ -199,8 +199,9 @@ public class Nfc implements RhodesActivityListener {
 	}
 	
 	@Override
-	public void onRhodesActivityStartup(RhodesActivity activity) {
-		activity.addRhodesActivityListener(getInstance());
+	public void onCreateApplication(IRhoExtManager extManager) {
+	    ourInstance = this;
+		extManager.addRhoListener(this);
 	}
 	
 	@Override
@@ -1156,8 +1157,9 @@ public class Nfc implements RhodesActivityListener {
 		}
 		return result;
 	}
-	
-	
-	
+
+    public Dialog onCreateDialog(RhodesActivity activity, int id) {
+        return null;
+    }
 
 }