vanitasvitae/clocc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2 from mimi89999/master

Browse source 
Use jline for input
This commit is contained in:
vanitasvitae 2017-04-23 15:11:59 +02:00 committed by GitHub
commit 3997843f1b
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -18,6 +18,8 @@ dependencies {
compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion" compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
compile "org.igniterealtime.smack:smack-resolver-dnsjava:$smackVersion" compile "org.igniterealtime.smack:smack-resolver-dnsjava:$smackVersion"
compile "org.igniterealtime.smack:smack-tcp:$smackVersion" compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
compile "org.jline:jline:3.2.0"
} }
jar { jar {

40
src/main/java/Main.java
View file

@ -33,6 +33,13 @@ import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.stringprep.XmppStringprepException; import org.jxmpp.stringprep.XmppStringprepException;
import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.IdentityKey;
import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder;
import org.jline.reader.LineReader;
import org.jline.reader.LineReaderBuilder;
import org.jline.reader.UserInterruptException;
import org.jline.reader.EndOfFileException;
import java.io.File; import java.io.File;
import java.security.Security; import java.security.Security;
import java.util.ArrayList; import java.util.ArrayList;
@ -61,6 +68,12 @@ public class Main {
} }
public void start() throws Exception { public void start() throws Exception {
Terminal terminal = TerminalBuilder.terminal();
LineReader reader = LineReaderBuilder.builder()
.terminal(terminal)
.build();
String prompt = "> ";
Scanner scanner = new Scanner(System.in); Scanner scanner = new Scanner(System.in);
String jidname = null, password = null; String jidname = null, password = null;
while(jidname == null) { while(jidname == null) {
@ -84,12 +97,20 @@ public class Main {
OmemoMessageListener messageListener = (decrypted, message, wrapping, omemoMessageInformation) -> { OmemoMessageListener messageListener = (decrypted, message, wrapping, omemoMessageInformation) -> {
BareJid sender = message.getFrom().asBareJid(); BareJid sender = message.getFrom().asBareJid();
if (sender != null && decrypted != null) { if (sender != null && decrypted != null) {
System.out.println("\033[34m" + sender + ": " + decrypted + "\033[0m "+(omemoMessageInformation != null ? omemoMessageInformation : "")); reader.callWidget(LineReader.CLEAR);
reader.getTerminal().writer().println("\033[34m" + sender + ": " + decrypted + "\033[0m "+(omemoMessageInformation != null ? omemoMessageInformation : ""));
reader.callWidget(LineReader.REDRAW_LINE);
reader.callWidget(LineReader.REDISPLAY);
reader.getTerminal().writer().flush();
} }
}; };
OmemoMucMessageListener mucMessageListener = (multiUserChat, bareJid, s, message, message1, omemoMessageInformation) -> { OmemoMucMessageListener mucMessageListener = (multiUserChat, bareJid, s, message, message1, omemoMessageInformation) -> {
if(multiUserChat != null && bareJid != null && s != null) { if(multiUserChat != null && bareJid != null && s != null) {
System.out.println("\033[36m"+multiUserChat.getRoom()+": "+bareJid+": "+s+"\033[0m "+(omemoMessageInformation != null ? omemoMessageInformation : "")); reader.callWidget(LineReader.CLEAR);
reader.getTerminal().writer().println("\033[36m"+multiUserChat.getRoom()+": "+bareJid+": "+s+"\033[0m "+(omemoMessageInformation != null ? omemoMessageInformation : ""));
reader.callWidget(LineReader.REDRAW_LINE);
reader.callWidget(LineReader.REDISPLAY);
reader.getTerminal().writer().flush();
} }
}; };
@ -124,11 +145,18 @@ public class Main {
} }
}); });
System.out.println("OMEMO setup complete. You can now start chatting."); System.out.println("OMEMO setup complete. You can now start chatting.");
String line;
Chat current = null; Chat current = null;
boolean omemo = false; boolean omemo = false;
while ((line = scanner.nextLine()) != null) { while (true) {
String line = null;
try {
line = reader.readLine(prompt);
} catch (UserInterruptException e) {
// Ignore
} catch (EndOfFileException e) {
return;
}
String [] split = line.split(" "); String [] split = line.split(" ");
if(line.startsWith("/chat ")) { if(line.startsWith("/chat ")) {
String l = line.substring("/chat ".length()); String l = line.substring("/chat ".length());
@ -325,7 +353,7 @@ public class Main {
else { /*else {
if(current != null) { if(current != null) {
if(!omemo) { if(!omemo) {
current.sendMessage(line); current.sendMessage(line);
@ -345,7 +373,7 @@ public class Main {
} }
else else
System.out.println("please open a chat"); System.out.println("please open a chat");
} }*/
} }