v2.0.0

Author: dschuermann

hwsecurity-fido/build.gradle

@@ -27,12 +27,11 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.18.0'
 }
 
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 14
         versionCode rootProject.ext.hwSdkVersionCode
         versionName rootProject.ext.hwSdkVersionName
         vectorDrawables.useSupportLibrary = true

hwsecurity-fido/src/main/AndroidManifest.xml

@@ -2,9 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.cotech.hw.fido">
 
-    <application>
-        <!--<activity-->
-            <!--android:name="de.cotech.hw.fido.ui.FidoU2fActivity"-->
-            <!--android:theme="@style/HwSecurity.Dialog.Translucent" />-->
-    </application>
+    <application />
 </manifest>

hwsecurity-fido/src/main/java/de/cotech/hw/fido/FidoAuthenticateRequest.java

@@ -35,10 +35,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/**
- * TODO: Make this more similar to the specified Javascript API?
- * https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-javascript-api-v1.2-ps-20170411.html
- */
+
 @AutoValue
 public abstract class FidoAuthenticateRequest implements Parcelable {
     private static final String REQUEST_TYP_AUTH = "navigator.id.getAssertion";

hwsecurity-fido/src/main/java/de/cotech/hw/fido/FidoRegisterRequest.java

@@ -32,10 +32,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/**
- * TODO: Make this more similar to the specified Javascript API?
- * https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-javascript-api-v1.2-ps-20170411.html
- */
+
 @AutoValue
 public abstract class FidoRegisterRequest implements Parcelable {
     private static final String REQUEST_TYP_REGISTER = "navigator.id.finishEnrollment";

hwsecurity-fido/src/main/java/de/cotech/hw/fido/WebsafeBase64.java

@@ -34,10 +34,8 @@
 public class WebsafeBase64 {
 
     /**
-     * websafe-base64 encoding
-     * This is the "Base 64 Encoding with URL and Filename Safe Alphabet" from Section 5 in [RFC4648] without padding.
-     * See Section 7
-     * https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-raw-message-formats-v1.2-ps-20170411.html#bib-RFC4648
+     * Websafe Base64 encoding as specified by the FIDO U2F specification:
+     * https://fidoalliance.org/specs/fido-u2f-v1.2-ps-20170411/fido-u2f-raw-message-formats-v1.2-ps-20170411.html#client-data
      */
     public static String encodeToString(byte[] decoded) {
         return Base64.encodeToString(decoded, Base64.NO_PADDING | Base64.NO_WRAP | Base64.URL_SAFE);

hwsecurity-fido/src/main/java/de/cotech/hw/fido/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * The FIDO package of the Security Hardware SDK.
+ */
+package de.cotech.hw.fido;

hwsecurity-fido/src/main/java/de/cotech/hw/fido/ui/FidoDialogFragment.java

@@ -64,6 +64,7 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -556,7 +557,7 @@ private void animateNfcFinal() {
         Animatable2Compat.AnimationCallback animationCallback = new Animatable2Compat.AnimationCallback() {
             @Override
             public void onAnimationEnd(Drawable drawable) {
-                if (!imageNfcFullscreen.isAttachedToWindow()) {
+                if (!ViewCompat.isAttachedToWindow(imageNfcFullscreen)) {
                     return;
                 }
 
@@ -749,15 +750,14 @@ private void animateError() {
         }
     }
 
-    @SuppressLint("NewApi")
     private void startAndLoopAnimation(ImageView imageView, int resId) {
         Animatable2Compat.AnimationCallback animationCallback = new Animatable2Compat.AnimationCallback() {
             @NonNull
             private final Handler fHandler = new Handler(Looper.getMainLooper());
 
             @Override
             public void onAnimationEnd(@NonNull Drawable drawable) {
-                if (!imageView.isAttachedToWindow()) {
+                if (!ViewCompat.isAttachedToWindow(imageView)) {
                     return;
                 }
 

hwsecurity-intent-nfc/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <application>
         <activity
-            android:name="de.cotech.hw.NfcIntentDispatchActivity"
+            android:name="de.cotech.hw.internal.dispatch.NfcIntentDispatchActivity"
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
@@ -17,4 +17,4 @@
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
     </application>
-</manifest>
+</manifest>

hwsecurity-intent-usb/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
 
     <application>
         <activity
-            android:name="de.cotech.hw.UsbIntentDispatchActivity"
+            android:name="de.cotech.hw.internal.dispatch.UsbIntentDispatchActivity"
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">