[Card Emulation/Reader] Clean up sample and add compatibility for Com…

…monSampleLibrary changes
Mangopony · Jun 9, 2015 · 4767501 · 4767501
1 parent 07a2912
commit 4767501
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 63 deletions.
diff --git a/CardEmulation/CardEmulation/CardEmulation.csproj b/CardEmulation/CardEmulation/CardEmulation.csproj
@@ -42,12 +42,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.Support.v13">
-      <HintPath>..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -61,7 +55,6 @@
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\Icon.png" />

diff --git a/CardEmulation/CardEmulation/CardEmulationFragment.cs b/CardEmulation/CardEmulation/CardEmulationFragment.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Text;
 
-using Android.Support.V4.App;
 using Android.Content;
 using Android.OS;
 using Android.Runtime;
@@ -16,7 +15,7 @@
 
 namespace CardEmulation
 {
-	public class CardEmulationFragment : Android.Support.V4.App.Fragment
+	public class CardEmulationFragment : Fragment
 	{
 		public const string TAG = "CardEmulationFragment";
 		public override void OnCreate (Bundle savedInstanceState)

diff --git a/CardEmulation/CardEmulation/CardService.cs b/CardEmulation/CardEmulation/CardService.cs
@@ -29,7 +29,6 @@ public class CardService : HostApduService
 		private static readonly byte[] UNKNOWN_CMD_SW = HexStringToByteArray("0000"); 
 		private static readonly byte[] SELECT_APDU = BuildSelectApdu(SAMPLE_LOYALTY_CARD_AID);
 
-		private static readonly char[] HexArray = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
 		public override void OnDeactivated (DeactivationReason reason)
 		{
@@ -72,13 +71,6 @@ public override byte[] ProcessCommandApdu (byte[] commandApdu, Bundle extras)
 				return UNKNOWN_CMD_SW;
 			}
 		}
-		public CardService ()
-		{
-			var s = ByteArrayToHexString (SELECT_APDU);
-			int i = 0;
-			int o = i + 1;
-
-		}
 
 		public static string ByteArrayToHexString(byte[] bytes)
 		{
@@ -105,7 +97,7 @@ private static byte[] HexStringToByteArray(string s)
 					val = (ushort)Convert.ToInt32 (s[i].ToString() + "0", 16);
 					val2 = (ushort)Convert.ToInt32 ("0" + s [i + 1].ToString(), 16);
 				}
-				catch (Exception ex) {
+				catch (Exception) {
 					continue;
 				}
 

diff --git a/CardEmulation/CardEmulation/MainActivity.cs b/CardEmulation/CardEmulation/MainActivity.cs
@@ -17,15 +17,14 @@ public class MainActivity : SampleActivityBase
 		protected override void OnCreate (Bundle bundle)
 		{
 			base.OnCreate (bundle);
-
-			// Set our view from the "main" layout resource
 			SetContentView (Resource.Layout.activity_main);
-			Android.Support.V4.App.FragmentTransaction transaction = SupportFragmentManager.BeginTransaction();
-			CardEmulationFragment fragment = new CardEmulationFragment();
-			transaction.Replace (Resource.Id.sample_content_fragment, fragment);
-			transaction.Commit ();
-			//Intent intent = new Intent (this, typeof(CardService));
-			//StartService (intent);
+
+			if (bundle == null) {
+				FragmentTransaction transaction = FragmentManager.BeginTransaction ();
+				CardEmulationFragment fragment = new CardEmulationFragment ();
+				transaction.Replace (Resource.Id.sample_content_fragment, fragment);
+				transaction.Commit ();
+			}
 		}
 
 		public override bool OnCreateOptionsMenu (IMenu menu)
@@ -54,25 +53,25 @@ public override bool OnOptionsItemSelected (IMenuItem item)
 				} else {
 					output.DisplayedChild = 0;
 				}
-				SupportInvalidateOptionsMenu ();
+				InvalidateOptionsMenu ();
 				return true;
 			}
 			return base.OnOptionsItemSelected (item);
 		}
 
