From: AsamK <asamk@gmx.de>
Date: Sun, 10 Jan 2021 16:07:26 +0000 (+0100)
Subject: Disable registration lock before removing pin
X-Git-Tag: v0.7.3~47
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9244d1e8a861ce505083e813cf069a96a6622822

Disable registration lock before removing pin
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6eb3c39..df9aa47f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- Disable registration lock before removing the PIN
+
 ## [0.7.2] - 2020-12-31
 ### Added
 - Implement new registration lock PIN with `setPin` and `removePin` (with KBS)
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 47ee6b40..b4fa04c4 100644
--- a/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -33,12 +33,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 +49,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) {