From f4c40336860e19ab1e611778b7d5bdc09e8aa101 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 13 Jul 2020 23:28:11 +0200
Subject: [PATCH] Small changes

---
 .../detail/AccountDetailsFragment.java        | 26 ++++-----
 .../res/layout/fragment_account_details.xml   | 57 ++++++++++++++++++-
 app/src/main/res/navigation/nav_graph.xml     |  5 --
 app/src/main/res/values/strings.xml           |  1 +
 .../data/repository/RxOpenPgpRepository.java  | 18 +-----
 .../mercury_im/messenger/core/Messenger.java  | 10 ----
 .../core/crypto/MercuryOpenPgpManager.java    | 29 +++++++---
 .../data/repository/OpenPgpRepository.java    |  2 -
 .../messenger/core/xmpp/SmackConfig.java      |  1 -
 9 files changed, 89 insertions(+), 60 deletions(-)
 delete mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java b/app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java
index fc4614b..c8bf016 100644
--- a/app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java
+++ b/app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java
@@ -58,6 +58,19 @@ public class AccountDetailsFragment extends Fragment {
         this.accountId = accountId;
     }
 
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_account_details, container, false);
+        ButterKnife.bind(this, view);
+
+        externalFingerprintRecyclerView.setAdapter(adapter);
+
+        observe();
+
+        return view;
+    }
+
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
@@ -94,17 +107,4 @@ public class AccountDetailsFragment extends Fragment {
         });
     }
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_account_details, container, false);
-        ButterKnife.bind(this, view);
-
-        externalFingerprintRecyclerView.setAdapter(adapter);
-
-        observe();
-
-        return view;
-    }
-
 }
diff --git a/app/src/main/res/layout/fragment_account_details.xml b/app/src/main/res/layout/fragment_account_details.xml
index f17a2b7..928e904 100644
--- a/app/src/main/res/layout/fragment_account_details.xml
+++ b/app/src/main/res/layout/fragment_account_details.xml
@@ -49,11 +49,62 @@
             android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Title"
             android:text="Encryption Keys" />
 
-        <include layout="@layout/view_fingerprint_card"
-            android:layout_height="wrap_content"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp"
+            app:cardCornerRadius="4dp"
+            app:cardElevation="4dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:paddingTop="12dp">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Local Fingerprint"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+                <include
+                    android:id="@+id/local_fingerprint"
+                    layout="@layout/view_fingerprint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/title" />
+
+                <Button
+                    android:id="@+id/btn_backup"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/btn_server_backup"
+                    app:layout_constraintEnd_toStartOf="@+id/btn_share"
+                    app:layout_constraintTop_toBottomOf="@+id/local_fingerprint" />
+
+                <Button
+                    android:id="@+id/btn_share"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="share"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/local_fingerprint" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
 
         <include layout="@layout/view_fingerprints_card_toggleable"
             android:id="@+id/other_fingerprints_card"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index c8384f7..0000000
--- a/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nav_graph">
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ebfac1..df2fe28 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,4 +144,5 @@
     <string name="button_delete">Delete</string>
 
     <string name="test_fingerprint">1357 B018 65B2 503C 1845\n3D20 8CAC 2A96 7854 8E35</string>
+    <string name="btn_server_backup">Create Server Backup</string>
 </resources>
diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/RxOpenPgpRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RxOpenPgpRepository.java
index adde3cf..41e1721 100644
--- a/data/src/main/java/org/mercury_im/messenger/data/repository/RxOpenPgpRepository.java
+++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RxOpenPgpRepository.java
@@ -255,23 +255,6 @@ public class RxOpenPgpRepository implements OpenPgpRepository {
                 });
     }
 
