Use var instead of explicit types

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index b5da274e60a69b075dc5fb565ea93efb7fb795f5..332bbe5e3cfeb9c13704c5803da131762e3d125c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -7,9 +7,9 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.util.Base64;

 
 import java.util.ArrayList;
 
 import java.util.ArrayList;

+import java.util.Base64;

 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;


@@ -40,7 +40,7 @@ public class UpdateGroupCommand implements DbusCommand {
             groupId = new byte[0];
         }
 
             groupId = new byte[0];
         }
 

-        String groupName = ns.getString("name");
+        var groupName = ns.getString("name");

         if (groupName == null) {
             groupName = "";
         }
         if (groupName == null) {
             groupName = "";
         }


@@ -50,15 +50,15 @@ public class UpdateGroupCommand implements DbusCommand {
             groupMembers = new ArrayList<>();
         }
 
             groupMembers = new ArrayList<>();
         }
 

-        String groupAvatar = ns.getString("avatar");
+        var groupAvatar = ns.getString("avatar");

         if (groupAvatar == null) {
             groupAvatar = "";
         }
 
         try {
         if (groupAvatar == null) {
             groupAvatar = "";
         }
 
         try {

-            byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+            var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);

             if (groupId.length != newGroupId.length) {
             if (groupId.length != newGroupId.length) {

-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+                System.out.println("Creating new group \"" + Base64.getEncoder().encodeToString(newGroupId) + "\" …");

             }
             return 0;
         } catch (AssertionError e) {
             }
             return 0;
         } catch (AssertionError e) {


@@ -69,7 +69,7 @@ public class UpdateGroupCommand implements DbusCommand {
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());

-            return 1;
+            return 2;

         }
     }
 }
         }
     }
 }