-		public override void InitializeLogging()
+		public override void InitializeLogging ()
 		{
 			// Wraps Android's native log framework
-			LogWrapper logWrapper = new LogWrapper ();
+			var logWrapper = new LogWrapper ();
 
 			Log.LogNode = logWrapper;
 
 			// Filter strips out everything except the message text
-			MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter ();
+			var msgFilter = new MessageOnlyLogFilter ();
 			logWrapper.NextNode = msgFilter;
 
 			// On screen logging via a fragment with a TextView
-			LogFragment logFragment = (LogFragment)SupportFragmentManager.FindFragmentById (Resource.Id.log_fragment);
+			var logFragment = (LogFragment)FragmentManager.FindFragmentById (Resource.Id.log_fragment);
 			msgFilter.NextNode = logFragment.LogView;
 
 			Log.Info (TAG, "Ready");

diff --git a/CardEmulation/CardEmulation/Properties/AndroidManifest.xml b/CardEmulation/CardEmulation/Properties/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="CardEmulation.CardEmulation">
-	<uses-sdk android:minSdkVersion="19"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.CardEmulation">
 	<uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
 	<uses-permission android:name="android.permission.NFC" />
 	<application android:label="CardEmulation" android:theme="@style/AppTheme">

diff --git a/CardEmulation/CardEmulation/packages.config b/CardEmulation/CardEmulation/packages.config
diff --git a/CardReader/CardReader.csproj b/CardReader/CardReader.csproj
@@ -40,7 +40,6 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Resources\AboutResources.txt" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
@@ -78,12 +77,6 @@
     <Reference Include="System" />
     <Reference Include="System.Net" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.v13">
-      <HintPath>packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommonSampleLibrary\CommonSampleLibrary.csproj">

diff --git a/CardReader/LoyaltyCardReader.cs b/CardReader/LoyaltyCardReader.cs
@@ -164,7 +164,7 @@ private static byte[] HexStringToByteArray(string s)
 					val = (ushort)Convert.ToInt32 (s[i].ToString() + "0", 16);
 					val2 = (ushort)Convert.ToInt32 ("0" + s [i + 1].ToString(), 16);
 				}
-				catch (Exception ex) {
+				catch (Exception) {
 					continue;
 				}
 

diff --git a/CardReader/MainActivity.cs b/CardReader/MainActivity.cs
@@ -45,13 +45,15 @@ public override string TAG {
 		private bool mLogShown;
 
 		protected override void OnCreate(Bundle savedInstanceState) {
-			base.OnCreate(savedInstanceState);
-			this.SetContentView (Resource.Layout.activity_main);
-
-			FragmentTransaction transaction = FragmentManager.BeginTransaction ();
-			CardReaderFragment fragment = new CardReaderFragment();
-			transaction.Replace(Resource.Id.sample_content_fragment, fragment);
-			transaction.Commit();
+			base.OnCreate (savedInstanceState);
+			SetContentView (Resource.Layout.activity_main);
+
+			if (savedInstanceState == null) {
+				FragmentTransaction transaction = FragmentManager.BeginTransaction ();
+				var fragment = new CardReaderFragment ();
+				transaction.Replace (Resource.Id.sample_content_fragment, fragment);
+				transaction.Commit ();
+			}
 		}
 
 		public override bool OnCreateOptionsMenu(IMenu menu)
@@ -79,7 +81,7 @@ public override bool OnOptionsItemSelected(IMenuItem item) {
 				} else {
 					output.DisplayedChild = 0;
 				}
-				SupportInvalidateOptionsMenu();
+				InvalidateOptionsMenu ();
 				return true;
 			}
 			return base.OnOptionsItemSelected (item);
@@ -98,7 +100,7 @@ public override void InitializeLogging()
 			logWrapper.NextNode = msgFilter;
 
 			// On screen logging via a fragment with a TextView
-			LogFragment logFragment = (LogFragment)SupportFragmentManager.FindFragmentById (Resource.Id.log_fragment);
+			LogFragment logFragment = (LogFragment)FragmentManager.FindFragmentById (Resource.Id.log_fragment);
 			msgFilter.NextNode = logFragment.LogView;
 
 			Log.Info (TAG, "Ready");

diff --git a/CardReader/Properties/AndroidManifest.xml b/CardReader/Properties/AndroidManifest.xml
@@ -14,9 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.android.example.cardreader">
-	<!-- NFC Reader Mode was added in API 19. -->
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.cardreader">
 	<uses-permission android:name="android.permission.NFC" />
 	<uses-feature android:name="android.hardware.nfc" android:required="true" />
 	<application android:allowBackup="true" android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:theme="@style/AppTheme">

diff --git a/CardReader/packages.config b/CardReader/packages.config