-    @Override
-    public Observable<List<OpenPgpV4Fingerprint>> observeRemoteFingerprintsOfAccount(UUID accountId) {
-        return accountRepository.getAccount(accountId).toSingle()
-                .flatMapObservable(account -> data.select(AnnouncedOpenPgpContactKey.class)
-                        .where(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(accountId)
-                                .and(AnnouncedOpenPgpContactKey.OWNER.eq(account.getJid())))
-                        .get().observableResult()
-                        .map(ResultDelegate::toList)
-                        .map(list -> {
-                            ArrayList<OpenPgpV4Fingerprint> fingerprints = new ArrayList<>();
-                            for (AnnouncedOpenPgpContactKey key : list) {
-                                fingerprints.add(key.getFingerprint());
-                            }
-                            return fingerprints;
-                        }));
-    }
-
     @Override
     public Observable<List<FingerprintViewItem>> observeFingerprints(UUID accountId, EntityBareJid owner) {
         return data.select(AnnouncedOpenPgpContactKey.ACCOUNT_ID,
@@ -293,6 +276,7 @@ public class RxOpenPgpRepository implements OpenPgpRepository {
                                 .and(OpenPgpKeyTrust.FINGERPRINT.eq(AnnouncedOpenPgpContactKey.FINGERPRINT))))
 
                 .where(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(accountId).and(AnnouncedOpenPgpContactKey.OWNER.eq(owner)))
+                .orderBy(AnnouncedOpenPgpContactKey.MODIFICATION_DATE.desc())
 
                 .get().observableResult()
                 .map(ResultDelegate::toList)
diff --git a/domain/src/main/java/org/mercury_im/messenger/core/Messenger.java b/domain/src/main/java/org/mercury_im/messenger/core/Messenger.java
index e54ef55..4974f9d 100644
--- a/domain/src/main/java/org/mercury_im/messenger/core/Messenger.java
+++ b/domain/src/main/java/org/mercury_im/messenger/core/Messenger.java
@@ -4,10 +4,8 @@ import org.bouncycastle.openpgp.PGPException;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.chat2.ChatManager;
-import org.jivesoftware.smack.packet.MessageBuilder;
 import org.jivesoftware.smack.roster.Roster;
 import org.jivesoftware.smack.roster.RosterEntry;
-import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.OpenPgpManager;
 import org.jivesoftware.smackx.ox_im.OXInstantMessagingManager;
 import org.jxmpp.jid.EntityBareJid;
@@ -19,13 +17,8 @@ import org.mercury_im.messenger.core.exception.ContactAlreadyAddedException;
 import org.mercury_im.messenger.core.xmpp.MercuryConnection;
 import org.mercury_im.messenger.core.xmpp.MercuryConnectionManager;
 import org.mercury_im.messenger.entity.contact.Peer;
-import org.mercury_im.messenger.entity.message.Message;
-import org.mercury_im.messenger.entity.message.MessageDeliveryState;
-import org.mercury_im.messenger.entity.message.MessageDirection;
-import org.pgpainless.key.OpenPgpV4Fingerprint;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -34,7 +27,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import io.reactivex.Completable;
-import io.reactivex.disposables.CompositeDisposable;
 
 @Singleton
 public class Messenger {
@@ -46,8 +38,6 @@ public class Messenger {
     private final Repositories repositories;
     private final SchedulersFacade schedulers;
 
-    private CompositeDisposable disposable = new CompositeDisposable();
-
     @Inject
     public Messenger(Repositories repositories,
                      MercuryConnectionManager connectionManager,
diff --git a/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java b/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java
index ef91ed8..da8d642 100644
--- a/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java
+++ b/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java
@@ -61,19 +61,30 @@ public class MercuryOpenPgpManager {
         OpenPgpManager oxManager = OpenPgpManager.getInstanceFor(connection.getConnection());
         oxManager.setOpenPgpProvider(provider);
         SecretKeyBackupHelper.setBackupCodeGenerator(
+                // TODO: REMOVE IN PRODUCTION!!!
                 () -> "71ZA-Y416-UA7A-7NCE-3SNM-88EF"
         );
         try {
+            boolean mustGenerate = false;
             if (!oxManager.hasSecretKeysAvailable()) {
-                try {
-                    oxManager.restoreSecretKeyServerBackup(
-                            //() -> "RW8X-367S-A2C3-QYAL-VG6E-Z2IM");
-                            //() -> "KISJ-5Z1T-FGDW-WMDK-SC2U-SQUA");
-                            () -> "71ZA-Y416-UA7A-7NCE-3SNM-88EF");
-                    LOGGER.log(Level.INFO, "Successfully restored secret key backup!");
-                } catch (NoBackupFoundException | PubSubException.NotALeafNodeException | InvalidBackupCodeException e) {
-                    LOGGER.log(Level.INFO, "Error restoring secret key backup.", e);
-                    oxManager.generateAndImportKeyPair(connection.getAccount().getJid());
+                mustGenerate = true;
+                if (OpenPgpManager.serverSupportsSecretKeyBackups(connection.getConnection())) {
+                    try {
+                        oxManager.restoreSecretKeyServerBackup(
+                                //() -> "RW8X-367S-A2C3-QYAL-VG6E-Z2IM");
+                                //() -> "KISJ-5Z1T-FGDW-WMDK-SC2U-SQUA");
+                                () -> "71ZA-Y416-UA7A-7NCE-3SNM-88EF");
+                        mustGenerate = false;
+                        LOGGER.log(Level.INFO, "Successfully restored secret key backup!");
+                    } catch (NoBackupFoundException | PubSubException.NotALeafNodeException | InvalidBackupCodeException e) {
+                        LOGGER.log(Level.INFO, "Error restoring secret key backup.", e);
+                    }
+                }
+            }
+
+            if (mustGenerate) {
+                oxManager.generateAndImportKeyPair(connection.getAccount().getJid());
+                if (OpenPgpManager.serverSupportsSecretKeyBackups(connection.getConnection())) {
                     oxManager.backupSecretKeyToServer(
                             backupCode -> LOGGER.log(Level.INFO, "OpenPGP Backup Code: " + backupCode),
                             availableSecretKeys -> availableSecretKeys);
diff --git a/domain/src/main/java/org/mercury_im/messenger/core/data/repository/OpenPgpRepository.java b/domain/src/main/java/org/mercury_im/messenger/core/data/repository/OpenPgpRepository.java
index f075cc8..0d4681d 100644
--- a/domain/src/main/java/org/mercury_im/messenger/core/data/repository/OpenPgpRepository.java
+++ b/domain/src/main/java/org/mercury_im/messenger/core/data/repository/OpenPgpRepository.java
@@ -55,7 +55,5 @@ public interface OpenPgpRepository {
 
     Observable<Optional<OpenPgpV4Fingerprint>> observeLocalFingerprintOf(UUID accountId);
 
-    Observable<List<OpenPgpV4Fingerprint>> observeRemoteFingerprintsOfAccount(UUID accountId);
-
     Observable<List<FingerprintViewItem>> observeFingerprints(UUID accountId, EntityBareJid owner);
 }
diff --git a/domain/src/main/java/org/mercury_im/messenger/core/xmpp/SmackConfig.java b/domain/src/main/java/org/mercury_im/messenger/core/xmpp/SmackConfig.java
index 9e84e65..bbaee5b 100644
--- a/domain/src/main/java/org/mercury_im/messenger/core/xmpp/SmackConfig.java
+++ b/domain/src/main/java/org/mercury_im/messenger/core/xmpp/SmackConfig.java
@@ -5,7 +5,6 @@ import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.roster.Roster;
 import org.jivesoftware.smackx.carbons.CarbonManager;
 import org.jivesoftware.smackx.iqversion.VersionManager;
-import org.jivesoftware.smackx.mam.MamManager;
 import org.jivesoftware.smackx.receipts.DeliveryReceiptManager;
 import org.jivesoftware.smackx.sid.StableUniqueStanzaIdManager;