Merge pull request #34 from informatik-ag-ngl/f/changeable_user
Added ability to change profile pic, username and password
This commit is contained in:
commit
da287d48e4
@ -13,13 +13,14 @@
|
|||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
|
<attribute name="test" value="true"/>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<attribute name="test" value="true"/>
|
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||||
<attributes>
|
<attributes>
|
||||||
|
<attribute name="module" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
|
@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
|||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
|
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
|
||||||
org.eclipse.jdt.core.compiler.problem.APILeak=warning
|
org.eclipse.jdt.core.compiler.problem.APILeak=warning
|
||||||
|
org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
|
||||||
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
|
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
|
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
|
||||||
|
@ -37,7 +37,9 @@ public final class SystemCommandsMap {
|
|||||||
* @see SystemCommandsMap#isValidKey(String)
|
* @see SystemCommandsMap#isValidKey(String)
|
||||||
* @since Envoy Client v0.2-beta
|
* @since Envoy Client v0.2-beta
|
||||||
*/
|
*/
|
||||||
public void add(String command, SystemCommand systemCommand) { if (isValidKey(command)) systemCommands.put(command, systemCommand); }
|
public void add(String command, SystemCommand systemCommand) {
|
||||||
|
if (isValidKey(command)) systemCommands.put(command.toLowerCase(), systemCommand);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method checks if the input String is a key in the map and returns the
|
* This method checks if the input String is a key in the map and returns the
|
||||||
@ -60,7 +62,7 @@ public final class SystemCommandsMap {
|
|||||||
* @return the wrapped system command, if present
|
* @return the wrapped system command, if present
|
||||||
* @since Envoy Client v0.2-beta
|
* @since Envoy Client v0.2-beta
|
||||||
*/
|
*/
|
||||||
public Optional<SystemCommand> get(String input) { return Optional.ofNullable(systemCommands.get(getCommand(input))); }
|
public Optional<SystemCommand> get(String input) { return Optional.ofNullable(systemCommands.get(getCommand(input.toLowerCase()))); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method ensures that the "/" of a {@link SystemCommand} is stripped.<br>
|
* This method ensures that the "/" of a {@link SystemCommand} is stripped.<br>
|
||||||
|
@ -158,6 +158,12 @@ public class Client implements Closeable {
|
|||||||
// Process IsTyping events
|
// Process IsTyping events
|
||||||
receiver.registerProcessor(IsTyping.class, eventBus::dispatch);
|
receiver.registerProcessor(IsTyping.class, eventBus::dispatch);
|
||||||
|
|
||||||
|
// Process PasswordChangeResults
|
||||||
|
receiver.registerProcessor(PasswordChangeResult.class, eventBus::dispatch);
|
||||||
|
|
||||||
|
// Process ProfilePicChanges
|
||||||
|
receiver.registerProcessor(ProfilePicChange.class, eventBus::dispatch);
|
||||||
|
|
||||||
// Send event
|
// Send event
|
||||||
eventBus.register(SendEvent.class, evt -> {
|
eventBus.register(SendEvent.class, evt -> {
|
||||||
try {
|
try {
|
||||||
@ -193,7 +199,7 @@ public class Client implements Closeable {
|
|||||||
* @param evt the event to send
|
* @param evt the event to send
|
||||||
* @throws IOException if the event did not reach the server
|
* @throws IOException if the event did not reach the server
|
||||||
*/
|
*/
|
||||||
public void sendEvent(Event<?> evt) throws IOException { writeObject(evt); }
|
public void sendEvent(Event<?> evt) throws IOException { if (online) writeObject(evt); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Requests a new {@link IDGenerator} from the server.
|
* Requests a new {@link IDGenerator} from the server.
|
||||||
|
@ -20,7 +20,6 @@ import javafx.collections.FXCollections;
|
|||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.collections.transformation.FilteredList;
|
import javafx.collections.transformation.FilteredList;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.control.*;
|
import javafx.scene.control.*;
|
||||||
import javafx.scene.control.Alert.AlertType;
|
import javafx.scene.control.Alert.AlertType;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.image.Image;
|
||||||
@ -43,6 +42,7 @@ import envoy.client.net.Client;
|
|||||||
import envoy.client.net.WriteProxy;
|
import envoy.client.net.WriteProxy;
|
||||||
import envoy.client.ui.*;
|
import envoy.client.ui.*;
|
||||||
import envoy.client.ui.listcell.*;
|
import envoy.client.ui.listcell.*;
|
||||||
|
import envoy.client.util.ReflectionUtil;
|
||||||
import envoy.data.*;
|
import envoy.data.*;
|
||||||
import envoy.data.Attachment.AttachmentType;
|
import envoy.data.Attachment.AttachmentType;
|
||||||
import envoy.event.*;
|
import envoy.event.*;
|
||||||
@ -161,7 +161,7 @@ public final class ChatScene implements Restorable {
|
|||||||
rotateButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("rotate", (int) (DEFAULT_ICON_SIZE * 1.5))));
|
rotateButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("rotate", (int) (DEFAULT_ICON_SIZE * 1.5))));
|
||||||
messageSearchButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("search", DEFAULT_ICON_SIZE)));
|
messageSearchButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("search", DEFAULT_ICON_SIZE)));
|
||||||
clientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43));
|
clientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43));
|
||||||
Rectangle clip = new Rectangle();
|
final Rectangle clip = new Rectangle();
|
||||||
clip.setWidth(43);
|
clip.setWidth(43);
|
||||||
clip.setHeight(43);
|
clip.setHeight(43);
|
||||||
clip.setArcHeight(43);
|
clip.setArcHeight(43);
|
||||||
@ -175,7 +175,7 @@ public final class ChatScene implements Restorable {
|
|||||||
// The sender of the message is the recipient of the chat
|
// The sender of the message is the recipient of the chat
|
||||||
// Exceptions: this user is the sender (sync) or group message (group is
|
// Exceptions: this user is the sender (sync) or group message (group is
|
||||||
// recipient)
|
// recipient)
|
||||||
final long recipientID = message instanceof GroupMessage || message.getSenderID() == localDB.getUser().getID() ? message.getRecipientID()
|
final var recipientID = message instanceof GroupMessage || message.getSenderID() == localDB.getUser().getID() ? message.getRecipientID()
|
||||||
: message.getSenderID();
|
: message.getSenderID();
|
||||||
localDB.getChat(recipientID).ifPresent(chat -> {
|
localDB.getChat(recipientID).ifPresent(chat -> {
|
||||||
chat.insert(message);
|
chat.insert(message);
|
||||||
@ -229,9 +229,8 @@ public final class ChatScene implements Restorable {
|
|||||||
switch (e.getOperationType()) {
|
switch (e.getOperationType()) {
|
||||||
case ADD:
|
case ADD:
|
||||||
if (contact instanceof User) localDB.getUsers().put(contact.getName(), (User) contact);
|
if (contact instanceof User) localDB.getUsers().put(contact.getName(), (User) contact);
|
||||||
final Chat chat = contact instanceof User ? new Chat(contact) : new GroupChat(client.getSender(), contact);
|
final var chat = contact instanceof User ? new Chat(contact) : new GroupChat(client.getSender(), contact);
|
||||||
Platform.runLater(() -> ((ObservableList<Chat>) chats.getSource()).add(0, chat));
|
Platform.runLater(() -> ((ObservableList<Chat>) chats.getSource()).add(0, chat));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case REMOVE:
|
case REMOVE:
|
||||||
Platform.runLater(() -> chats.getSource().removeIf(c -> c.getRecipient().equals(contact)));
|
Platform.runLater(() -> chats.getSource().removeIf(c -> c.getRecipient().equals(contact)));
|
||||||
@ -296,7 +295,7 @@ public final class ChatScene implements Restorable {
|
|||||||
private void chatListClicked() {
|
private void chatListClicked() {
|
||||||
if (chatList.getSelectionModel().isEmpty()) return;
|
if (chatList.getSelectionModel().isEmpty()) return;
|
||||||
|
|
||||||
final Contact user = chatList.getSelectionModel().getSelectedItem().getRecipient();
|
final var user = chatList.getSelectionModel().getSelectedItem().getRecipient();
|
||||||
if (user != null && (currentChat == null || !user.equals(currentChat.getRecipient()))) {
|
if (user != null && (currentChat == null || !user.equals(currentChat.getRecipient()))) {
|
||||||
|
|
||||||
// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
|
// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
|
||||||
@ -337,7 +336,7 @@ public final class ChatScene implements Restorable {
|
|||||||
if (currentChat != null) {
|
if (currentChat != null) {
|
||||||
topBarContactLabel.setText(currentChat.getRecipient().getName());
|
topBarContactLabel.setText(currentChat.getRecipient().getName());
|
||||||
if (currentChat.getRecipient() instanceof User) {
|
if (currentChat.getRecipient() instanceof User) {
|
||||||
String status = ((User) currentChat.getRecipient()).getStatus().toString();
|
final String status = ((User) currentChat.getRecipient()).getStatus().toString();
|
||||||
topBarStatusLabel.setText(status);
|
topBarStatusLabel.setText(status);
|
||||||
topBarStatusLabel.getStyleClass().add(status.toLowerCase());
|
topBarStatusLabel.getStyleClass().add(status.toLowerCase());
|
||||||
recipientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43));
|
recipientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43));
|
||||||
@ -345,7 +344,7 @@ public final class ChatScene implements Restorable {
|
|||||||
topBarStatusLabel.setText(currentChat.getRecipient().getContacts().size() + " members");
|
topBarStatusLabel.setText(currentChat.getRecipient().getContacts().size() + " members");
|
||||||
recipientProfilePic.setImage(IconUtil.loadIconThemeSensitive("group_icon", 43));
|
recipientProfilePic.setImage(IconUtil.loadIconThemeSensitive("group_icon", 43));
|
||||||
}
|
}
|
||||||
Rectangle clip = new Rectangle();
|
final Rectangle clip = new Rectangle();
|
||||||
clip.setWidth(43);
|
clip.setWidth(43);
|
||||||
clip.setHeight(43);
|
clip.setHeight(43);
|
||||||
clip.setArcHeight(43);
|
clip.setArcHeight(43);
|
||||||
@ -364,7 +363,7 @@ public final class ChatScene implements Restorable {
|
|||||||
@FXML
|
@FXML
|
||||||
private void settingsButtonClicked() {
|
private void settingsButtonClicked() {
|
||||||
sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
|
sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
|
||||||
sceneContext.<SettingsScene>getController().initializeData(sceneContext);
|
sceneContext.<SettingsScene>getController().initializeData(sceneContext, client);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -430,7 +429,7 @@ public final class ChatScene implements Restorable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get attachment type (default is document)
|
// Get attachment type (default is document)
|
||||||
AttachmentType type = AttachmentType.DOCUMENT;
|
var type = AttachmentType.DOCUMENT;
|
||||||
switch (fileChooser.getSelectedExtensionFilter().getDescription()) {
|
switch (fileChooser.getSelectedExtensionFilter().getDescription()) {
|
||||||
case "Pictures":
|
case "Pictures":
|
||||||
type = AttachmentType.PICTURE;
|
type = AttachmentType.PICTURE;
|
||||||
@ -476,9 +475,14 @@ public final class ChatScene implements Restorable {
|
|||||||
* @since Envoy Client v0.1-beta
|
* @since Envoy Client v0.1-beta
|
||||||
*/
|
*/
|
||||||
private void doABarrelRoll(int rotations, double animationTime) {
|
private void doABarrelRoll(int rotations, double animationTime) {
|
||||||
// contains all Node objects in ChatScene in alphabetical order
|
// Limiting the rotations and duration
|
||||||
final var rotatableNodes = new Node[] { attachmentButton, attachmentView, contactLabel, infoLabel, messageList, messageTextArea, postButton,
|
rotations = Math.min(rotations, 100000);
|
||||||
remainingChars, rotateButton, scene, settingsButton, chatList, voiceButton };
|
rotations = Math.max(rotations, 1);
|
||||||
|
animationTime = Math.min(animationTime, 150);
|
||||||
|
animationTime = Math.max(animationTime, 0.25);
|
||||||
|
|
||||||
|
// contains all Node objects in ChatScene
|
||||||
|
final var rotatableNodes = ReflectionUtil.getAllDeclaredNodeVariables(this);
|
||||||
for (final var node : rotatableNodes) {
|
for (final var node : rotatableNodes) {
|
||||||
// Sets the animation duration to {animationTime}
|
// Sets the animation duration to {animationTime}
|
||||||
final var rotateTransition = new RotateTransition(Duration.seconds(animationTime), node);
|
final var rotateTransition = new RotateTransition(Duration.seconds(animationTime), node);
|
||||||
@ -505,7 +509,7 @@ public final class ChatScene implements Restorable {
|
|||||||
messageTextUpdated();
|
messageTextUpdated();
|
||||||
// Sending an IsTyping event if none has been sent for
|
// Sending an IsTyping event if none has been sent for
|
||||||
// IsTyping#millisecondsActive
|
// IsTyping#millisecondsActive
|
||||||
if (client.isOnline() && currentChat.getLastWritingEvent() + IsTyping.millisecondsActive <= System.currentTimeMillis()) {
|
if (currentChat.getLastWritingEvent() + IsTyping.millisecondsActive <= System.currentTimeMillis()) {
|
||||||
eventBus.dispatch(new SendEvent(new IsTyping(getChatID(), currentChat.getRecipient().getID())));
|
eventBus.dispatch(new SendEvent(new IsTyping(getChatID(), currentChat.getRecipient().getID())));
|
||||||
currentChat.lastWritingEventWasNow();
|
currentChat.lastWritingEventWasNow();
|
||||||
}
|
}
|
||||||
@ -514,9 +518,9 @@ public final class ChatScene implements Restorable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the id that should be used to send things to the server:
|
* Returns the id that should be used to send things to the server: the id of
|
||||||
* the id of 'our' {@link User} if the recipient of that object is another User,
|
* 'our' {@link User} if the recipient of that object is another User, else the
|
||||||
* else the id of the {@link Group} 'our' user is sending to.
|
* id of the {@link Group} 'our' user is sending to.
|
||||||
*
|
*
|
||||||
* @return an id that can be sent to the server
|
* @return an id that can be sent to the server
|
||||||
* @since Envoy Client v0.2-beta
|
* @since Envoy Client v0.2-beta
|
||||||
@ -570,8 +574,8 @@ public final class ChatScene implements Restorable {
|
|||||||
* @since Envoy Client v0.1-beta
|
* @since Envoy Client v0.1-beta
|
||||||
*/
|
*/
|
||||||
private void updateRemainingCharsLabel() {
|
private void updateRemainingCharsLabel() {
|
||||||
final int currentLength = messageTextArea.getText().length();
|
final var currentLength = messageTextArea.getText().length();
|
||||||
final int remainingLength = MAX_MESSAGE_LENGTH - currentLength;
|
final var remainingLength = MAX_MESSAGE_LENGTH - currentLength;
|
||||||
remainingChars.setText(String.format("remaining chars: %d/%d", remainingLength, MAX_MESSAGE_LENGTH));
|
remainingChars.setText(String.format("remaining chars: %d/%d", remainingLength, MAX_MESSAGE_LENGTH));
|
||||||
remainingChars.setTextFill(Color.rgb(currentLength, remainingLength, 0, 1));
|
remainingChars.setTextFill(Color.rgb(currentLength, remainingLength, 0, 1));
|
||||||
}
|
}
|
||||||
@ -660,9 +664,8 @@ public final class ChatScene implements Restorable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the {@code attachmentView} in terms of visibility.<br>
|
* Updates the {@code attachmentView} in terms of visibility.<br>
|
||||||
* Additionally resets the shown image to
|
* Additionally resets the shown image to {@code DEFAULT_ATTACHMENT_VIEW_IMAGE}
|
||||||
* {@code DEFAULT_ATTACHMENT_VIEW_IMAGE} if another image is currently
|
* if another image is currently present.
|
||||||
* present.
|
|
||||||
*
|
*
|
||||||
* @param visible whether the {@code attachmentView} should be displayed
|
* @param visible whether the {@code attachmentView} should be displayed
|
||||||
* @since Envoy Client v0.1-beta
|
* @since Envoy Client v0.1-beta
|
||||||
|
@ -3,10 +3,9 @@ package envoy.client.ui.controller;
|
|||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.*;
|
import javafx.scene.control.*;
|
||||||
|
|
||||||
|
import envoy.client.net.Client;
|
||||||
import envoy.client.ui.SceneContext;
|
import envoy.client.ui.SceneContext;
|
||||||
import envoy.client.ui.settings.DownloadSettingsPane;
|
import envoy.client.ui.settings.*;
|
||||||
import envoy.client.ui.settings.GeneralSettingsPane;
|
|
||||||
import envoy.client.ui.settings.SettingsPane;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Project: <strong>envoy-client</strong><br>
|
* Project: <strong>envoy-client</strong><br>
|
||||||
@ -28,10 +27,14 @@ public class SettingsScene {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param sceneContext enables the user to return to the chat scene
|
* @param sceneContext enables the user to return to the chat scene
|
||||||
|
* @param client the {@code Client} used to get the current user and to
|
||||||
|
* check if this user is online
|
||||||
* @since Envoy Client v0.1-beta
|
* @since Envoy Client v0.1-beta
|
||||||
*/
|
*/
|
||||||
public void initializeData(SceneContext sceneContext) {
|
public void initializeData(SceneContext sceneContext, Client client) {
|
||||||
this.sceneContext = sceneContext;
|
this.sceneContext = sceneContext;
|
||||||
|
settingsList.getItems().add(new GeneralSettingsPane());
|
||||||
|
settingsList.getItems().add(new UserSettingsPane(sceneContext, client.getSender(), client.isOnline()));
|
||||||
settingsList.getItems().add(new DownloadSettingsPane(sceneContext));
|
settingsList.getItems().add(new DownloadSettingsPane(sceneContext));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,8 +48,6 @@ public class SettingsScene {
|
|||||||
if (!empty && item != null) setGraphic(new Label(item.getTitle()));
|
if (!empty && item != null) setGraphic(new Label(item.getTitle()));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
settingsList.getItems().add(new GeneralSettingsPane());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package envoy.client.ui.listcell;
|
package envoy.client.ui.listcell;
|
||||||
|
|
||||||
|
import javafx.scene.Cursor;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.ContentDisplay;
|
import javafx.scene.control.ContentDisplay;
|
||||||
import javafx.scene.control.ListCell;
|
import javafx.scene.control.ListCell;
|
||||||
@ -34,7 +35,12 @@ public abstract class AbstractListCell<T, U extends Node> extends ListCell<T> {
|
|||||||
@Override
|
@Override
|
||||||
protected final void updateItem(T item, boolean empty) {
|
protected final void updateItem(T item, boolean empty) {
|
||||||
super.updateItem(item, empty);
|
super.updateItem(item, empty);
|
||||||
setGraphic(empty || item == null ? null : renderItem(item));
|
if (!(empty || item == null)) {
|
||||||
|
setCursor(Cursor.HAND);
|
||||||
|
setGraphic(renderItem(item));
|
||||||
|
} else {
|
||||||
|
setGraphic(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -19,7 +19,7 @@ import javafx.scene.control.ListView;
|
|||||||
*/
|
*/
|
||||||
public final class GenericListCell<T, U extends Node> extends AbstractListCell<T, U> {
|
public final class GenericListCell<T, U extends Node> extends AbstractListCell<T, U> {
|
||||||
|
|
||||||
private Function<? super T, U> renderer;
|
private final Function<? super T, U> renderer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param listView the list view inside of which the cell will be displayed
|
* @param listView the list view inside of which the cell will be displayed
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
package envoy.client.ui.settings;
|
package envoy.client.ui.settings;
|
||||||
|
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.*;
|
||||||
import javafx.scene.control.CheckBox;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import javafx.stage.DirectoryChooser;
|
import javafx.stage.DirectoryChooser;
|
||||||
|
|
||||||
import envoy.client.ui.SceneContext;
|
import envoy.client.ui.SceneContext;
|
||||||
@ -31,17 +28,21 @@ public class DownloadSettingsPane extends SettingsPane {
|
|||||||
*/
|
*/
|
||||||
public DownloadSettingsPane(SceneContext sceneContext) {
|
public DownloadSettingsPane(SceneContext sceneContext) {
|
||||||
super("Download");
|
super("Download");
|
||||||
final var vbox = new VBox(15);
|
setSpacing(15);
|
||||||
vbox.setPadding(new Insets(15));
|
setPadding(new Insets(15));
|
||||||
// checkbox to disable asking
|
// checkbox to disable asking
|
||||||
final var checkBox = new CheckBox(settings.getItems().get("autoSaveDownloads").getUserFriendlyName());
|
final var checkBox = new CheckBox(settings.getItems().get("autoSaveDownloads").getUserFriendlyName());
|
||||||
checkBox.setSelected(settings.isDownloadSavedWithoutAsking());
|
checkBox.setSelected(settings.isDownloadSavedWithoutAsking());
|
||||||
|
checkBox.setTooltip(new Tooltip("Determines whether a \"Select save location\" - dialogue will be shown when saving attachments."));
|
||||||
checkBox.setOnAction(e -> settings.setDownloadSavedWithoutAsking(checkBox.isSelected()));
|
checkBox.setOnAction(e -> settings.setDownloadSavedWithoutAsking(checkBox.isSelected()));
|
||||||
vbox.getChildren().add(checkBox);
|
getChildren().add(checkBox);
|
||||||
|
|
||||||
// Displaying the default path to save to
|
// Displaying the default path to save to
|
||||||
vbox.getChildren().add(new Label(settings.getItems().get("downloadLocation").getDescription() + ":"));
|
final var pathLabel = new Label(settings.getItems().get("downloadLocation").getDescription() + ":");
|
||||||
|
pathLabel.setWrapText(true);
|
||||||
|
getChildren().add(pathLabel);
|
||||||
final var hbox = new HBox(20);
|
final var hbox = new HBox(20);
|
||||||
|
Tooltip.install(hbox, new Tooltip("Determines the location where attachments will be saved to."));
|
||||||
final var currentPath = new Label(settings.getDownloadLocation().getAbsolutePath());
|
final var currentPath = new Label(settings.getDownloadLocation().getAbsolutePath());
|
||||||
hbox.getChildren().add(currentPath);
|
hbox.getChildren().add(currentPath);
|
||||||
|
|
||||||
@ -59,7 +60,6 @@ public class DownloadSettingsPane extends SettingsPane {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
hbox.getChildren().add(button);
|
hbox.getChildren().add(button);
|
||||||
vbox.getChildren().add(hbox);
|
getChildren().add(hbox);
|
||||||
getChildren().add(vbox);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
package envoy.client.ui.settings;
|
package envoy.client.ui.settings;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javafx.scene.control.ComboBox;
|
import javafx.scene.control.ComboBox;
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.control.Tooltip;
|
||||||
|
|
||||||
import envoy.client.data.SettingsItem;
|
import envoy.client.data.SettingsItem;
|
||||||
import envoy.client.event.ThemeChangeEvent;
|
import envoy.client.event.ThemeChangeEvent;
|
||||||
@ -25,30 +23,36 @@ public class GeneralSettingsPane extends SettingsPane {
|
|||||||
*/
|
*/
|
||||||
public GeneralSettingsPane() {
|
public GeneralSettingsPane() {
|
||||||
super("General");
|
super("General");
|
||||||
final var vbox = new VBox();
|
setSpacing(10);
|
||||||
|
|
||||||
// TODO: Support other value types
|
// TODO: Support other value types
|
||||||
List.of("hideOnClose", "enterToSend")
|
final var settingsItems = settings.getItems();
|
||||||
.stream()
|
final var hideOnCloseCheckbox = new SettingsCheckbox((SettingsItem<Boolean>) settingsItems.get("hideOnClose"));
|
||||||
.map(settings.getItems()::get)
|
hideOnCloseCheckbox.setTooltip(new Tooltip("If selected, Envoy will still be present in the task bar when closed."));
|
||||||
.map(i -> new SettingsCheckbox((SettingsItem<Boolean>) i))
|
getChildren().add(hideOnCloseCheckbox);
|
||||||
.forEach(vbox.getChildren()::add);
|
|
||||||
|
final var enterToSendCheckbox = new SettingsCheckbox((SettingsItem<Boolean>) settingsItems.get("enterToSend"));
|
||||||
|
final var enterToSendTooltip = new Tooltip(
|
||||||
|
"If selected, messages can be sent pressing \"Enter\". They can always be sent by pressing \"Ctrl\" + \"Enter\"");
|
||||||
|
enterToSendTooltip.setWrapText(true);
|
||||||
|
enterToSendCheckbox.setTooltip(enterToSendTooltip);
|
||||||
|
getChildren().add(enterToSendCheckbox);
|
||||||
|
|
||||||
final var combobox = new ComboBox<String>();
|
final var combobox = new ComboBox<String>();
|
||||||
combobox.getItems().add("dark");
|
combobox.getItems().add("dark");
|
||||||
combobox.getItems().add("light");
|
combobox.getItems().add("light");
|
||||||
|
combobox.setTooltip(new Tooltip("Determines the current theme Envoy will be displayed in."));
|
||||||
combobox.setValue(settings.getCurrentTheme());
|
combobox.setValue(settings.getCurrentTheme());
|
||||||
combobox.setOnAction(
|
combobox.setOnAction(
|
||||||
e -> { settings.setCurrentTheme(combobox.getValue()); EventBus.getInstance().dispatch(new ThemeChangeEvent(combobox.getValue())); });
|
e -> { settings.setCurrentTheme(combobox.getValue()); EventBus.getInstance().dispatch(new ThemeChangeEvent(combobox.getValue())); });
|
||||||
vbox.getChildren().add(combobox);
|
getChildren().add(combobox);
|
||||||
|
|
||||||
final var statusComboBox = new ComboBox<UserStatus>();
|
final var statusComboBox = new ComboBox<UserStatus>();
|
||||||
statusComboBox.getItems().setAll(UserStatus.values());
|
statusComboBox.getItems().setAll(UserStatus.values());
|
||||||
statusComboBox.setValue(UserStatus.ONLINE);
|
statusComboBox.setValue(UserStatus.ONLINE);
|
||||||
|
statusComboBox.setTooltip(new Tooltip("Change your current status"));
|
||||||
// TODO add action when value is changed
|
// TODO add action when value is changed
|
||||||
statusComboBox.setOnAction(e -> {});
|
statusComboBox.setOnAction(e -> {});
|
||||||
vbox.getChildren().add(statusComboBox);
|
getChildren().add(statusComboBox);
|
||||||
|
|
||||||
getChildren().add(vbox);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package envoy.client.ui.settings;
|
package envoy.client.ui.settings;
|
||||||
|
|
||||||
import javafx.scene.layout.Pane;
|
import javafx.scene.layout.VBox;
|
||||||
|
|
||||||
import envoy.client.data.Settings;
|
import envoy.client.data.Settings;
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ import envoy.client.data.Settings;
|
|||||||
* @author Kai S. K. Engelbart
|
* @author Kai S. K. Engelbart
|
||||||
* @since Envoy Client v0.1-beta
|
* @since Envoy Client v0.1-beta
|
||||||
*/
|
*/
|
||||||
public abstract class SettingsPane extends Pane {
|
public abstract class SettingsPane extends VBox {
|
||||||
|
|
||||||
protected String title;
|
protected String title;
|
||||||
|
|
||||||
|
@ -0,0 +1,203 @@
|
|||||||
|
package envoy.client.ui.settings;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
import javafx.event.EventHandler;
|
||||||
|
import javafx.geometry.Pos;
|
||||||
|
import javafx.scene.Cursor;
|
||||||
|
import javafx.scene.control.*;
|
||||||
|
import javafx.scene.control.Alert.AlertType;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.image.ImageView;
|
||||||
|
import javafx.scene.input.InputEvent;
|
||||||
|
import javafx.scene.layout.HBox;
|
||||||
|
import javafx.stage.FileChooser;
|
||||||
|
|
||||||
|
import envoy.client.event.SendEvent;
|
||||||
|
import envoy.client.ui.IconUtil;
|
||||||
|
import envoy.client.ui.SceneContext;
|
||||||
|
import envoy.client.ui.custom.ProfilePicImageView;
|
||||||
|
import envoy.client.util.ReflectionUtil;
|
||||||
|
import envoy.data.User;
|
||||||
|
import envoy.event.*;
|
||||||
|
import envoy.util.Bounds;
|
||||||
|
import envoy.util.EnvoyLog;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-client</strong><br>
|
||||||
|
* File: <strong>UserSettingsPane.java</strong><br>
|
||||||
|
* Created: <strong>31.07.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public class UserSettingsPane extends SettingsPane {
|
||||||
|
|
||||||
|
private boolean profilePicChanged, usernameChanged, validPassword;
|
||||||
|
private byte[] currentImageBytes;
|
||||||
|
private String newUsername, newPassword = "";
|
||||||
|
|
||||||
|
private final ImageView profilePic = new ProfilePicImageView(null, 60);
|
||||||
|
private final TextField usernameTextField = new TextField();
|
||||||
|
private final PasswordField currentPasswordField = new PasswordField();
|
||||||
|
private final PasswordField newPasswordField = new PasswordField();
|
||||||
|
private final PasswordField repeatNewPasswordField = new PasswordField();
|
||||||
|
private final Button saveButton = new Button("Save");
|
||||||
|
|
||||||
|
private final Tooltip beOnlineReminder = new Tooltip("You need to be online to modify your acount.");
|
||||||
|
|
||||||
|
private static final EventBus eventBus = EventBus.getInstance();
|
||||||
|
private static final Logger logger = EnvoyLog.getLogger(UserSettingsPane.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new {@code UserSettingsPane}.
|
||||||
|
*
|
||||||
|
* @param sceneContext the {@code SceneContext} to block input to Envoy
|
||||||
|
* @param user the user who wants to customize his profile
|
||||||
|
* @param online whether this user is currently online
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public UserSettingsPane(SceneContext sceneContext, User user, boolean online) {
|
||||||
|
super("User");
|
||||||
|
setSpacing(10);
|
||||||
|
|
||||||
|
// Display of profile pic change mechanism
|
||||||
|
final var hbox = new HBox();
|
||||||
|
// TODO: display current profile pic
|
||||||
|
profilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon"));
|
||||||
|
profilePic.setCursor(Cursor.HAND);
|
||||||
|
profilePic.setFitWidth(60);
|
||||||
|
profilePic.setFitHeight(60);
|
||||||
|
profilePic.setOnMouseClicked(e -> {
|
||||||
|
if (!online) return;
|
||||||
|
final var pictureChooser = new FileChooser();
|
||||||
|
|
||||||
|
pictureChooser.setTitle("Select a new profile pic");
|
||||||
|
pictureChooser.setInitialDirectory(new File(System.getProperty("user.home")));
|
||||||
|
pictureChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Pictures", "*.png", "*.jpg", "*.bmp", "*.gif"));
|
||||||
|
|
||||||
|
final var file = pictureChooser.showOpenDialog(sceneContext.getStage());
|
||||||
|
|
||||||
|
if (file != null) {
|
||||||
|
|
||||||
|
// Check max file size
|
||||||
|
if (file.length() > 5E6) {
|
||||||
|
new Alert(AlertType.WARNING, "The selected file exceeds the size limit of 5MB!").showAndWait();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
currentImageBytes = Files.readAllBytes(file.toPath());
|
||||||
|
profilePic.setImage(new Image(new ByteArrayInputStream(currentImageBytes)));
|
||||||
|
profilePicChanged = true;
|
||||||
|
} catch (final IOException e1) {
|
||||||
|
e1.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
hbox.getChildren().add(profilePic);
|
||||||
|
|
||||||
|
// Displaying the username change mechanism
|
||||||
|
final var username = user.getName();
|
||||||
|
newUsername = username;
|
||||||
|
usernameTextField.setText(username);
|
||||||
|
final EventHandler<? super InputEvent> textChanged = e -> {
|
||||||
|
newUsername = usernameTextField.getText();
|
||||||
|
usernameChanged = newUsername != username;
|
||||||
|
};
|
||||||
|
usernameTextField.setOnInputMethodTextChanged(textChanged);
|
||||||
|
usernameTextField.setOnKeyTyped(textChanged);
|
||||||
|
hbox.getChildren().add(usernameTextField);
|
||||||
|
getChildren().add(hbox);
|
||||||
|
|
||||||
|
// "Displaying" the password change mechanism
|
||||||
|
final HBox[] passwordHBoxes = { new HBox(), new HBox(), new HBox() };
|
||||||
|
final Label[] passwordLabels = { new Label("Enter current password:"), new Label("Enter new password:"),
|
||||||
|
new Label("Repeat new password:") };
|
||||||
|
|
||||||
|
final PasswordField[] passwordFields = { currentPasswordField, newPasswordField, repeatNewPasswordField };
|
||||||
|
final EventHandler<? super InputEvent> passwordEntered = e -> {
|
||||||
|
newPassword = newPasswordField.getText();
|
||||||
|
validPassword = newPassword.equals(repeatNewPasswordField.getText())
|
||||||
|
&& !newPasswordField.getText().isBlank();
|
||||||
|
};
|
||||||
|
newPasswordField.setOnInputMethodTextChanged(passwordEntered);
|
||||||
|
newPasswordField.setOnKeyTyped(passwordEntered);
|
||||||
|
repeatNewPasswordField.setOnInputMethodTextChanged(passwordEntered);
|
||||||
|
repeatNewPasswordField.setOnKeyTyped(passwordEntered);
|
||||||
|
|
||||||
|
for (int i = 0; i < passwordHBoxes.length; i++) {
|
||||||
|
final var hBox2 = passwordHBoxes[i];
|
||||||
|
passwordLabels[i].setWrapText(true);
|
||||||
|
hBox2.getChildren().add(passwordLabels[i]);
|
||||||
|
hBox2.getChildren().add(passwordFields[i]);
|
||||||
|
getChildren().add(hBox2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Displaying the save button
|
||||||
|
saveButton.setOnAction(e -> save(user.getID(), currentPasswordField.getText()));
|
||||||
|
saveButton.setAlignment(Pos.BOTTOM_RIGHT);
|
||||||
|
getChildren().add(saveButton);
|
||||||
|
|
||||||
|
final var offline = !online;
|
||||||
|
ReflectionUtil.getAllDeclaredNodeVariables(this).forEach(node -> node.setDisable(offline));
|
||||||
|
if (offline) {
|
||||||
|
final var infoLabel = new Label("You shall not pass!\n(... Unless you would happen to be online)");
|
||||||
|
infoLabel.setId("infoLabel-warning");
|
||||||
|
infoLabel.setWrapText(true);
|
||||||
|
getChildren().add(infoLabel);
|
||||||
|
|
||||||
|
Tooltip.install(this, beOnlineReminder);
|
||||||
|
} else Tooltip.uninstall(this, beOnlineReminder);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Saves the given input and sends the changed input to the server
|
||||||
|
*
|
||||||
|
* @param username the new username
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
private void save(long userID, String oldPassword) {
|
||||||
|
|
||||||
|
// The profile pic was changed
|
||||||
|
if (profilePicChanged) {
|
||||||
|
final var profilePicChangeEvent = new ProfilePicChange(currentImageBytes, userID);
|
||||||
|
eventBus.dispatch(profilePicChangeEvent);
|
||||||
|
eventBus.dispatch(new SendEvent(profilePicChangeEvent));
|
||||||
|
logger.log(Level.INFO, "The user just changed his profile pic.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// The username was changed
|
||||||
|
final var validContactName = Bounds.isValidContactName(newUsername);
|
||||||
|
if (usernameChanged && validContactName) {
|
||||||
|
final var nameChangeEvent = new NameChange(userID, newUsername);
|
||||||
|
eventBus.dispatch(new SendEvent(nameChangeEvent));
|
||||||
|
eventBus.dispatch(nameChangeEvent);
|
||||||
|
logger.log(Level.INFO, "The user just changed his name to " + newUsername + ".");
|
||||||
|
} else if (!validContactName) {
|
||||||
|
final var alert = new Alert(AlertType.ERROR);
|
||||||
|
alert.setTitle("Invalid username");
|
||||||
|
alert.setContentText("The entered username does not conform with the naming limitations: " + Bounds.CONTACT_NAME_PATTERN);
|
||||||
|
alert.showAndWait();
|
||||||
|
logger.log(Level.INFO, "An invalid username was requested.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The password was changed
|
||||||
|
if (validPassword) {
|
||||||
|
eventBus.dispatch(new SendEvent(new PasswordChangeRequest(newPassword, oldPassword, userID)));
|
||||||
|
logger.log(Level.INFO, "The user just tried to change his password!");
|
||||||
|
} else if (!(validPassword || newPassword.isBlank())) {
|
||||||
|
final var alert = new Alert(AlertType.ERROR);
|
||||||
|
alert.setTitle("Unequal Password");
|
||||||
|
alert.setContentText("Repeated password is unequal to the chosen new password");
|
||||||
|
alert.showAndWait();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
88
client/src/main/java/envoy/client/util/ReflectionUtil.java
Normal file
88
client/src/main/java/envoy/client/util/ReflectionUtil.java
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
package envoy.client.util;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
import javafx.scene.Node;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-client</strong><br>
|
||||||
|
* File: <strong>ReflectionUtil.java</strong><br>
|
||||||
|
* Created: <strong>02.08.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public class ReflectionUtil {
|
||||||
|
|
||||||
|
private ReflectionUtil() {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets all declared variables of the given instance that have the specified
|
||||||
|
* class<br>
|
||||||
|
* (i.e. can get all {@code JComponents} (Swing) or {@code Nodes} (JavaFX) in a
|
||||||
|
* GUI class).
|
||||||
|
* <p>
|
||||||
|
* <b>Important: If you are using a module, you first need to declare <br>
|
||||||
|
* "opens {your_package} to envoy.client.util;" in your module-info.java</b>.
|
||||||
|
*
|
||||||
|
* @param <T> the type of the object
|
||||||
|
* @param <R> the type to return
|
||||||
|
* @param instance the instance of a given class whose values are to be
|
||||||
|
* evaluated
|
||||||
|
* @param typeToReturn the type of variable to return
|
||||||
|
* @return all variables in the given instance that have the requested type
|
||||||
|
* @throws RuntimeException if an exception occurs
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public static <T, R> Stream<R> getAllDeclaredVariablesOfTypeAsStream(T instance, Class<R> typeToReturn) {
|
||||||
|
return Arrays.stream(instance.getClass().getDeclaredFields()).filter(field -> typeToReturn.isAssignableFrom(field.getType())).map(field -> {
|
||||||
|
try {
|
||||||
|
field.setAccessible(true);
|
||||||
|
final var value = field.get(instance);
|
||||||
|
field.setAccessible(false);
|
||||||
|
return value;
|
||||||
|
} catch (IllegalArgumentException | IllegalAccessException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}).map(typeToReturn::cast);// field ->
|
||||||
|
// typeToReturn.isAssignableFrom(field.getClass())).map(typeToReturn::cast);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets all declared variables of the given instance that are children of
|
||||||
|
* {@code Node}.
|
||||||
|
* <p>
|
||||||
|
* <b>Important: If you are using a module, you first need to declare <br>
|
||||||
|
* "opens {your_package} to envoy.client.util;" in your module-info.java</b>.
|
||||||
|
*
|
||||||
|
* @param <T> the type of the instance
|
||||||
|
* @param instance the instance of a given class whose values are to be
|
||||||
|
* evaluated
|
||||||
|
* @return all variables of the given object that have the requested type as
|
||||||
|
* {@code Stream}
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public static <T> Stream<Node> getAllDeclaredNodeVariablesAsStream(T instance) {
|
||||||
|
return getAllDeclaredVariablesOfTypeAsStream(instance, Node.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets all declared variables of the given instance that are children of
|
||||||
|
* {@code Node}<br>
|
||||||
|
* <p>
|
||||||
|
* <b>Important: If you are using a module, you first need to declare <br>
|
||||||
|
* "opens {your_package} to envoy.client.util;" in your module-info.java</b>.
|
||||||
|
*
|
||||||
|
* @param <T> the type of the instance
|
||||||
|
* @param instance the instance of a given class whose values are to be
|
||||||
|
* evaluated
|
||||||
|
* @return all variables of the given object that have the requested type
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
public static <T> List<Node> getAllDeclaredNodeVariables(T instance) {
|
||||||
|
return getAllDeclaredNodeVariablesAsStream(instance).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
}
|
11
client/src/main/java/envoy/client/util/package-info.java
Normal file
11
client/src/main/java/envoy/client/util/package-info.java
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
/**
|
||||||
|
* This package contains utility classes for use in envoy-client.
|
||||||
|
* <p>
|
||||||
|
* Project: <strong>envoy-client</strong><br>
|
||||||
|
* File: <strong>package-info.java</strong><br>
|
||||||
|
* Created: <strong>02.08.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Client v0.2-beta
|
||||||
|
*/
|
||||||
|
package envoy.client.util;
|
@ -19,6 +19,7 @@ module envoy {
|
|||||||
requires javafx.graphics;
|
requires javafx.graphics;
|
||||||
|
|
||||||
opens envoy.client.ui to javafx.graphics, javafx.fxml;
|
opens envoy.client.ui to javafx.graphics, javafx.fxml;
|
||||||
opens envoy.client.ui.controller to javafx.graphics, javafx.fxml;
|
opens envoy.client.ui.controller to javafx.graphics, javafx.fxml, envoy.client.util;
|
||||||
opens envoy.client.ui.custom to javafx.graphics, javafx.fxml;
|
opens envoy.client.ui.custom to javafx.graphics, javafx.fxml;
|
||||||
|
opens envoy.client.ui.settings to envoy.client.util;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
</Label>
|
</Label>
|
||||||
<HBox id="underline" alignment="TOP_CENTER" prefHeight="41.0" prefWidth="296.0" spacing="5.0">
|
<HBox id="underline" alignment="TOP_CENTER" prefHeight="41.0" prefWidth="296.0" spacing="5.0">
|
||||||
<children>
|
<children>
|
||||||
<Button mnemonicParsing="true" onAction="#addContactButtonClicked" prefHeight="27.0" prefWidth="82.0" text=" Add Contact">
|
<Button mnemonicParsing="true" onAction="#addContactButtonClicked" prefWidth="100.0" text=" Add Contact">
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
||||||
</padding>
|
</padding>
|
||||||
@ -62,10 +62,13 @@
|
|||||||
<Insets />
|
<Insets />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
</Button>
|
</Button>
|
||||||
<Button mnemonicParsing="false" prefHeight="27.0" prefWidth="82.0" text="New Group">
|
<Button mnemonicParsing="false" prefWidth="100.0" text="New Group">
|
||||||
<HBox.margin>
|
<HBox.margin>
|
||||||
<Insets />
|
<Insets />
|
||||||
</HBox.margin></Button>
|
</HBox.margin>
|
||||||
|
<padding>
|
||||||
|
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
||||||
|
</padding></Button>
|
||||||
</children>
|
</children>
|
||||||
<VBox.margin>
|
<VBox.margin>
|
||||||
<Insets left="10.0" right="10.0" top="5.0" />
|
<Insets left="10.0" right="10.0" top="5.0" />
|
||||||
|
46
common/src/main/java/envoy/event/PasswordChangeRequest.java
Normal file
46
common/src/main/java/envoy/event/PasswordChangeRequest.java
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
package envoy.event;
|
||||||
|
|
||||||
|
import envoy.data.Contact;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-common</strong><br>
|
||||||
|
* File: <strong>PasswordChangeRequest.java</strong><br>
|
||||||
|
* Created: <strong>31.07.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public class PasswordChangeRequest extends Event<String> {
|
||||||
|
|
||||||
|
private final long id;
|
||||||
|
private final String oldPassword;
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param newPassword the new password of that user
|
||||||
|
* @param oldPassword the old password of that user
|
||||||
|
* @param userID the ID of the user who wants to change his password
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public PasswordChangeRequest(String newPassword, String oldPassword, long userID) {
|
||||||
|
super(newPassword);
|
||||||
|
this.oldPassword = oldPassword;
|
||||||
|
id = userID;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the ID of the {@link Contact} this event is related to
|
||||||
|
* @since Envoy Common v0.2-alpha
|
||||||
|
*/
|
||||||
|
public long getID() { return id; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the old password of the underlying user
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public String getOldPassword() { return oldPassword; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() { return "PasswordChangeRequest[id=" + id + "]"; }
|
||||||
|
}
|
26
common/src/main/java/envoy/event/PasswordChangeResult.java
Normal file
26
common/src/main/java/envoy/event/PasswordChangeResult.java
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
package envoy.event;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class acts as a notice to the user whether his
|
||||||
|
* {@link envoy.event.PasswordChangeRequest} was successful.
|
||||||
|
* <p>
|
||||||
|
* Project: <strong>envoy-common</strong><br>
|
||||||
|
* File: <strong>PasswordChangeResult.java</strong><br>
|
||||||
|
* Created: <strong>01.08.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public class PasswordChangeResult extends Event<Boolean> {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an instance of {@code PasswordChangeResult}.
|
||||||
|
*
|
||||||
|
* @param value whether the preceding {@link envoy.event.PasswordChangeRequest}
|
||||||
|
* was successful.
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public PasswordChangeResult(boolean value) { super(value); }
|
||||||
|
}
|
32
common/src/main/java/envoy/event/ProfilePicChange.java
Normal file
32
common/src/main/java/envoy/event/ProfilePicChange.java
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
package envoy.event;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-common</strong><br>
|
||||||
|
* File: <strong>ProfilePicChange.java</strong><br>
|
||||||
|
* Created: <strong>31.07.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public class ProfilePicChange extends Event<byte[]> {
|
||||||
|
|
||||||
|
private final long id;
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param value the byte[] of the new image
|
||||||
|
* @param userID the ID of the user who changed his profile pic
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public ProfilePicChange(byte[] value, long userID) {
|
||||||
|
super(value);
|
||||||
|
id = userID;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the ID of the user changing his profile pic
|
||||||
|
* @since Envoy Common v0.2-beta
|
||||||
|
*/
|
||||||
|
public long getId() { return id; }
|
||||||
|
}
|
@ -70,7 +70,10 @@ public class Startup {
|
|||||||
new IDGeneratorRequestProcessor(),
|
new IDGeneratorRequestProcessor(),
|
||||||
new UserSearchProcessor(),
|
new UserSearchProcessor(),
|
||||||
new ContactOperationProcessor(),
|
new ContactOperationProcessor(),
|
||||||
new IsTypingProcessor())));
|
new IsTypingProcessor(),
|
||||||
|
new NameChangeProcessor(),
|
||||||
|
new ProfilePicChangeProcessor(),
|
||||||
|
new PasswordChangeRequestProcessor())));
|
||||||
|
|
||||||
// Initialize the current message ID
|
// Initialize the current message ID
|
||||||
final PersistenceManager persistenceManager = PersistenceManager.getInstance();
|
final PersistenceManager persistenceManager = PersistenceManager.getInstance();
|
||||||
|
@ -18,7 +18,7 @@ import javax.persistence.*;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "contacts")
|
@Table(name = "contacts", uniqueConstraints = { @UniqueConstraint(columnNames = { "name" }) })
|
||||||
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
|
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
|
||||||
public abstract class Contact {
|
public abstract class Contact {
|
||||||
|
|
||||||
|
@ -0,0 +1,35 @@
|
|||||||
|
package envoy.server.processors;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import envoy.event.PasswordChangeRequest;
|
||||||
|
import envoy.event.PasswordChangeResult;
|
||||||
|
import envoy.server.data.PersistenceManager;
|
||||||
|
import envoy.server.net.ObjectWriteProxy;
|
||||||
|
import envoy.server.util.PasswordUtil;
|
||||||
|
import envoy.util.EnvoyLog;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-server-standalone</strong><br>
|
||||||
|
* File: <strong>PasswordChangeRequestProcessor.java</strong><br>
|
||||||
|
* Created: <strong>31.07.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Server v0.2-beta
|
||||||
|
*/
|
||||||
|
public class PasswordChangeRequestProcessor implements ObjectProcessor<PasswordChangeRequest> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void process(PasswordChangeRequest event, long socketID, ObjectWriteProxy writeProxy) throws IOException {
|
||||||
|
final var persistenceManager = PersistenceManager.getInstance();
|
||||||
|
final var user = persistenceManager.getUserByID(event.getID());
|
||||||
|
final var logger = EnvoyLog.getLogger(PasswordChangeRequestProcessor.class);
|
||||||
|
final var correctAuthentication = PasswordUtil.validate(event.getOldPassword(), user.getPasswordHash());
|
||||||
|
if (correctAuthentication) {
|
||||||
|
user.setPasswordHash(PasswordUtil.hash(event.get()));
|
||||||
|
logger.log(Level.INFO, user + " changed his password");
|
||||||
|
} else logger.log(Level.INFO, user + " tried changing his password but provided insufficient authentication");
|
||||||
|
writeProxy.write(socketID, new PasswordChangeResult(correctAuthentication));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
package envoy.server.processors;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import envoy.event.ProfilePicChange;
|
||||||
|
import envoy.server.net.ObjectWriteProxy;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>envoy-server-standalone</strong><br>
|
||||||
|
* File: <strong>ProfilePicChangeProcessor.java</strong><br>
|
||||||
|
* Created: <strong>01.08.2020</strong><br>
|
||||||
|
*
|
||||||
|
* @author Leon Hofmeister
|
||||||
|
* @since Envoy Server v0.2-beta
|
||||||
|
*/
|
||||||
|
public class ProfilePicChangeProcessor implements ObjectProcessor<ProfilePicChange> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void process(ProfilePicChange event, long socketID, ObjectWriteProxy writeProxy) throws IOException {}
|
||||||
|
}
|
Reference in New Issue
Block a user