Update SDK to version 1.2.0, which adds offline QR Code functionality. Update Demo App and README

FuturaeDemo/app/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-core:16.0.7'
     implementation 'com.google.firebase:firebase-messaging:17.4.0'
 
-    implementation('com.futurae.sdk:futuraekit:1.1.1')
+    implementation('com.futurae.sdk:futuraekit:1.2.0')
 
 //  Use these if you are NOT using Maven
 //    implementation 'com.squareup.retrofit2:retrofit:2.4.0'

FuturaeDemo/app/src/main/java/com/futurae/futuraedemo/ui/FTRQRCodeActivity.java

@@ -50,6 +50,8 @@ public class FTRQRCodeActivity extends AppCompatActivity implements QRCapturable
 
     public static final int RESULT_BARCODE = 10000;
     public static final int RESULT_BARCODE_AUTH = 20000;
+    public static final int RESULT_BARCODE_OFFLINE = 30000;
+    public static final int RESULT_BARCODE_GENERIC = 40000;
 
     public static final String PARAM_BARCODE = "ftr_barcode";
     public static final String PARAM_AUTOFOCUS = "ftr_autofocus";

FuturaeDemo/app/src/main/java/com/futurae/futuraedemo/ui/MainActivity.java

@@ -22,6 +22,7 @@ import com.futurae.futuraedemo.R;
 import com.futurae.sdk.FuturaeCallback;
 import com.futurae.sdk.FuturaeClient;
 import com.futurae.sdk.FuturaeResultCallback;
+import com.futurae.sdk.MalformedQRCodeException;
 import com.futurae.sdk.approve.ApproveSession;
 import com.futurae.sdk.model.Account;
 import com.futurae.sdk.model.ApproveInfo;
@@ -55,6 +56,12 @@ public class MainActivity extends AppCompatActivity {
                 case FTRQRCodeActivity.RESULT_BARCODE_AUTH:
                     onAuthQRCodeScanned(data);
                     break;
+                case FTRQRCodeActivity.RESULT_BARCODE_OFFLINE:
+                    onOfflineAuthQRCodeScanned(data);
+                    break;
+                case FTRQRCodeActivity.RESULT_BARCODE_GENERIC:
+                    onQRCodeScanned(data);
+                    break;
             }
         }
     }
@@ -96,17 +103,17 @@ public class MainActivity extends AppCompatActivity {
                 String userId = FuturaeClient.getUserIdFromUri(uriCall);
                 String sessionToken = FuturaeClient.getSessionTokenFromUri(uriCall);
                 FuturaeClient.sharedClient().sessionInfoByToken(userId, sessionToken,
-                    new FuturaeResultCallback<SessionInfo>() {
-                        @Override
-                        public void success(SessionInfo sessionInfo) {
-                            showApproveAlertDialog(new ApproveSession(sessionInfo), true);
-                        }
+                        new FuturaeResultCallback<SessionInfo>() {
+                            @Override
+                            public void success(SessionInfo sessionInfo) {
+                                showApproveAlertDialog(new ApproveSession(sessionInfo), true);
+                            }
 
-                        @Override
-                        public void failure(Throwable t) {
-                            Log.e(TAG, "QR Code authentication failed: " + t.getLocalizedMessage());
-                        }
-                    });
+                            @Override
+                            public void failure(Throwable t) {
+                                Log.e(TAG, "QR Code authentication failed: " + t.getLocalizedMessage());
+                            }
+                        });
                 return;
             }
 
@@ -149,13 +156,6 @@ public class MainActivity extends AppCompatActivity {
                 });
     }
 
