From e96cb644066bdd01998342652f36094da8c3e4f5 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:18:48 +0100 Subject: [PATCH 01/10] Add info how to run the application to README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 1653862..74a1349 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,9 @@ of authenticity. ![Login Screen](assets/qr_omemo_login.png) ![Main Screen](assets/qr_omemo_main.png) + +# Executing the application + +```bash +gradle jfxRun +``` From bb7e1fff69e0f30d5e91b75786dba4edc899a92a Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:19:02 +0100 Subject: [PATCH 02/10] Add 'eclipse' plugin to build.gradle --- .gitignore | 6 ++++++ build.gradle | 1 + 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index c462d2e..56cd8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,10 @@ */out */build/ + out/ + +/.classpath +/.project +/.settings/ +/bin/ diff --git a/build.gradle b/build.gradle index 153e3fe..d50b263 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { } allprojects { + apply plugin: 'eclipse' apply plugin: 'java' apply plugin: 'javafx-gradle-plugin' } From 931d732e83560f1e49fa18a62dbc18479f4f8fe4 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:19:10 +0100 Subject: [PATCH 03/10] Cleanup unused imports in ListViewController --- .../de/vanitasvitae/omemoqrgenerator/ListViewController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/ListViewController.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/ListViewController.java index 3ffc8c2..6fc246a 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/ListViewController.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/ListViewController.java @@ -1,6 +1,5 @@ package de.vanitasvitae.omemoqrgenerator; -import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.ListView; import javafx.scene.input.ScrollEvent; From 8da72d9427058b52a7a22b6eb1580d04deb92ac9 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:19:23 +0100 Subject: [PATCH 04/10] Cleanup unsued import and remove star import in QrDisplayController --- .../vanitasvitae/omemoqrgenerator/QrDisplayController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/QrDisplayController.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/QrDisplayController.java index f40e507..5403ec4 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/QrDisplayController.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/QrDisplayController.java @@ -1,6 +1,7 @@ package de.vanitasvitae.omemoqrgenerator; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.util.Iterator; @@ -8,13 +9,11 @@ import com.google.zxing.BarcodeFormat; import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; -import com.jfoenix.controls.JFXListView; import javafx.collections.ListChangeListener; import javafx.embed.swing.SwingFXUtils; import javafx.fxml.FXML; import javafx.scene.control.ListView; import javafx.scene.image.ImageView; -import javafx.scene.layout.GridPane; public class QrDisplayController { From a9fb09511aa077373c157b1b516e0728aba69d54 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:19:36 +0100 Subject: [PATCH 05/10] Cleanup unsued import in Util --- src/main/java/de/vanitasvitae/omemoqrgenerator/Util.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/Util.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/Util.java index 95c02d4..956bfe4 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/Util.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/Util.java @@ -20,7 +20,6 @@ import org.jivesoftware.smackx.pubsub.PayloadItem; import org.jivesoftware.smackx.pubsub.PubSubException; import org.jivesoftware.smackx.pubsub.PubSubManager; -import org.bouncycastle.util.Strings; import org.jxmpp.jid.BareJid; public class Util { From d00518b87cf07ea5a648329e111761835e9b4467 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 09:20:11 +0100 Subject: [PATCH 06/10] Use JUL Logger in Main --- src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java index 9d0734a..1f344fe 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java @@ -1,6 +1,8 @@ package de.vanitasvitae.omemoqrgenerator; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.packet.Presence; @@ -19,6 +21,8 @@ import org.jxmpp.jid.BareJid; public class Main extends Application implements LoginCallback { + private static final Logger LOGGER = Logger.getLogger(Main.class.getName()); + private Stage stage; /* @@ -104,9 +108,10 @@ public class Main extends Application implements LoginCallback { Map fingerprints = Util.getFingerprints(connection); ObservableList identities = repository.getIdentities(); + LOGGER.info("Received " + identities.size() + " OMEMO identities"); for (OmemoDevice device : fingerprints.keySet()) { identities.addAll(new OmemoIdentity(device, fingerprints.get(device))); - System.out.println(Util.twoLinesFingerprint(fingerprints.get(device))); + LOGGER.info(Util.twoLinesFingerprint(fingerprints.get(device))); } connection.disconnect(new Presence(Presence.Type.unavailable)); @@ -121,6 +126,7 @@ public class Main extends Application implements LoginCallback { stage.show(); } catch (Exception e) { e.printStackTrace(); + LOGGER.log(Level.SEVERE, "Exception in login", e); } } } From f819102ca71c733ef4ad9dd5524e9fd9643de8c1 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 14:17:09 +0100 Subject: [PATCH 07/10] Simply call no-parameter disconnect() in Main cause we can. --- src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java index 1f344fe..7222ba9 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java @@ -5,7 +5,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.SmackConfiguration; -import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.tcp.XMPPTCPConnection; import org.jivesoftware.smackx.omemo.internal.OmemoDevice; import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; @@ -114,7 +113,7 @@ public class Main extends Application implements LoginCallback { LOGGER.info(Util.twoLinesFingerprint(fingerprints.get(device))); } - connection.disconnect(new Presence(Presence.Type.unavailable)); + connection.disconnect(); FXMLLoader loader = new FXMLLoader(); loader.setLocation(getClass().getResource("/fxml/qrdisplay.fxml")); From 4358b9c158b0271a579cbf8f49dc568d43426916 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 14:17:49 +0100 Subject: [PATCH 08/10] Use try/multi-catch in Main --- src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java index 7222ba9..bf3c80f 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java @@ -1,11 +1,15 @@ package de.vanitasvitae.omemoqrgenerator; +import java.io.IOException; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.SmackConfiguration; +import org.jivesoftware.smack.SmackException; +import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.tcp.XMPPTCPConnection; +import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException; import org.jivesoftware.smackx.omemo.internal.OmemoDevice; import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; @@ -123,8 +127,7 @@ public class Main extends Application implements LoginCallback { stage.setTitle("OMEMO QR-Code Generator"); stage.setScene(scene); stage.show(); - } catch (Exception e) { - e.printStackTrace(); + } catch (InterruptedException | XMPPException | SmackException | IOException | CorruptedOmemoKeyException e) { LOGGER.log(Level.SEVERE, "Exception in login", e); } } From cb88a22cabfeb6db8ae809a36fdc6bd0852c5f47 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 14:18:00 +0100 Subject: [PATCH 09/10] Cleanup unused imports in Main --- src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java index bf3c80f..ee01200 100644 --- a/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java +++ b/src/main/java/de/vanitasvitae/omemoqrgenerator/Main.java @@ -14,13 +14,11 @@ import org.jivesoftware.smackx.omemo.internal.OmemoDevice; import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; import javafx.application.Application; -import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import org.jxmpp.jid.BareJid; public class Main extends Application implements LoginCallback { From fc24055d4617a7387f74c67891472cb7d33d8f75 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 8 Nov 2018 14:18:46 +0100 Subject: [PATCH 10/10] Fix .gitignore --- .gitignore | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 56cd8fc..2d8120b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,10 @@ -.gradle/ -.idea/ +/.gradle/ +/.idea/ -*.iml -*/out -*/build/ +/*.iml +/build/ - -out/ +/out/ /.classpath /.project