Merge branch 'master' of https://github.com/CreateChance/AndroidFingerPrintDemo

CreateChance · CreateChance · commit d700df7354da · 2016-07-22T09:29:40.000+08:00
Conflicts:
	app/src/main/java/com/createchance/fingerprintdemo/MainActivity.java
	build/generated/mockable-android-23.jar
diff --git a/app/src/main/java/com/createchance/fingerprintdemo/CryptoObjectHelper.java b/app/src/main/java/com/createchance/fingerprintdemo/CryptoObjectHelper.java
@@ -17,7 +17,7 @@
 public class CryptoObjectHelper
 {
     // This can be key name you want. Should be unique for the app.
-    static final String KEY_NAME = "com.xamarin.android.sample.fingerprint_authentication_key";
+    static final String KEY_NAME = "com.createchance.android.sample.fingerprint_authentication_key";
 
     // We always use this keystore on Android.
     static final String KEYSTORE_NAME = "AndroidKeyStore";

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`public class CryptoObjectHelper`
`18`	`18`	`{`
`19`	`19`	`// This can be key name you want. Should be unique for the app.`
`20`		`- static final String KEY_NAME = "com.xamarin.android.sample.fingerprint_authentication_key";`
	`20`	`+ static final String KEY_NAME = "com.createchance.android.sample.fingerprint_authentication_key";`
`21`	`21`
`22`	`22`	`// We always use this keystore on Android.`
`23`	`23`	`static final String KEYSTORE_NAME = "AndroidKeyStore";`