-    @OnClick(R.id.main_btn_qr_code_auth)
-    protected void onQRCodeAuth() {
-        Log.i(TAG, "QR Code factor authentication started");
-        startActivityForResult(FTRQRCodeActivity.getIntent(this, true, false),
-                FTRQRCodeActivity.RESULT_BARCODE_AUTH);
-    }
-
     @OnClick(R.id.main_btn_totp)
     protected void onTOTPAuth() {
         List<Account> accounts = FuturaeClient.sharedClient().getAccounts();
@@ -170,6 +170,26 @@ public class MainActivity extends AppCompatActivity {
         showAlert("TOTP", "Code: " + totp.getPasscode() + "\nRemaining seconds: " + totp.getRemainingSecs());
     }
 
+    @OnClick(R.id.main_btn_qr_code_auth)
+    protected void onQRCodeAuth() {
+        Log.i(TAG, "QR Code factor authentication started");
+        startActivityForResult(FTRQRCodeActivity.getIntent(this, true, false),
+                FTRQRCodeActivity.RESULT_BARCODE_AUTH);
+    }
+
+    @OnClick(R.id.main_btn_qr_code_offline_auth)
+    protected void onOfflineQRCodeAuth() {
+        Log.i(TAG, "Offline QR Code factor authentication started");
+        startActivityForResult(FTRQRCodeActivity.getIntent(this, true, false),
+                FTRQRCodeActivity.RESULT_BARCODE_OFFLINE);
+    }
+
+    @OnClick(R.id.main_btn_qr_code_generic)
+    protected void onQRCodeGeneric() {
+        Log.i(TAG, "Generic QR Code started");
+        startActivityForResult(FTRQRCodeActivity.getIntent(this, true, false), FTRQRCodeActivity.RESULT_BARCODE_GENERIC);
+    }
+
     // QRCode callbacks
     private void onEnrollQRCodeScanned(Intent data) {
         // TODO: Handle enrollment response
@@ -177,38 +197,67 @@ public class MainActivity extends AppCompatActivity {
         Barcode qrcode = data.getParcelableExtra(FTRQRCodeActivity.PARAM_BARCODE);
         Log.i(TAG, "Scanned activation code from the QR code; will enroll device");
         FuturaeClient.sharedClient().enroll(qrcode.rawValue,
-            new FuturaeCallback() {
-                @Override
-                public void success() {
-                    Log.i(TAG, "Enrollment successful");
-                    showAlert("Success", "Enrollment successful");
-                }
+                new FuturaeCallback() {
+                    @Override
+                    public void success() {
+                        Log.i(TAG, "Enrollment successful");
+                        showAlert("Success", "Enrollment successful");
+                    }
 
-                @Override
-                public void failure(Throwable throwable) {
-                    Log.e(TAG, "Enrollment failed: " + throwable.getLocalizedMessage());
-                    showAlert("Error", "Enrollment failed");
-                }
-            });
+                    @Override
+                    public void failure(Throwable throwable) {
+                        Log.e(TAG, "Enrollment failed: " + throwable.getLocalizedMessage());
+                        showAlert("Error", "Enrollment failed");
+                    }
+                });
     }
 
     private void onAuthQRCodeScanned(Intent data) {
         Barcode qrcode = data.getParcelableExtra(FTRQRCodeActivity.PARAM_BARCODE);
-        String userId = FuturaeClient.getUserIdFromQrcode(qrcode.rawValue);
-        String sessionToken = FuturaeClient.getSessionTokenFromQrcode(qrcode.rawValue);
+        Log.i(TAG, "Scanned online QR Code");
+        String userId = null;
+        String sessionToken = null;
+        try {
+            userId = FuturaeClient.getUserIdFromQrcode(qrcode.rawValue);
+            sessionToken = FuturaeClient.getSessionTokenFromQrcode(qrcode.rawValue);
+        } catch (MalformedQRCodeException e) {
+            e.printStackTrace();
+            return;
+        }
 
         FuturaeClient.sharedClient().sessionInfoByToken(userId, sessionToken,
-            new FuturaeResultCallback<SessionInfo>() {
-                @Override
-                public void success(SessionInfo sessionInfo) {
-                    showApproveAlertDialog(new ApproveSession(sessionInfo), false);
-                }
+                new FuturaeResultCallback<SessionInfo>() {
+                    @Override
+                    public void success(SessionInfo sessionInfo) {
+                        showApproveAlertDialog(new ApproveSession(sessionInfo), false);
+                    }
 
-                @Override
-                public void failure(Throwable t) {
-                    Log.e(TAG, "QR Code authentication failed: " + t.getLocalizedMessage());
-                }
-            });
+                    @Override
+                    public void failure(Throwable t) {
+                        Log.e(TAG, "QR Code authentication failed: " + t.getLocalizedMessage());
+                    }
+                });
+    }
+
+    private void onOfflineAuthQRCodeScanned(Intent data) {
+        Barcode qrcode = data.getParcelableExtra(FTRQRCodeActivity.PARAM_BARCODE);
+        showOfflineQrcodeDialog(qrcode.rawValue);
+    }
+
+    private void onQRCodeScanned(Intent data) {
+        Barcode qrcode = data.getParcelableExtra(FTRQRCodeActivity.PARAM_BARCODE);
+        Log.i(TAG, "Scanned QR code checking which type it is");
+        switch (FuturaeClient.getQrcodeType(qrcode.rawValue)) {
+            case FuturaeClient.QR_ENROLL:
+                this.onEnrollQRCodeScanned(data);
+                break;
+            case FuturaeClient.QR_ONLINE:
+                this.onAuthQRCodeScanned(data);
+                break;
+            case FuturaeClient.QR_OFFLINE:
+                this.onOfflineAuthQRCodeScanned(data);
+                break;
+        }
     }
 
     // Approve dialog
