Disable registration lock before removing pin

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6eb3c397e31df744763478aa449c8a76438122c..df9aa47ff648795cd7a6e71cbbfac0405176c3d5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
 
 ## [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)
 ## [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 47ee6b408f8596a6b20b6dd7964f7dbfe4d3ad4d..b4fa04c45bc0089b79a4c91970737758ea62b9f6 100644 (file)
--- 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();
 
     public void removeRegistrationLockPin() throws IOException, UnauthenticatedResponseException {
         final KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();

+        pinChangeSession.disableRegistrationLock();

         pinChangeSession.removePin();
     }
 
     public KbsPinData getRegistrationLockData(
         pinChangeSession.removePin();
     }
 
     public KbsPinData getRegistrationLockData(

-            String pin,
-            LockedException e
+            String pin, LockedException e

     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         String basicStorageCredentials = e.getBasicStorageCredentials();
         if (basicStorageCredentials == null) {
     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         String basicStorageCredentials = e.getBasicStorageCredentials();
         if (basicStorageCredentials == null) {


@@ -49,8 +49,7 @@ public class PinHelper {
     }
 
     private KbsPinData getRegistrationLockData(
     }
 
     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) {
     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         TokenResponse tokenResponse = keyBackupService.getToken(basicStorageCredentials);
         if (tokenResponse == null || tokenResponse.getTries() == 0) {