Convert gradle scripts to kotlin

[signal-cli] / src / main / java / org / asamk / signal / manager / helper / PinHelper.java

diff --git a/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 47ee6b408f8596a6b20b6dd7964f7dbfe4d3ad4d..090b20b63e914f97b920215a53db8e7dc2579c01 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.util.PinHashing;
+import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.KeyBackupServicePinException;
@@ -33,12 +34,12 @@ public class PinHelper {
 
     public void removeRegistrationLockPin() throws IOException, UnauthenticatedResponseException {
         final KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
+        pinChangeSession.disableRegistrationLock();
         pinChangeSession.removePin();
     }
 
     public KbsPinData getRegistrationLockData(
-            String pin,
-            LockedException e
+            String pin, LockedException e
     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         String basicStorageCredentials = e.getBasicStorageCredentials();
         if (basicStorageCredentials == null) {
@@ -49,8 +50,7 @@ public class PinHelper {
     }
 
     private KbsPinData getRegistrationLockData(
-            String pin,
-            String basicStorageCredentials
+            String pin, String basicStorageCredentials
     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         TokenResponse tokenResponse = keyBackupService.getToken(basicStorageCredentials);
         if (tokenResponse == null || tokenResponse.getTries() == 0) {
@@ -83,7 +83,7 @@ public class PinHelper {
                 throw new AssertionError("Null not expected");
             }
             return kbsData;
-        } catch (UnauthenticatedResponseException e) {
+        } catch (UnauthenticatedResponseException | InvalidKeyException e) {
             throw new IOException(e);
         }
     }