@@ -269,6 +318,69 @@ public class MainActivity extends AppCompatActivity {
         approveDialog.show();
     }
 
+    void showOfflineQrcodeSignatureDialog(final String signature) {
+        // TODO: For demo pusposed, we simply show the signature of the OfflineQRCode
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("To Approve the transaction, enter: " + signature + " in the browser");
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("Confirm Transaction");
+        builder.setMessage(sb.toString());
+        builder.setPositiveButton("Done", new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int id) {
+                // nothing
+            }
+        });
+
+        approveDialog = builder.create();
+        approveDialog.show();
+    }
+
+    void showOfflineQrcodeDialog(final String qrCode) {
+        // TODO: For demo purposes we simply show an alert
+
+        ApproveInfo[] extras = new ApproveInfo[0];
+        try {
+            extras = FuturaeClient.getExtraInfoFromOfflineQrcode(qrCode);
+        } catch (MalformedQRCodeException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        StringBuffer sb = new StringBuffer();
+        if (extras != null) {
+            sb.append("\n");
+            for (ApproveInfo info : extras) {
+                sb.append(info.getKey()).append(": ").append(info.getValue()).append("\n");
+            }
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("Approve");
+        builder.setMessage("Request Information" + sb.toString());
+        builder.setPositiveButton("Approve", new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int id) {
+                String verificationSignature = "";
+                try {
+                    verificationSignature = FuturaeClient.sharedClient().computeVerificationCodeFromQrcode(qrCode);
+                } catch (MalformedQRCodeException e) {
+                    e.printStackTrace();
+                }
+                showOfflineQrcodeSignatureDialog(verificationSignature);
+            }
+        });
+
+        builder.setNegativeButton("Deny", new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int id) {
+                // nothing to do
+            }
+        });
+
+        approveDialog = builder.create();
+        approveDialog.show();
+    }
+
     // private
     private void checkAndAskForPermission(final String permission, final String message, final int requestID) {
         final Activity activity = this;
@@ -353,7 +465,7 @@ public class MainActivity extends AppCompatActivity {
 
                     case NotificationUtils.INTENT_APPROVE_CANCEL_MESSAGE:
                         if (approveDialog != null && approveDialog.isShowing()) {
-                          approveDialog.dismiss();
+                            approveDialog.dismiss();
                         }
                         break;
 

FuturaeDemo/app/src/main/res/layout/activity_main.xml

@@ -24,6 +24,14 @@
         android:layout_gravity="center"
         android:text="@string/main_btn_logout" />
 
+    <Button
+        android:id="@+id/main_btn_totp"
+        style="@style/AppTheme.Borderless"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/main_btn_totp" />
+
     <Button
         android:id="@+id/main_btn_qr_code_auth"
         style="@style/AppTheme.Borderless"
@@ -34,11 +42,19 @@
         />
 
     <Button
-        android:id="@+id/main_btn_totp"
+        android:id="@+id/main_btn_qr_code_offline_auth"
         style="@style/AppTheme.Borderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="@string/main_btn_totp" />
+        android:text="@string/main_btn_qr_code_offline_auth" />
+
+    <Button
+        android:id="@+id/main_btn_qr_code_generic"
+        style="@style/AppTheme.Borderless"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/main_btn_qr_code_generic" />
 
 </LinearLayout>

FuturaeDemo/app/src/main/res/values/strings.xml

@@ -4,8 +4,10 @@
   <!--MAIN-->
   <string name="main_btn_enroll">Enroll</string>
   <string name="main_btn_qr_code">Scan to Enroll</string>
-  <string name="main_btn_qr_code_auth">QR Code Auth</string>
   <string name="main_btn_totp">TOTP Auth</string>
+  <string name="main_btn_qr_code_auth">Online QR Code Auth</string>
+  <string name="main_btn_qr_code_offline_auth">Offline QR Code Auth</string>
+  <string name="main_btn_qr_code_generic">Scan QR Code</string>
 
   <!--QR CODE-->
   <string name="qrcode_title">QR Code</string>