From 43780dcd0601bc259b03f84ea98763b8729f0f4d Mon Sep 17 00:00:00 2001
From: Kevin King <kevin@krypt.co>
Date: Tue, 23 Oct 2018 13:47:06 -0400
Subject: [PATCH] fix pairing when no SSH key present

---
 app/build.gradle                                     | 4 ++--
 app/release/output.json                              | 2 +-
 app/src/main/java/co/krypt/krypton/me/MeStorage.java | 1 +
 app/src/main/java/co/krypt/krypton/silo/Silo.java    | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 48b1d324..0412d2ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "co.krypt.kryptonite"
         minSdkVersion 23
         targetSdkVersion 26
-        versionCode 59
-        versionName "2.5.4"
+        versionCode 60
+        versionName "2.5.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/release/output.json b/app/release/output.json
index 796fced6..e4a77d90 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":59,"versionName":"2.5.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":60,"versionName":"2.5.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/co/krypt/krypton/me/MeStorage.java b/app/src/main/java/co/krypt/krypton/me/MeStorage.java
index b3304a48..891cd9e3 100644
--- a/app/src/main/java/co/krypt/krypton/me/MeStorage.java
+++ b/app/src/main/java/co/krypt/krypton/me/MeStorage.java
@@ -59,6 +59,7 @@ public static SSHKeyPairI getOrLoadKeyPair(Context context) throws CryptoExcepti
         return keyPair.get();
     }
 
+    @Nullable
     public Profile load() {
         synchronized (lock) {
             if (cachedProfile == null) {
diff --git a/app/src/main/java/co/krypt/krypton/silo/Silo.java b/app/src/main/java/co/krypt/krypton/silo/Silo.java
index 08993280..e2c43d61 100644
--- a/app/src/main/java/co/krypt/krypton/silo/Silo.java
+++ b/app/src/main/java/co/krypt/krypton/silo/Silo.java
@@ -400,7 +400,11 @@ public void respondToRequest(Pairing pairing, Request request, boolean requestAl
                 public Void visit(MeRequest meRequest) throws CryptoException {
                     if (meRequest.u2fOnly != null && meRequest.u2fOnly) {
                         response.meResponse = new MeResponse(new Profile());
-                        String deviceName = meStorage.load().email;
+                        String deviceName = null;
+                        Profile profile = meStorage.load();
+                        if (profile != null)  {
+                            deviceName = profile.email;
+                        }
                         if(TextUtils.isEmpty(deviceName)) {
                             deviceName = MeStorage.getDeviceName();
                         }