Use modern switch syntax

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 4e171326f6b7bfc74d3ed38d3ad037931f4f22c2..18e454e06720fdadf5287689d7bc772c89b88251 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -542,10 +542,8 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getFetchType().isPresent()) {
             switch (syncMessage.getFetchType().get()) {
         }
         if (syncMessage.getFetchType().isPresent()) {
             switch (syncMessage.getFetchType().get()) {

-                case LOCAL_PROFILE:
-                    actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
-                case STORAGE_MANIFEST:
-                    actions.add(RetrieveStorageDataAction.create());
+                case LOCAL_PROFILE -> actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
+                case STORAGE_MANIFEST -> actions.add(RetrieveStorageDataAction.create());

             }
         }
         if (syncMessage.getKeys().isPresent()) {
             }
         }
         if (syncMessage.getKeys().isPresent()) {


@@ -709,7 +707,7 @@ public final class IncomingMessageHandler {
                 if (group == null || group instanceof GroupInfoV1) {
                     var groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {
                 if (group == null || group instanceof GroupInfoV1) {
                     var groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {

-                        case UPDATE: {
+                        case UPDATE -> {

                             if (groupV1 == null) {
                                 groupV1 = new GroupInfoV1(groupId);
                             }
                             if (groupV1 == null) {
                                 groupV1 = new GroupInfoV1(groupId);
                             }


@@ -732,25 +730,23 @@ public final class IncomingMessageHandler {
                             }
 
                             account.getGroupStore().updateGroup(groupV1);
                             }
 
                             account.getGroupStore().updateGroup(groupV1);

-                            break;

                         }
                         }

-                        case DELIVER:
+                        case DELIVER -> {

                             if (groupV1 == null && !isSync) {
                                 actions.add(new SendGroupInfoRequestAction(source.recipientId(), groupId));
                             }
                             if (groupV1 == null && !isSync) {
                                 actions.add(new SendGroupInfoRequestAction(source.recipientId(), groupId));
                             }

-                            break;
-                        case QUIT: {
+                        }
+                        case QUIT -> {

                             if (groupV1 != null) {
                                 groupV1.removeMember(source.recipientId());
                                 account.getGroupStore().updateGroup(groupV1);
                             }
                             if (groupV1 != null) {
                                 groupV1.removeMember(source.recipientId());
                                 account.getGroupStore().updateGroup(groupV1);
                             }

-                            break;

                         }
                         }

-                        case REQUEST_INFO:
+                        case REQUEST_INFO -> {

                             if (groupV1 != null && !isSync) {
                                 actions.add(new SendGroupInfoAction(source.recipientId(), groupV1.getGroupId()));
                             }
                             if (groupV1 != null && !isSync) {
                                 actions.add(new SendGroupInfoAction(source.recipientId(), groupV1.getGroupId()));
                             }

-                            break;
+                        }

                     }
                 } else {
                     // Received a group v1 message for a v2 group
                     }
                 } else {
                     // Received a group v1 message for a v2 group

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index b89ed2b7d2a581ebc5de9cdf91394d7e99221157..0f0da15c4cb1417abbb002cc2dd6d900d8644bf5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -166,18 +166,11 @@ public class UnidentifiedAccessHelper {
     private static byte[] getTargetUnidentifiedAccessKey(
             final Profile targetProfile, final ProfileKey theirProfileKey
     ) {
     private static byte[] getTargetUnidentifiedAccessKey(
             final Profile targetProfile, final ProfileKey theirProfileKey
     ) {

-        switch (targetProfile.getUnidentifiedAccessMode()) {
-            case ENABLED:
-                if (theirProfileKey == null) {
-                    return null;
-                }
-
-                return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
-            case UNRESTRICTED:
-                return createUnrestrictedUnidentifiedAccess();
-            default:
-                return null;
-        }
+        return switch (targetProfile.getUnidentifiedAccessMode()) {
+            case ENABLED -> theirProfileKey == null ? null : UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
+            case UNRESTRICTED -> createUnrestrictedUnidentifiedAccess();
+            default -> null;
+        };

     }
 
     private static byte[] createUnrestrictedUnidentifiedAccess() {
     }
 
     private static byte[] createUnrestrictedUnidentifiedAccess() {