Merge f27a3c5206fead40d77aebac4424397b58be7f94 into e5e21518a5b0a1898e3f47334a76348f11f1a343

see #774

entrypoint.sh

@@ -3,8 +3,27 @@
 set -x
 set -e
 
+[ -d /etc/docker ] && echo "$FILE is a directory."
+
 [ -z "${SIGNAL_CLI_CONFIG_DIR}" ] && echo "SIGNAL_CLI_CONFIG_DIR environmental variable needs to be set! Aborting!" && exit 1;
 
+if [ "$(id -u)" -eq "${SIGNAL_CLI_UID}" ] && [ "$(id -g)" -eq "${SIGNAL_CLI_GID}" ]]
+then
+  echo "UID and GID are already correct. Trying to start Signal Api"
+
+  # TODO: check mode
+  if [ "$MODE" = "json-rpc" ]
+  then
+  /usr/bin/jsonrpc2-helper
+  if [ -n "$JAVA_OPTS" ] ; then
+      echo "export JAVA_OPTS='$JAVA_OPTS'" >> /etc/default/supervisor
+  fi
+  service supervisor start
+  supervisorctl start all
+  fi
+  signal-cli-rest-api -signal-cli-config=${SIGNAL_CLI_CONFIG_DIR};
+fi
+
 usermod -u ${SIGNAL_CLI_UID} signal-api
 groupmod -o -g ${SIGNAL_CLI_GID} signal-api
 

src/client/client.go

@@ -761,9 +761,30 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
 
 func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, deleteLocalData bool) error {
 	if s.signalCliMode == JsonRpc {
-		return errors.New("This functionality is only available in normal/native mode!")
+		type Request struct {
+			DeleteAccount bool `json:"delete-account,omitempty"`
+		}
+		req := Request{}
+
+		if deleteAccount {
+			req.DeleteAccount = true
 		}
 
+		jsonRpc2Client, err := s.getJsonRpc2Client()
+		if err != nil {
+			return err
+		}
+		_, err = jsonRpc2Client.getRaw("unregister", &number, req)
+		if err != nil {
+			return err
+		}
+
+		if deleteLocalData {
+			return s.DeleteLocalAccountData(number, false)
+		}
+		return nil
+
+	} else {
 		command := []string{"--config", s.signalCliConfig, "-a", number, "unregister"}
 		if deleteAccount {
 			command = append(command, "--delete-account")
@@ -783,6 +804,7 @@ func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, delet
 
 		return err
 	}
+}
 
 func (s *SignalClient) DeleteLocalAccountData(number string, ignoreRegistered bool) error {
 	if s.signalCliMode == JsonRpc {