diff --git a/app/build.gradle b/app/build.gradle
index 51f48f5..af691c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
 
         def versionMajor = 2
         def versionMinor = 0
-        def versionPatch = 3
-        def versionAdditive = 1
+        def versionPatch = 4
+        def versionAdditive = 0
 
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionAdditive
         versionName "${versionMajor}.${versionMinor}.${versionPatch}b${versionAdditive}"
@@ -51,6 +51,7 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+    buildToolsVersion = '29.0.2'
 }
 
 dependencies {
@@ -60,7 +61,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core:1.2.0-rc01'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.0-alpha02'
+    implementation 'com.google.android.material:material:1.2.0-alpha03'
     implementation 'commons-codec:commons-codec:1.10'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'junit:junit:4.12'
@@ -69,8 +70,8 @@ dependencies {
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'com.google.code.gson:gson:2.8.5'
 
-    implementation 'com.google.firebase:firebase-core:17.2.1'
-    implementation 'com.google.firebase:firebase-messaging:20.0.1'
+    implementation 'com.google.firebase:firebase-core:17.2.2'
+    implementation 'com.google.firebase:firebase-messaging:20.1.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:1.10.19'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b40024..fc9a3a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name=".viewcontroller.MainActivity"
diff --git a/app/src/main/java/it/netknights/piauthenticator/interfaces/MainActivityInterface.java b/app/src/main/java/it/netknights/piauthenticator/interfaces/MainActivityInterface.java
index 110b7dc..fa965d9 100644
--- a/app/src/main/java/it/netknights/piauthenticator/interfaces/MainActivityInterface.java
+++ b/app/src/main/java/it/netknights/piauthenticator/interfaces/MainActivityInterface.java
@@ -42,7 +42,7 @@ void makeAlertDialog(int titleID, String message, int positiveBtnTextID, boolean
     void makeAlertDialog(int titleID, int messageID, int positiveBtnTextID, boolean cancelable,
                          @Nullable DialogInterface.OnClickListener positiveBtnListener);
 
-    void makeDeviceNotSupportedDialog();
+    void makeDeviceNotSupportedDialog(Exception e);
 
     void makeToast(String message);
 
diff --git a/app/src/main/java/it/netknights/piauthenticator/presenter/Presenter.java b/app/src/main/java/it/netknights/piauthenticator/presenter/Presenter.java
index ee2c034..8f6fbbb 100644
--- a/app/src/main/java/it/netknights/piauthenticator/presenter/Presenter.java
+++ b/app/src/main/java/it/netknights/piauthenticator/presenter/Presenter.java
@@ -23,6 +23,7 @@
 import android.util.Pair;
 
 import org.apache.commons.codec.binary.Base32;
+import org.json.JSONException;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -106,9 +107,29 @@ public Presenter(TokenListViewInterface tokenListViewInterface, MainActivityInte
     public void init() {
         // Logic of onCreate
         if (model == null) {
-            model = new Model(util.loadTokens());
+            try {
+                model = new Model(util.loadTokens());
+            } catch (IOException e) { // TODO handle exceptions
+                e.printStackTrace();
+                mainActivityInterface.makeDeviceNotSupportedDialog(e);
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+                mainActivityInterface.makeDeviceNotSupportedDialog(e);
+            }
+        }
+        if (model ==  null) {
+            model = new Model();
+        }
+        FirebaseInitConfig firebaseInitConfig = null;
+        try {
+            firebaseInitConfig = util.loadFirebaseConfig();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {  // TODO handle e
+            e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
         }
-        FirebaseInitConfig firebaseInitConfig = util.loadFirebaseConfig();
         if (firebaseInitConfig != null) {
             mainActivityInterface.firebaseInit(firebaseInitConfig);
         }
@@ -152,6 +173,10 @@ public void scanQRfinished(ScanResult result) {
                         mainActivityInterface.makeAlertDialog(R.string.firebase_config_broken_title,
                                 R.string.firebase_config_broken);
                         return;
+                    } catch (GeneralSecurityException e) { // TODO handle e
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        e.printStackTrace();
                     }
                 }
                 token.sslVerify = result.sslverify;
@@ -248,14 +273,20 @@ public void onStop() {
 
     @Override
     public void saveTokenlist() {
-        util.saveTokens(model.getTokens());
+        try {
+            util.saveTokens(model.getTokens());
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace(); // TODO handle e
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     public void checkKeyStoreIsWorking() {
         try {
             util.saveToFile("test", new byte[]{});
-        } catch (InvalidKeyException e) {
-            mainActivityInterface.makeDeviceNotSupportedDialog();
+        } catch (GeneralSecurityException | IOException e) {
+            mainActivityInterface.makeDeviceNotSupportedDialog(e);
         }
     }
 
@@ -425,6 +456,8 @@ public void startPushAuthentication(Token token) {
             e.printStackTrace();
         } catch (UnrecoverableEntryException e) {
             e.printStackTrace();
+        } catch (GeneralSecurityException e) {      // TODO handle e
+            e.printStackTrace();
         }
     }
 
@@ -543,12 +576,14 @@ private void checkForExpiredAuths() {
     }
 
     private void refreshOTPs() {
-        for (int i = 0; i < model.getTokens().size(); i++) {
-            if (!model.getTokens().get(i).getType().equals(PUSH)) {
-                model.getTokens().get(i).setCurrentOTP(generateOTP(model.getTokens().get(i)));
+        if (model != null) {
+            for (int i = 0; i < model.getTokens().size(); i++) {
+                if (!model.getTokens().get(i).getType().equals(PUSH)) {
+                    model.getTokens().get(i).setCurrentOTP(generateOTP(model.getTokens().get(i)));
+                }
             }
+            tokenListInterface.notifyChange();
         }
-        tokenListInterface.notifyChange();
     }
 
     private void doTwoStepRollout(Token token, int phonepartlength, int iterations, int output_size) {
@@ -589,7 +624,11 @@ public PublicKey generatePublicKeyFor(String serial) {
     @Override
     public void receivePublicKey(String key, Token token) {
         try {
-            util.storePIPubkey(key, token.getSerial());
+            try {
+                util.storePIPubkey(key, token.getSerial());
+            } catch (IOException e) {
+                e.printStackTrace();            // TODO handle e
+            }
         } catch (GeneralSecurityException e) {
             // this means the "key" field was empty or the DECODED data is not a key
             updateTaskStatus(PRO_STATUS_RESPONSE_NO_KEY, token);
@@ -721,6 +760,7 @@ public void authenticationFinished(boolean success, Token token) {
     /**
      * Cancel the running Authentication Task and remove the pair from the runningAuthentications List
      * Sets the tokens 'lastAuthHadError' so the authentication can be dismissed
+     *
      * @param token token of the pair
      */
     private void deleteRunningAuthenticationFor(Token token) {
diff --git a/app/src/main/java/it/netknights/piauthenticator/services/PushAuthService.java b/app/src/main/java/it/netknights/piauthenticator/services/PushAuthService.java
index a4bbb6e..b624666 100644
--- a/app/src/main/java/it/netknights/piauthenticator/services/PushAuthService.java
+++ b/app/src/main/java/it/netknights/piauthenticator/services/PushAuthService.java
@@ -219,7 +219,13 @@ public void authenticationFinished(boolean success, Token token) {
             //if (isRunningInBackground()) {
             token.getPendingAuths().remove(req);
             if (util != null) {
-                util.saveTokens(tokenlist);
+                try {
+                    util.saveTokens(tokenlist);
+                } catch (GeneralSecurityException e) {
+                    e.printStackTrace(); // TODO handle e
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
             // Close the notification that the authentication is running
             NotificationManagerCompat.from(this).cancel(req.getNotificationID());
@@ -280,7 +286,13 @@ public void handleAuthError(int statusCode, Token token) {
     private void saveIfAppNotRunning() {
         //if (isRunningInBackground()) {
         if (util != null) {
-            util.saveTokens(tokenlist);
+            try {
+                util.saveTokens(tokenlist);
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            } catch (IOException e) { // TODO handle e
+                e.printStackTrace();
+            }
         }
         //}
     }
diff --git a/app/src/main/java/it/netknights/piauthenticator/utils/SecretKeyWrapper.java b/app/src/main/java/it/netknights/piauthenticator/utils/SecretKeyWrapper.java
index 69d0a97..010b32e 100644
--- a/app/src/main/java/it/netknights/piauthenticator/utils/SecretKeyWrapper.java
+++ b/app/src/main/java/it/netknights/piauthenticator/utils/SecretKeyWrapper.java
@@ -103,24 +103,6 @@ public SecretKeyWrapper(Context context)
         mPair = new KeyPair(publicKey, privateKey);*/
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-    private static void generateKeyPair(Context context)
-            throws GeneralSecurityException {
-        final Calendar start = new GregorianCalendar();
-        final Calendar end = new GregorianCalendar();
-        end.add(Calendar.YEAR, 100);
-        final KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "AndroidKeyStore");
-        final KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec.Builder(context)
-                .setAlias("settings")
-                .setSubject(new X500Principal("CN=" + "settings"))
-                .setSerialNumber(BigInteger.ONE)
-                .setStartDate(start.getTime())
-                .setEndDate(end.getTime())
-                .build();
-        gen.initialize(spec);
-        gen.generateKeyPair();
-    }
-
     /**
      * Wrap a {@link SecretKey} using the public key assigned to this wrapper.
      * Use {@link #unwrap(byte[])} to later recover the original
diff --git a/app/src/main/java/it/netknights/piauthenticator/utils/Util.java b/app/src/main/java/it/netknights/piauthenticator/utils/Util.java
index 68a1e99..79e5244 100644
--- a/app/src/main/java/it/netknights/piauthenticator/utils/Util.java
+++ b/app/src/main/java/it/netknights/piauthenticator/utils/Util.java
@@ -71,6 +71,7 @@
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import it.netknights.piauthenticator.BuildConfig;
 import it.netknights.piauthenticator.model.FirebaseInitConfig;
 import it.netknights.piauthenticator.model.PushAuthRequest;
 import it.netknights.piauthenticator.model.Token;
@@ -118,6 +119,7 @@ public class Util {
 
     private String baseFilePath;
     private SecretKeyWrapper secretKeyWrapper;
+    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     public Util(SecretKeyWrapper secretKeyWrapper, String baseFilePath) {
         this.baseFilePath = baseFilePath;
@@ -133,7 +135,7 @@ public Util() {
      *
      * @return An ArrayList of Tokens
      */
-    public ArrayList<Token> loadTokens() {
+    public ArrayList<Token> loadTokens() throws IOException, GeneralSecurityException {
         logprint("LOADING TOKEN");
         ArrayList<Token> tokens = new ArrayList<>();
         try {
@@ -157,7 +159,7 @@ public ArrayList<Token> loadTokens() {
      *
      * @param tokens ArrayList of tokens to save
      */
-    public void saveTokens(ArrayList<Token> tokens) {
+    public void saveTokens(ArrayList<Token> tokens) throws GeneralSecurityException, IOException {
         if (tokens == null) {
             return;
         }
@@ -170,12 +172,8 @@ public void saveTokens(ArrayList<Token> tokens) {
             }
         }
 
-        try {
-            if (saveToFile(DATAFILE, tmp.toString().getBytes())) {
-                logprint("Tokenlist saved.");
-            }
-        } catch (InvalidKeyException e) {
-            e.printStackTrace();
+        if (saveToFile(DATAFILE, tmp.toString().getBytes())) {
+            logprint("Tokenlist saved.");
         }
     }
 
@@ -200,8 +198,7 @@ private Token makeTokenFromJSON(JSONObject o) throws JSONException {
                 t.enrollment_credential = o.getString(ENROLLMENT_CRED);
                 t.sslVerify = o.getBoolean(SSL_VERIFY);
                 try {
-                    t.rollout_expiration = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-                            .parse(o.getString(ROLLOUT_EXPIRATION));
+                    t.rollout_expiration = dateFormat.parse(o.getString(ROLLOUT_EXPIRATION));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -260,8 +257,7 @@ private JSONObject makeJSONfromToken(Token t) throws JSONException {
             // If the rollout is not finished yet, save the data necessary to complete it
             if (t.state.equals(UNFINISHED)) {
                 o.put(URL, t.rollout_url);
-                o.put(ROLLOUT_EXPIRATION, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-                        .format(t.rollout_expiration));
+                o.put(ROLLOUT_EXPIRATION, dateFormat.format(t.rollout_expiration));
                 o.put(ENROLLMENT_CRED, t.enrollment_credential);
                 o.put(SSL_VERIFY, t.sslVerify);
             }
@@ -299,7 +295,7 @@ private JSONObject makeJSONfromToken(Token t) throws JSONException {
         return o;
     }
 
-    public void storePIPubkey(String key, String serial) throws GeneralSecurityException, IllegalArgumentException {
+    public void storePIPubkey(String key, String serial) throws GeneralSecurityException, IllegalArgumentException, IOException {
         byte[] keybytes = decodeBase64(key);
 
         PublicKey pubkey = PKCS1ToSubjectPublicKeyInfo.decodePKCS1PublicKey(keybytes);
@@ -313,25 +309,18 @@ public void storePIPubkey(String key, String serial) throws GeneralSecurityExcep
         PublicKey pubkey = kf.generatePublic(keySpec); */
     }
 
-    public PublicKey getPIPubkey(String serial) {
+    public PublicKey getPIPubkey(String serial) throws GeneralSecurityException, IOException {
         if (baseFilePath == null) return null;
         return getPIPubkey(baseFilePath, serial);
     }
 
-    PublicKey getPIPubkey(String filepath, String serial) {
-        try {
-            byte[] keybytes = loadDataFromFile(serial + "_" + PUBKEYFILE, filepath);
-            // build pubkey
-            if (keybytes == null) return null;
-            X509EncodedKeySpec X509publicKey = new X509EncodedKeySpec(keybytes);
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            return kf.generatePublic(X509publicKey);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (InvalidKeySpecException e) {
-            e.printStackTrace();
-        }
-        return null;
+    PublicKey getPIPubkey(String filepath, String serial) throws GeneralSecurityException, IOException {
+        byte[] keybytes = loadDataFromFile(serial + "_" + PUBKEYFILE, filepath);
+        // build pubkey
+        if (keybytes == null) return null;
+        X509EncodedKeySpec X509publicKey = new X509EncodedKeySpec(keybytes);
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        return kf.generatePublic(X509publicKey);
     }
 
     /**
@@ -341,7 +330,7 @@ PublicKey getPIPubkey(String filepath, String serial) {
      * @param fileName Name of the file to load
      * @return raw data as byte array, null if no baseFilePath is set or there is no file
      */
-    private byte[] loadDataFromFile(String fileName) {
+    private byte[] loadDataFromFile(String fileName) throws IOException, GeneralSecurityException {
         if (baseFilePath == null) return null;
         return loadDataFromFile(fileName, baseFilePath);
     }
@@ -354,20 +343,14 @@ private byte[] loadDataFromFile(String fileName) {
      * @param baseFilePath baseFilePath of the Context
      * @return raw data as byte array, null if there is no file
      */
-    private byte[] loadDataFromFile(String fileName, String baseFilePath) {
-        try {
-            byte[] encryptedData = readFile(new File(baseFilePath + "/" + fileName));
-            // decrypt
-            SecretKey encryptionKey = getSecretKey(new File(baseFilePath + "/" + KEYFILE));
-            if (encryptedData == null) {
-                return null;
-            }
-            return decrypt(encryptionKey, encryptedData);
-        } catch (Exception e) {
-            // combine exceptions here, nothing would be done anyway
-            e.printStackTrace();
+    private byte[] loadDataFromFile(String fileName, String baseFilePath) throws IOException, GeneralSecurityException {
+        byte[] encryptedData = readFile(new File(baseFilePath + "/" + fileName));
+        // decrypt
+        SecretKey encryptionKey = getSecretKey(new File(baseFilePath + "/" + KEYFILE));
+        if (encryptedData == null) {
+            return null;
         }
-        return null;
+        return decrypt(encryptionKey, encryptedData);
     }
 
     private void writeFile(File file, byte[] data) throws IOException {
@@ -406,7 +389,7 @@ public void removePubkeyFor(String serial) {
         }
     }
 
-    public void storeFirebaseConfig(FirebaseInitConfig firebaseInitConfig) throws InvalidKeyException {
+    public void storeFirebaseConfig(FirebaseInitConfig firebaseInitConfig) throws GeneralSecurityException, IOException {
         logprint("Storing Firebase config...");
         JSONObject o = new JSONObject();
         try {
@@ -425,29 +408,22 @@ public void storeFirebaseConfig(FirebaseInitConfig firebaseInitConfig) throws In
     /**
      * @return FirebaseInitConfig object or null if there is no config / error
      */
-    public FirebaseInitConfig loadFirebaseConfig() {
+    public FirebaseInitConfig loadFirebaseConfig() throws IOException, GeneralSecurityException, JSONException {
         logprint("Loading Firebase config...");
-        try {
-            byte[] data = loadDataFromFile(FB_CONFIG_FILE);
-            if (data == null) {
-                logprint("Firebase config not found!");
-                return null;
-            }
-
-            JSONObject o = new JSONObject(new String(data));
-            String projID = o.getString(PROJECT_ID);
-            String appID = o.getString(APP_ID);
-            String api_key = o.getString(API_KEY);
-            String projNumber = o.getString(PROJECT_NUMBER);
-
-            //logprint("Firebase config loaded.");
-            return new FirebaseInitConfig(projID, appID, api_key, projNumber);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            logprint("Missing parameter from config!");
+        byte[] data = loadDataFromFile(FB_CONFIG_FILE);
+        if (data == null) {
+            logprint("Firebase config not found!");
             return null;
         }
+
+        JSONObject o = new JSONObject(new String(data));
+        String projID = o.getString(PROJECT_ID);
+        String appID = o.getString(APP_ID);
+        String api_key = o.getString(API_KEY);
+        String projNumber = o.getString(PROJECT_NUMBER);
+
+        //logprint("Firebase config loaded.");
+        return new FirebaseInitConfig(projID, appID, api_key, projNumber);
     }
 
     public void removeFirebaseConfig() {
@@ -468,20 +444,11 @@ public void removeFirebaseConfig() {
      * @param data         Data to save
      * @return true if successful, false if error
      */
-    private boolean saveToFile(String fileName, String baseFilePath, byte[] data) throws InvalidKeyException {
-        try {
-            SecretKey key = getSecretKey(new File(baseFilePath + "/" + KEYFILE));
-            data = encrypt(key, data);
-            writeFile(new File(baseFilePath + "/" + fileName), data);
-            return true;
-        } catch (InvalidKeyException e) {
-            throw e;
-        } catch (GeneralSecurityException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
+    private boolean saveToFile(String fileName, String baseFilePath, byte[] data) throws GeneralSecurityException, IOException {
+        SecretKey key = getSecretKey(new File(baseFilePath + "/" + KEYFILE));
+        data = encrypt(key, data);
+        writeFile(new File(baseFilePath + "/" + fileName), data);
+        return true;
     }
 
     /**
@@ -492,7 +459,7 @@ private boolean saveToFile(String fileName, String baseFilePath, byte[] data) th
      * @param data     Data to save
      * @return true if successful, false if error
      */
-    public boolean saveToFile(String fileName, byte[] data) throws InvalidKeyException {
+    public boolean saveToFile(String fileName, byte[] data) throws GeneralSecurityException, IOException {
         if (baseFilePath == null) return false;
         return saveToFile(fileName, baseFilePath, data);
     }
@@ -644,9 +611,11 @@ public static byte[] hexStringToByteArray(String hex) {
     }
 
     public static void logprint(String msg) {
-        if (msg == null)
-            return;
-        Log.e(TAG, msg);
+        if (BuildConfig.DEBUG) {
+            if (msg == null)
+                return;
+            Log.e(TAG, msg);
+        }
     }
 
     public static String insertPeriodically(String text, int stepSize) {
diff --git a/app/src/main/java/it/netknights/piauthenticator/viewcontroller/MainActivity.java b/app/src/main/java/it/netknights/piauthenticator/viewcontroller/MainActivity.java
index b4fc48e..bf7abc3 100644
--- a/app/src/main/java/it/netknights/piauthenticator/viewcontroller/MainActivity.java
+++ b/app/src/main/java/it/netknights/piauthenticator/viewcontroller/MainActivity.java
@@ -150,13 +150,9 @@ protected void onCreate(Bundle savedInstanceState) {
         secretKeyWrapper = null;
         try {
             secretKeyWrapper = new SecretKeyWrapper(this);
-        } catch (GeneralSecurityException e) {
+        } catch (GeneralSecurityException | IllegalStateException | IOException e) {          // TODO handle e
             e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (IllegalStateException e) {
-            // This exception occurs when the creation of the keypair fails, the app cannot save keys then and is unusable
-            makeDeviceNotSupportedDialog();
+            makeDeviceNotSupportedDialog(e);
         }
 
         Util util = new Util(secretKeyWrapper, getFilesDir().getAbsolutePath());
@@ -166,7 +162,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // this method checks if saving keys works, if not a dialog will appear informing the user
         // that the application cannot be used on the device
-        presenter.checkKeyStoreIsWorking();
+        //presenter.checkKeyStoreIsWorking();
 
         tokenlistadapter.setPresenterInterface(presenter);
 
@@ -877,8 +873,14 @@ private void showAlertDialog(String title, String message, @Nullable String posi
     }
 
     @Override
-    public void makeDeviceNotSupportedDialog() {
-        makeAlertDialog(R.string.device_not_supported, R.string.device_not_supported_text,
+    public void makeDeviceNotSupportedDialog(Exception e) {
+        Throwable t = e.getCause();
+        String cause = "Throwable is null!";
+        if (t != null) {
+            cause = t.getLocalizedMessage();
+        }
+        String message = getStringResource(R.string.device_not_supported_text) + "(Cause: " + cause + ")";
+        makeAlertDialog(R.string.device_not_supported, message,
                 R.string.device_not_supported_btn_text, false,
                 (dialog, which) -> {
                     this.finish(); // TODO this does not seem to be the best way to handle this
diff --git a/app/src/main/java/it/netknights/piauthenticator/viewcontroller/TokenListAdapter.java b/app/src/main/java/it/netknights/piauthenticator/viewcontroller/TokenListAdapter.java
index 7a4596b..bccc241 100644
--- a/app/src/main/java/it/netknights/piauthenticator/viewcontroller/TokenListAdapter.java
+++ b/app/src/main/java/it/netknights/piauthenticator/viewcontroller/TokenListAdapter.java
@@ -43,6 +43,8 @@
 
 import androidx.core.widget.TextViewCompat;
 
+import org.apache.commons.codec.binary.Base32;
+
 import java.util.ArrayList;
 
 import it.netknights.piauthenticator.R;
@@ -266,12 +268,10 @@ private void setupHOTP(final Token token, Button nextbtn, ProgressBar progressBa
         nextbtn.setVisibility(VISIBLE);
 
         nextbtn.setOnClickListener(v -> {
-
             // disable button for some time after clicking
             nextbtn.setEnabled(false);
             new Handler().postDelayed(() -> nextbtn.setEnabled(true), 1000);
             presenterInterface.increaseHOTPCounter(token);
-
         });
     }
 
diff --git a/app/src/main/res/layout/entry_push.xml b/app/src/main/res/layout/entry_push.xml
index 08540fb..eca3714 100644
--- a/app/src/main/res/layout/entry_push.xml
+++ b/app/src/main/res/layout/entry_push.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,14 +27,14 @@
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/textViewLabel"
         android:layout_width="wrap_content"
-        android:layout_height="25dp"
+        android:layout_height="wrap_content"
 
         android:layout_below="@+id/textViewToken"
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginStart="85dp"
+        android:layout_marginStart="32dp"
         android:layout_marginTop="0dp"
-        android:layout_marginEnd="85dp"
+        android:layout_marginEnd="32dp"
         android:text="@string/PushtokenLabelRolloutUnfinished"
         android:textAlignment="center"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -49,18 +50,27 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp">
 
+        <Button
+            android:id="@+id/dismiss_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/PIBLUE"
+            android:text="@string/Dismiss"
+            android:textColor="@color/zxing_status_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/allow_button" />
+
         <TextView
             android:id="@+id/textView_pushStatus"
-            android:layout_width="0dp"
+            android:layout_width="228dp"
             android:layout_height="wrap_content"
             android:text="@string/PushtokenRollingOut"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/dismiss_button"
+            app:layout_constraintEnd_toStartOf="@+id/allow_button"
             app:layout_constraintStart_toEndOf="@+id/imageView_cancel"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -68,10 +78,10 @@
             android:id="@+id/imageView_cancel"
             android:layout_width="31dp"
             android:layout_height="44dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/textView_pushStatus"
+            android:layout_marginTop="8dp"
+            app:layout_constraintBottom_toBottomOf="@+id/textView_pushStatus"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/textView_pushStatus"
             app:srcCompat="@drawable/ic_cancel_blue" />
 
         <ProgressBar
@@ -79,7 +89,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -90,23 +99,9 @@
             android:backgroundTint="@color/PIBLUE"
             android:text="@string/Allow"
             android:textColor="@color/zxing_status_text"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
-            android:id="@+id/dismiss_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:backgroundTint="@color/PIBLUE"
-            android:text="@string/Dismiss"
-            android:textColor="@color/zxing_status_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/allow_button"
-            app:layout_constraintStart_toEndOf="@+id/textView_pushStatus"
-            app:layout_constraintTop_toTopOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/test/java/it/netknights/piauthenticator/TestPresenter.java b/app/src/test/java/it/netknights/piauthenticator/TestPresenter.java
index 828b535..233052d 100644
--- a/app/src/test/java/it/netknights/piauthenticator/TestPresenter.java
+++ b/app/src/test/java/it/netknights/piauthenticator/TestPresenter.java
@@ -20,11 +20,13 @@
 package it.netknights.piauthenticator;
 
 import org.apache.commons.codec.binary.Base32;
+import org.json.JSONException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.PublicKey;
@@ -115,7 +117,7 @@ public void setup() {
     }
 
     @Test
-    public void testInit() {
+    public void testInit() throws JSONException, GeneralSecurityException, IOException {
         presenter.init();
         verify(mainActivityInterface, never()).firebaseInit((FirebaseInitConfig) any());
         verify(mainActivityInterface, never()).makeAlertDialog(anyInt(), anyString());
@@ -265,7 +267,7 @@ public void refresh() {
     }
 
     @Test
-    public void lifecycle() {
+    public void lifecycle() throws GeneralSecurityException, IOException {
         presenter.onStop(); // saves tokenlist
 
         presenter.onPause();
@@ -390,11 +392,13 @@ public void receivePubKey() {
             verify(util).storePIPubkey("test", "serial");
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 
     @Test
-    public void receivePubKeyGSEnIAE() throws GeneralSecurityException {
+    public void receivePubKeyGSEnIAE() throws GeneralSecurityException, IOException {
         Token pushy = new Token("serial", "label");
 
         doThrow(GeneralSecurityException.class).when(util).storePIPubkey(anyString(), anyString());
@@ -420,7 +424,7 @@ public void receivePubKeyIOEx() throws GeneralSecurityException {
     } */
 
     @Test
-    public void scanQRResult() throws InvalidKeyException {
+    public void scanQRResult() throws GeneralSecurityException, IOException {
         clearTokenlist();
         ScanResult res = new ScanResult(HOTP, "serial");
         res.secret = "AAAAAAAAAAAAAA";
diff --git a/app/src/test/java/it/netknights/piauthenticator/TestUtil.java b/app/src/test/java/it/netknights/piauthenticator/TestUtil.java
index 8535b62..169e6ae 100644
--- a/app/src/test/java/it/netknights/piauthenticator/TestUtil.java
+++ b/app/src/test/java/it/netknights/piauthenticator/TestUtil.java
@@ -22,6 +22,7 @@
 
 import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.Base64;
+import org.json.JSONException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -117,7 +118,7 @@ public void setup() throws IOException {
     }
 
     @Test
-    public void testSaveAndLoad() {
+    public void testSaveAndLoad() throws GeneralSecurityException, IOException {
 
         ArrayList<Token> list = new ArrayList<>();
         Token t1 = new Token("testetststest".getBytes(), "SERIALSERIAL", "LABEL", HOTP, 6);
@@ -172,7 +173,7 @@ public void byteArrayHexConversion() {
      * Doesn't work, androids base64 is not available here, Apache base64 doesn't work on a real device
      */
     @Test
-    public void receiveAndStorePublicKey() {
+    public void receiveAndStorePublicKey() throws GeneralSecurityException, IOException {
         // in_key is in setup
         try {
             util.storePIPubkey(in_key, "testkey");
@@ -214,15 +215,15 @@ public void removePublicKey() throws IOException {
         assertFalse(test.exists());
     }
 
-    @Test
-    public void saveLoadDeleteFirebaseConfig() throws InvalidKeyException {
+    @Test(expected = org.json.JSONException.class)
+    public void saveLoadDeleteFirebaseConfig() throws GeneralSecurityException, JSONException, IOException {
         // there is none
         assertNull(util.loadFirebaseConfig());
 
         // This throws exception -> returns null
         FirebaseInitConfig fbConf = new FirebaseInitConfig(null, null, null, null);
         util.storeFirebaseConfig(fbConf);
-        assertNull(util.loadFirebaseConfig());
+        util.loadFirebaseConfig(); // this will throw an exception when evaluating the loaded JSON
 
         // this should work
         fbConf = new FirebaseInitConfig("projID", "appID", "api_key", "projNumber");
@@ -261,7 +262,7 @@ public void getSecretKey() throws GeneralSecurityException, IOException {
     }
 
     @Test
-    public void testLoadingOldToken() {
+    public void testLoadingOldToken() throws IOException, GeneralSecurityException {
         // Older token did not have the serial attribute.
         // Upon loading them, their label should be set as their serial
 
diff --git a/build.gradle b/build.gradle
index 4d963d1..f0c9c1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.6.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e3e0774..fe12a74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 22 13:50:10 CEST 2019
+#Thu Feb 27 09:59:00 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip