From b78d45c7cc6ecc944ae31d628a7233d0d95aeb33 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 7 Jun 2020 12:47:03 +0200
Subject: [PATCH 01/29] fix Jingle FT candidate selection for equal priority.
 fixes #3771

---
 .../xmpp/jingle/JingleCandidate.java          |  3 +-
 .../jingle/JingleFileTransferConnection.java  | 48 +++++++------------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
index d1bfc987a..0fd0eabaf 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
@@ -147,7 +147,6 @@ public class JingleCandidate {
 	}
 
 	public String toString() {
-		return this.getHost() + ":" + this.getPort() + " (prio="
-				+ this.getPriority() + ")";
+		return String.format("%s:%s (priority=%s,ours=%s)", getHost(), getPort(), getPriority(), isOurs());
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
index 2f84f7c45..36948d48b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
@@ -5,6 +5,8 @@ import android.util.Log;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Iterables;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -442,7 +444,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
         try {
             senders = content.getSenders();
         } catch (final Exception e) {
-             senders = Content.Senders.INITIATOR;
+            senders = Content.Senders.INITIATOR;
         }
         this.contentSenders = senders;
         this.contentName = content.getAttribute("name");
@@ -825,8 +827,9 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
                 this.sendFallbackToIbb();
             }
         } else {
+            //TODO at this point we can already close other connections to free some resources
             final JingleCandidate candidate = connection.getCandidate();
-            Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": elected candidate " + candidate.getHost() + ":" + candidate.getPort());
+            Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": elected candidate " + candidate.toString());
             this.mJingleStatus = JINGLE_STATUS_TRANSMITTING;
             if (connection.needsActivation()) {
                 if (connection.getCandidate().isOurs()) {
@@ -875,38 +878,23 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
     }
 
     private JingleSocks5Transport chooseConnection() {
-        JingleSocks5Transport connection = null;
-        for (Entry<String, JingleSocks5Transport> cursor : connections
-                .entrySet()) {
-            JingleSocks5Transport currentConnection = cursor.getValue();
-            // Log.d(Config.LOGTAG,"comparing candidate: "+currentConnection.getCandidate().toString());
-            if (currentConnection.isEstablished()
-                    && (currentConnection.getCandidate().isUsedByCounterpart() || (!currentConnection
-                    .getCandidate().isOurs()))) {
-                // Log.d(Config.LOGTAG,"is usable");
-                if (connection == null) {
-                    connection = currentConnection;
-                } else {
-                    if (connection.getCandidate().getPriority() < currentConnection
-                            .getCandidate().getPriority()) {
-                        connection = currentConnection;
-                    } else if (connection.getCandidate().getPriority() == currentConnection
-                            .getCandidate().getPriority()) {
-                        // Log.d(Config.LOGTAG,"found two candidates with same priority");
+        final List<JingleSocks5Transport> establishedConnections = FluentIterable.from(connections.entrySet())
+                .transform(Entry::getValue)
+                .filter(c -> (c != null && c.isEstablished() && (c.getCandidate().isUsedByCounterpart() || !c.getCandidate().isOurs())))
+                .toSortedList((a, b) -> {
+                    final int compare = Integer.compare(b.getCandidate().getPriority(), a.getCandidate().getPriority());
+                    if (compare == 0) {
                         if (isInitiator()) {
-                            if (currentConnection.getCandidate().isOurs()) {
-                                connection = currentConnection;
-                            }
+                            //pick the one we sent a candidate-used for (meaning not ours)
+                            return a.getCandidate().isOurs() ? 1 : -1;
                         } else {
-                            if (!currentConnection.getCandidate().isOurs()) {
-                                connection = currentConnection;
-                            }
+                            //pick the one they sent a candidate-used for (meaning ours)
+                            return a.getCandidate().isOurs() ? -1 : 1;
                         }
                     }
-                }
-            }
-        }
-        return connection;
+                    return compare;
+                });
+        return Iterables.getFirst(establishedConnections, null);
     }
 
     private void sendSuccess() {

From 1853242c6682c863d5524be0a1ee74c2c15e519e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 7 Jun 2020 14:59:55 +0200
Subject: [PATCH 02/29] do not throw when finishing jingle ft twice. fixes
 #3765

the state machine in jingle file transfer does not prevent that the connection
is being finished twice
---
 .../conversations/xmpp/jingle/JingleConnectionManager.java    | 4 ++++
 .../siacs/conversations/xmpp/jingle/JingleRtpConnection.java  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 4a1f7148f..34b6ac9ab 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -447,6 +447,10 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     void finishConnection(final AbstractJingleConnection connection) {
+        this.connections.remove(connection.getId());
+    }
+
+    void finishConnectionOrThrow(final AbstractJingleConnection connection) {
         final AbstractJingleConnection.Id id = connection.getId();
         if (this.connections.remove(id) == null) {
             throw new IllegalStateException(String.format("Unable to finish connection with id=%s", id.toString()));
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 8ff496835..835560aa1 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -1189,7 +1189,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
         if (isTerminated()) {
             this.cancelRingingTimeout();
             this.webRTCWrapper.verifyClosed();
-            this.jingleConnectionManager.finishConnection(this);
+            this.jingleConnectionManager.finishConnectionOrThrow(this);
         } else {
             throw new IllegalStateException(String.format("Unable to call finish from %s", this.state));
         }

From 7e2d87f39c683c8ca0cab1be4058e0ca1fbd6e3d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 9 Jun 2020 21:08:27 +0200
Subject: [PATCH 03/29] =?UTF-8?q?recover=20if=20attachImage=20can=E2=80=99?=
 =?UTF-8?q?t=20generate=20scalled=20down=20version=20of=20image.=20fixes?=
 =?UTF-8?q?=20#3773?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistance/FileBackend.java              | 17 +++++++-----
 .../services/XmppConnectionService.java       | 26 +++++++++++--------
 .../conversations/ui/util/Attachment.java     | 22 ++++++++--------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 1ff94c7c0..98d0f3de8 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -704,7 +704,7 @@ public class FileBackend {
         return pos > 0 ? filename.substring(pos + 1) : null;
     }
 
-    private void copyImageToPrivateStorage(File file, Uri image, int sampleSize) throws FileCopyException {
+    private void copyImageToPrivateStorage(File file, Uri image, int sampleSize) throws FileCopyException, NotAnImageFileException {
         file.getParentFile().mkdirs();
         InputStream is = null;
         OutputStream os = null;
@@ -724,7 +724,7 @@ public class FileBackend {
             originalBitmap = BitmapFactory.decodeStream(is, null, options);
             is.close();
             if (originalBitmap == null) {
-                throw new FileCopyException(R.string.error_not_an_image_file);
+                throw new NotAnImageFileException();
             }
             Bitmap scaledBitmap = resize(originalBitmap, Config.IMAGE_SIZE);
             int rotation = getRotation(image);
@@ -763,12 +763,12 @@ public class FileBackend {
         }
     }
 
-    public void copyImageToPrivateStorage(File file, Uri image) throws FileCopyException {
+    public void copyImageToPrivateStorage(File file, Uri image) throws FileCopyException, NotAnImageFileException {
         Log.d(Config.LOGTAG, "copy image (" + image.toString() + ") to private storage " + file.getAbsolutePath());
         copyImageToPrivateStorage(file, image, 0);
     }
 
-    public void copyImageToPrivateStorage(Message message, Uri image) throws FileCopyException {
+    public void copyImageToPrivateStorage(Message message, Uri image) throws FileCopyException, NotAnImageFileException {
         switch (Config.IMAGE_FORMAT) {
             case JPEG:
                 message.setRelativeFilePath(message.getUuid() + ".jpg");
@@ -1420,11 +1420,14 @@ public class FileBackend {
         }
     }
 
-    public class FileCopyException extends Exception {
-        private static final long serialVersionUID = -1010013599132881427L;
+    public static class NotAnImageFileException extends Exception {
+
+    }
+
+    public static class FileCopyException extends Exception {
         private int resId;
 
-        public FileCopyException(int resId) {
+        private FileCopyException(int resId) {
             this.resId = resId;
         }
 
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 6f1ff65cc..ebac40f99 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -567,19 +567,23 @@ public class XmppConnectionService extends Service {
         mFileAddingExecutor.execute(() -> {
             try {
                 getFileBackend().copyImageToPrivateStorage(message, uri);
-                if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-                    final PgpEngine pgpEngine = getPgpEngine();
-                    if (pgpEngine != null) {
-                        pgpEngine.encrypt(message, callback);
-                    } else if (callback != null) {
-                        callback.error(R.string.unable_to_connect_to_keychain, null);
-                    }
-                } else {
-                    sendMessage(message);
-                    callback.success(message);
-                }
+            } catch (FileBackend.NotAnImageFileException e) {
+                attachFileToConversation(conversation, uri, mimeType, callback);
+                return;
             } catch (final FileBackend.FileCopyException e) {
                 callback.error(e.getResId(), message);
+                return;
+            }
+            if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
+                final PgpEngine pgpEngine = getPgpEngine();
+                if (pgpEngine != null) {
+                    pgpEngine.encrypt(message, callback);
+                } else if (callback != null) {
+                    callback.error(R.string.unable_to_connect_to_keychain, null);
+                }
+            } else {
+                sendMessage(message);
+                callback.success(message);
             }
         });
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
index d4bd33bb2..14d5749a1 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
@@ -35,7 +35,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -43,7 +42,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import eu.siacs.conversations.Config;
 import eu.siacs.conversations.utils.Compatibility;
 import eu.siacs.conversations.utils.MimeUtils;
 
@@ -113,7 +111,7 @@ public class Attachment implements Parcelable {
     }
 
     public static boolean canBeSendInband(final List<Attachment> attachments) {
-        for(Attachment attachment : attachments) {
+        for (Attachment attachment : attachments) {
             if (attachment.type != Type.LOCATION) {
                 return false;
             }
@@ -122,21 +120,21 @@ public class Attachment implements Parcelable {
     }
 
     public static List<Attachment> of(final Context context, Uri uri, Type type) {
-        final String mime = type == Type.LOCATION ?null :MimeUtils.guessMimeTypeFromUri(context, uri);
+        final String mime = type == Type.LOCATION ? null : MimeUtils.guessMimeTypeFromUri(context, uri);
         return Collections.singletonList(new Attachment(uri, type, mime));
     }
 
     public static List<Attachment> of(final Context context, List<Uri> uris) {
         List<Attachment> attachments = new ArrayList<>();
-        for(Uri uri : uris) {
+        for (Uri uri : uris) {
             final String mime = MimeUtils.guessMimeTypeFromUri(context, uri);
-            attachments.add(new Attachment(uri, mime != null && mime.startsWith("image/") ? Type.IMAGE : Type.FILE,mime));
+            attachments.add(new Attachment(uri, mime != null && isImage(mime) ? Type.IMAGE : Type.FILE, mime));
         }
         return attachments;
     }
 
     public static Attachment of(UUID uuid, final File file, String mime) {
-        return new Attachment(uuid, Uri.fromFile(file),mime != null && (mime.startsWith("image/") || mime.startsWith("video/")) ? Type.IMAGE : Type.FILE, mime);
+        return new Attachment(uuid, Uri.fromFile(file), mime != null && (isImage(mime) || mime.startsWith("video/")) ? Type.IMAGE : Type.FILE, mime);
     }
 
     public static List<Attachment> extractAttachments(final Context context, final Intent intent, Type type) {
@@ -151,9 +149,7 @@ public class Attachment implements Parcelable {
             if (clipData != null) {
                 for (int i = 0; i < clipData.getItemCount(); ++i) {
                     final Uri uri = clipData.getItemAt(i).getUri();
-                    Log.d(Config.LOGTAG,"uri="+uri+" contentType="+contentType);
                     final String mime = MimeUtils.guessMimeTypeFromUriAndMime(context, uri, contentType);
-                    Log.d(Config.LOGTAG,"mime="+mime);
                     uris.add(new Attachment(uri, type, mime));
                 }
             }
@@ -165,12 +161,12 @@ public class Attachment implements Parcelable {
     }
 
     public boolean renderThumbnail() {
-        return type == Type.IMAGE  || (type == Type.FILE && mime != null && renderFileThumbnail(mime));
+        return type == Type.IMAGE || (type == Type.FILE && mime != null && renderFileThumbnail(mime));
     }
 
     private static boolean renderFileThumbnail(final String mime) {
         return mime.startsWith("video/")
-                || mime.startsWith("image/")
+                || isImage(mime)
                 || (Compatibility.runsTwentyOne() && "application/pdf".equals(mime));
     }
 
@@ -181,4 +177,8 @@ public class Attachment implements Parcelable {
     public UUID getUuid() {
         return uuid;
     }
+
+    private static boolean isImage(final String mime) {
+        return mime.startsWith("image/") && !mime.equals("image/svg+xml");
+    }
 }

From 552e17e39abe7af0faafcfc8580cb74a060716eb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Jun 2020 21:17:13 +0200
Subject: [PATCH 04/29] remember terminal RTP session state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

if the activity is not connected during finish it won’t receive the last end user state.

this code remembers it even if the actual session is already gone. so when activity reconnects and
we can’t find the real rtp session we can look up the last state instead.
---
 .../conversations/ui/RtpSessionActivity.java  | 23 ++++++++++++++++-
 .../xmpp/jingle/JingleConnectionManager.java  | 25 ++++++++++++++-----
 .../xmpp/jingle/JingleRtpConnection.java      |  2 +-
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index b7e018abf..9cfda2174 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -53,6 +53,7 @@ import eu.siacs.conversations.utils.PermissionUtils;
 import eu.siacs.conversations.utils.TimeFrameUtils;
 import eu.siacs.conversations.xml.Namespace;
 import eu.siacs.conversations.xmpp.jingle.AbstractJingleConnection;
+import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
 import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
 import eu.siacs.conversations.xmpp.jingle.Media;
 import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
@@ -427,7 +428,13 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         final WeakReference<JingleRtpConnection> reference = xmppConnectionService.getJingleConnectionManager()
                 .findJingleRtpConnection(account, with, sessionId);
         if (reference == null || reference.get() == null) {
-            throw new IllegalStateException("failed to initialize activity with running rtp session. session not found");
+            final JingleConnectionManager.TerminatedRtpSession terminatedRtpSession = xmppConnectionService
+                    .getJingleConnectionManager().getTerminalSessionState(with, sessionId);
+            if (terminatedRtpSession == null) {
+                throw new IllegalStateException("failed to initialize activity with running rtp session. session not found");
+            }
+            initializeWithTerminatedSessionState(account, with, terminatedRtpSession);
+            return true;
         }
         this.rtpConnectionReference = reference;
         final RtpEndUserState currentState = requireRtpConnection().getEndUserState();
@@ -451,6 +458,20 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         return false;
     }
 
+    private void initializeWithTerminatedSessionState(final Account account, final Jid with, final JingleConnectionManager.TerminatedRtpSession terminatedRtpSession) {
+        Log.d(Config.LOGTAG,"initializeWithTerminatedSessionState()");
+        if (terminatedRtpSession.state == RtpEndUserState.ENDED) {
+            finish();
+            return;
+        }
+        RtpEndUserState state = terminatedRtpSession.state;
+        resetIntent(account, with, terminatedRtpSession.state, terminatedRtpSession.media);
+        updateButtonConfiguration(state);
+        updateStateDisplay(state);
+        updateProfilePicture(state);
+        binding.with.setText(account.getRoster().getContact(with).getDisplayName());
+    }
+
     private void reInitializeActivityWithRunningRtpSession(final Account account, Jid with, String sessionId) {
         runOnUiThread(() -> initializeActivityWithRunningRtpSession(account, with, sessionId));
         resetIntent(account, with, sessionId);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 34b6ac9ab..03bafb275 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -11,7 +11,6 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ImmutableSet;
-import com.google.j2objc.annotations.Weak;
 
 import java.lang.ref.WeakReference;
 import java.security.SecureRandom;
@@ -57,8 +56,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     private final HashMap<RtpSessionProposal, DeviceDiscoveryState> rtpSessionProposals = new HashMap<>();
     private final ConcurrentHashMap<AbstractJingleConnection.Id, AbstractJingleConnection> connections = new ConcurrentHashMap<>();
 
-    private final Cache<PersistableSessionId, JingleRtpConnection.State> endedSessions = CacheBuilder.newBuilder()
-            .expireAfterWrite(30, TimeUnit.MINUTES)
+    private final Cache<PersistableSessionId, TerminatedRtpSession> terminatedSessions = CacheBuilder.newBuilder()
+            .expireAfterWrite(24, TimeUnit.HOURS)
             .build();
 
     private HashMap<Jid, JingleCandidate> primaryCandidates = new HashMap<>();
@@ -92,7 +91,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
             if (FileTransferDescription.NAMESPACES.contains(descriptionNamespace)) {
                 connection = new JingleFileTransferConnection(this, id, from);
             } else if (Namespace.JINGLE_APPS_RTP.equals(descriptionNamespace) && !usesTor(account)) {
-                final boolean sessionEnded = this.endedSessions.asMap().containsKey(PersistableSessionId.of(id));
+                final boolean sessionEnded = this.terminatedSessions.asMap().containsKey(PersistableSessionId.of(id));
                 final boolean stranger = isWithStrangerAndStrangerNotificationsAreOff(account, id.with);
                 if (isBusy() || sessionEnded || stranger) {
                     Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": rejected session with " + id.with + " because busy. sessionEnded=" + sessionEnded + ", stranger=" + stranger);
@@ -684,8 +683,12 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         throw e;
     }
 
-    void endSession(AbstractJingleConnection.Id id, final AbstractJingleConnection.State state) {
-        this.endedSessions.put(PersistableSessionId.of(id), state);
+    void setTerminalSessionState(AbstractJingleConnection.Id id, final RtpEndUserState state, final Set<Media> media) {
+        this.terminatedSessions.put(PersistableSessionId.of(id), new TerminatedRtpSession(state, media));
+    }
+
+    public TerminatedRtpSession getTerminalSessionState(final Jid with, final String sessionId) {
+        return this.terminatedSessions.getIfPresent(new PersistableSessionId(with, sessionId));
     }
 
     private static class PersistableSessionId {
@@ -716,6 +719,16 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         }
     }
 
+    public static class TerminatedRtpSession {
+        public final RtpEndUserState state;
+        public final Set<Media> media;
+
+        TerminatedRtpSession(RtpEndUserState state, Set<Media> media) {
+            this.state = state;
+            this.media = media;
+        }
+    }
+
     public enum DeviceDiscoveryState {
         SEARCHING, DISCOVERED, FAILED;
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 835560aa1..2f8486faa 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -912,7 +912,6 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
         }
         if (isInState(State.PROCEED)) {
             Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ending call while in state PROCEED just means ending the connection");
-            this.jingleConnectionManager.endSession(id, State.TERMINATED_SUCCESS);
             this.webRTCWrapper.close();
             transitionOrThrow(State.TERMINATED_SUCCESS); //arguably this wasn't success; but not a real failure either
             this.finish();
@@ -1189,6 +1188,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
         if (isTerminated()) {
             this.cancelRingingTimeout();
             this.webRTCWrapper.verifyClosed();
+            this.jingleConnectionManager.setTerminalSessionState(id, getEndUserState(), getMedia());
             this.jingleConnectionManager.finishConnectionOrThrow(this);
         } else {
             throw new IllegalStateException(String.format("Unable to call finish from %s", this.state));

From f39daf565a67cacb88025ccce9c6c3734038c967 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Jun 2020 21:22:49 +0200
Subject: [PATCH 05/29] upgrade libwebrtc to m83. fixes #3767

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 98e9bd2f2..0a54ad489 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.google.guava:guava:27.1-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.11.1'
-    implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs')
+    implementation fileTree(include: ['libwebrtc-m83.aar'], dir: 'libs')
 }
 
 ext {

From 2cd0cc50d068c4c5997d3d61959dc7b1ff93833d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Jun 2020 21:32:52 +0200
Subject: [PATCH 06/29] point travis to m83.aar

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac5f1ff91..0a938b3e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ android:
     - '.+'
 before_script:
     - mkdir libs
-    - wget -O libs/libwebrtc-m81.aar http://gultsch.de/files/libwebrtc-m81.aar
+    - wget -O libs/libwebrtc-m81.aar http://gultsch.de/files/libwebrtc-m83.aar
 script:
     - ./gradlew assembleConversationsFreeSystemRelease
     - ./gradlew assembleQuicksyFreeCompatRelease

From adb3c77d313faed91238476510b5be7062dbb4bb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Jun 2020 21:41:22 +0200
Subject: [PATCH 07/29] fix travis for real

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0a938b3e4..d2392afab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ android:
     - '.+'
 before_script:
     - mkdir libs
-    - wget -O libs/libwebrtc-m81.aar http://gultsch.de/files/libwebrtc-m83.aar
+    - wget -O libs/libwebrtc-m83.aar http://gultsch.de/files/libwebrtc-m83.aar
 script:
     - ./gradlew assembleConversationsFreeSystemRelease
     - ./gradlew assembleQuicksyFreeCompatRelease

From 644ad995204d7fc06ff7a39621d45fa2dae82109 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 07:56:59 +0200
Subject: [PATCH 08/29] create rtp end user state for connection lost. fixes
 #3769

---
 .../eu/siacs/conversations/ui/RtpSessionActivity.java | 11 ++++++++++-
 .../xmpp/jingle/JingleRtpConnection.java              |  4 ++--
 .../conversations/xmpp/jingle/RtpEndUserState.java    |  1 +
 src/main/res/values/strings.xml                       |  1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 9cfda2174..848c447a1 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -78,6 +78,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             RtpEndUserState.APPLICATION_ERROR,
             RtpEndUserState.DECLINED_OR_BUSY,
             RtpEndUserState.CONNECTIVITY_ERROR,
+            RtpEndUserState.CONNECTIVITY_LOST_ERROR,
             RtpEndUserState.RETRACTED
     );
     private static final String PROXIMITY_WAKE_LOCK_TAG = "conversations:in-rtp-session";
@@ -533,6 +534,9 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             case CONNECTIVITY_ERROR:
                 setTitle(R.string.rtp_state_connectivity_error);
                 break;
+            case CONNECTIVITY_LOST_ERROR:
+                setTitle(R.string.rtp_state_connectivity_lost_error);
+                break;
             case RETRACTED:
                 setTitle(R.string.rtp_state_retracted);
                 break;
@@ -598,7 +602,12 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             this.binding.acceptCall.setOnClickListener(this::recordVoiceMail);
             this.binding.acceptCall.setImageResource(R.drawable.ic_voicemail_white_24dp);
             this.binding.acceptCall.setVisibility(View.VISIBLE);
-        } else if (asList(RtpEndUserState.CONNECTIVITY_ERROR, RtpEndUserState.APPLICATION_ERROR, RtpEndUserState.RETRACTED).contains(state)) {
+        } else if (asList(
+                RtpEndUserState.CONNECTIVITY_ERROR,
+                RtpEndUserState.CONNECTIVITY_LOST_ERROR,
+                RtpEndUserState.APPLICATION_ERROR,
+                RtpEndUserState.RETRACTED
+        ).contains(state)) {
             this.binding.rejectCall.setOnClickListener(this::exit);
             this.binding.rejectCall.setImageResource(R.drawable.ic_clear_white_48dp);
             this.binding.rejectCall.setVisibility(View.VISIBLE);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 2f8486faa..4dadb599d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -814,7 +814,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
                 } else if (state == PeerConnection.PeerConnectionState.CLOSED) {
                     return RtpEndUserState.ENDING_CALL;
                 } else {
-                    return RtpEndUserState.CONNECTIVITY_ERROR;
+                    return rtpConnectionStarted == 0 ? RtpEndUserState.CONNECTIVITY_ERROR : RtpEndUserState.CONNECTIVITY_LOST_ERROR;
                 }
             case REJECTED:
             case TERMINATED_DECLINED_OR_BUSY:
@@ -831,7 +831,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
             case RETRACTED_RACED:
                 return RtpEndUserState.RETRACTED;
             case TERMINATED_CONNECTIVITY_ERROR:
-                return RtpEndUserState.CONNECTIVITY_ERROR;
+                return rtpConnectionStarted == 0 ? RtpEndUserState.CONNECTIVITY_ERROR : RtpEndUserState.CONNECTIVITY_LOST_ERROR;
             case TERMINATED_APPLICATION_FAILURE:
                 return RtpEndUserState.APPLICATION_ERROR;
         }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpEndUserState.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpEndUserState.java
index 398777cfe..3b97fcbc7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpEndUserState.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpEndUserState.java
@@ -11,6 +11,7 @@ public enum RtpEndUserState {
     ENDED, //close UI
     DECLINED_OR_BUSY, //other party declined; no retry button
     CONNECTIVITY_ERROR, //network error; retry button
+    CONNECTIVITY_LOST_ERROR, //network error but for call duration > 0
     RETRACTED, //user pressed home or power button during 'ringing' - shows retry button
     APPLICATION_ERROR //something rather bad happened; libwebrtc failed or we got in IQ-error
 }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 679e37006..a6d951b56 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -903,6 +903,7 @@
     <string name="rtp_state_ringing">Ringing</string>
     <string name="rtp_state_declined_or_busy">Busy</string>
     <string name="rtp_state_connectivity_error">Could not connect call</string>
+    <string name="rtp_state_connectivity_lost_error">Connection lost</string>
     <string name="rtp_state_retracted">Retracted call</string>
     <string name="rtp_state_application_failure">App failure</string>
     <string name="hang_up">Hang up</string>

From b7f3b4333e637d56787182afff83195034259414 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 08:26:33 +0200
Subject: [PATCH 09/29] show help button on certain error conditions in RTP
 session. fixes #3770

---
 .../res/menu/activity_rtp_session.xml         |  11 ++++
 .../java/eu/siacs/conversations/Config.java   |   2 +
 .../conversations/ui/RtpSessionActivity.java  |  54 +++++++++++++++++-
 .../res/drawable-hdpi/ic_help_white_24dp.png  | Bin 0 -> 476 bytes
 .../res/drawable-mdpi/ic_help_white_24dp.png  | Bin 0 -> 304 bytes
 .../res/drawable-xhdpi/ic_help_white_24dp.png | Bin 0 -> 585 bytes
 .../drawable-xxhdpi/ic_help_white_24dp.png    | Bin 0 -> 842 bytes
 .../drawable-xxxhdpi/ic_help_white_24dp.png   | Bin 0 -> 1132 bytes
 src/main/res/values/attrs.xml                 |   1 +
 src/main/res/values/strings.xml               |   1 +
 src/main/res/values/themes.xml                |   2 +
 11 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/conversations/res/menu/activity_rtp_session.xml
 create mode 100644 src/main/res/drawable-hdpi/ic_help_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_help_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_help_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_help_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png

diff --git a/src/conversations/res/menu/activity_rtp_session.xml b/src/conversations/res/menu/activity_rtp_session.xml
new file mode 100644
index 000000000..540a9def9
--- /dev/null
+++ b/src/conversations/res/menu/activity_rtp_session.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_help"
+        android:icon="?attr/icon_help"
+        android:title="@string/help"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 68a158d98..f22561722 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations;
 
 import android.graphics.Bitmap;
+import android.net.Uri;
 
 import java.util.Collections;
 import java.util.List;
@@ -35,6 +36,7 @@ public final class Config {
     public static final String LOGTAG = BuildConfig.LOGTAG;
 
     public static final Jid BUG_REPORTS = Jid.of("bugs@conversations.im");
+    public static final Uri HELP = Uri.parse("https://help.conversations.im");
 
 
     public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 848c447a1..a11f5b053 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.ui;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.PictureInPictureParams;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -17,6 +18,8 @@ import android.support.annotation.RequiresApi;
 import android.support.annotation.StringRes;
 import android.util.Log;
 import android.util.Rational;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;
@@ -81,6 +84,10 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             RtpEndUserState.CONNECTIVITY_LOST_ERROR,
             RtpEndUserState.RETRACTED
     );
+    private static final List<RtpEndUserState> STATES_SHOWING_HELP_BUTTON = Arrays.asList(
+            RtpEndUserState.APPLICATION_ERROR,
+            RtpEndUserState.CONNECTIVITY_ERROR
+    );
     private static final String PROXIMITY_WAKE_LOCK_TAG = "conversations:in-rtp-session";
     private static final int REQUEST_ACCEPT_CALL = 0x1111;
     private WeakReference<JingleRtpConnection> rtpConnectionReference;
@@ -124,6 +131,45 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         setSupportActionBar(binding.toolbar);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_rtp_session, menu);
+        final MenuItem help = menu.findItem(R.id.action_help);
+        help.setVisible(isHelpButtonVisible());
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    private boolean isHelpButtonVisible() {
+        try {
+            return STATES_SHOWING_HELP_BUTTON.contains(requireRtpConnection().getEndUserState());
+        } catch (IllegalStateException e) {
+            final Intent intent = getIntent();
+            final String state = intent != null ? intent.getStringExtra(EXTRA_LAST_REPORTED_STATE) : null;
+            if (state != null) {
+                return STATES_SHOWING_HELP_BUTTON.contains(RtpEndUserState.valueOf(state));
+            } else {
+                return false;
+            }
+        }
+    }
+
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        if (item.getItemId() == R.id.action_help) {
+            launchHelpInBrowser();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void launchHelpInBrowser() {
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Config.HELP);
+        try {
+            startActivity(intent);
+        } catch (final ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_application_found_to_open_link, Toast.LENGTH_LONG).show();
+        }
+    }
+
     private void endCall(View view) {
         endCall();
     }
@@ -302,6 +348,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
                 updateButtonConfiguration(state);
                 updateStateDisplay(state);
                 updateProfilePicture(state);
+                invalidateOptionsMenu();
             }
             binding.with.setText(account.getRoster().getContact(with).getDisplayName());
         }
@@ -456,11 +503,12 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         updateStateDisplay(currentState, media);
         updateButtonConfiguration(currentState, media);
         updateProfilePicture(currentState);
+        invalidateOptionsMenu();
         return false;
     }
 
     private void initializeWithTerminatedSessionState(final Account account, final Jid with, final JingleConnectionManager.TerminatedRtpSession terminatedRtpSession) {
-        Log.d(Config.LOGTAG,"initializeWithTerminatedSessionState()");
+        Log.d(Config.LOGTAG, "initializeWithTerminatedSessionState()");
         if (terminatedRtpSession.state == RtpEndUserState.ENDED) {
             finish();
             return;
@@ -470,6 +518,8 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         updateButtonConfiguration(state);
         updateStateDisplay(state);
         updateProfilePicture(state);
+        updateCallDuration();
+        invalidateOptionsMenu();
         binding.with.setText(account.getRoster().getContact(with).getDisplayName());
     }
 
@@ -956,6 +1006,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
                 updateButtonConfiguration(state, media);
                 updateVideoViews(state);
                 updateProfilePicture(state, contact);
+                invalidateOptionsMenu();
             });
             if (END_CARD.contains(state)) {
                 final JingleRtpConnection rtpConnection = requireRtpConnection();
@@ -1004,6 +1055,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
                 updateStateDisplay(state);
                 updateButtonConfiguration(state);
                 updateProfilePicture(state);
+                invalidateOptionsMenu();
             });
             resetIntent(account, with, state, actionToMedia(currentIntent.getAction()));
         }
diff --git a/src/main/res/drawable-hdpi/ic_help_white_24dp.png b/src/main/res/drawable-hdpi/ic_help_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5664f9532e7894e749472cd81b678d7a988eba19
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004_Nkl<ZNDbw|
zv1(IM0LS4!xlOhbx~PanaPS=jJ2?m~?a(1m@f}1Fr&11aa8RM4DRdPPq~IbrdzUne
z)mIRNlH7D~C@uGb{5*n%b571l(yskJ>FS}u8eRGnR8$o7*<qEsE`kNx91}Cb(9~?$
zpkR^#Eloql9<%6@DUFOz_|Evk8(#65Gkp7GN?{M*2d?WsuJIn<uHx9h_f`R3<7;Ug
z3lzA1P?N<XPk73rENUF$8qidTHonKQSmK0#PPi|NNBFknqrox0o3i-MxkFjpz&D~U
z7i)xGVle#STqTQ)(287indX};ZWHRrMW4w|xhIPkgnDvOFv%$oWO0|@gobiakyi3h
z7I*l?xKb`E(w@uW7C(t8<)R>^pdpI`;)Zh3C*_?imPqNz#SSTLSv(_UTP{{f$uStd
zlCmrp4Mto>!JK>;E@M+6nhc1^F&J`Uj+oatTErMx7-H5HN0)I%7KU*hrI4{tD92#P
z34NrdG%|LXMTeTEp~Zknj#$@hXtKqKn1W5_brIBAp+k=$B_%_8Y_rUquAaa1Br%**
SC%+K@0000<MNUMnLSTa8BGHWi

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_help_white_24dp.png b/src/main/res/drawable-mdpi/ic_help_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db699622bce04357cc1b791536854c8c6209664a
GIT binary patch
literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002@Nkl<ZI1#<U
zPf7w|9LM1=vzP&kJVR$_+YO{Y3@M7@zLT^q81N2?UZOLIJ7rLba#@?1f=?6l<8@wV
zsFlwn9T^crW~Aigq)ZtQsUBUn_%?J@g@6%t5(4=cVdk`GaKaS}OrkQnm^o+qMUw@l
zEr*CLrX>-x<Bc1MYs{KZh9OQvV#kkHiBp`u3^S^{NHlRKGNc^(<W}MyXC*_9?~6N$
zOFnQi8FG9N5*NI)FOwm~cP{Zv*;0ln9u>$b8_O`@KYB7mZ1_t`D2EOuDo_@yjD$TZ
zu<uDe0ut&x5~vDo*7#Cl)gz?OgcTVXOUCpFb!6WuLRfKG!WJh00000<MNUMnLSTZ*
CGIP!V

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xhdpi/ic_help_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d11cf47a54830910b38a017b605a38301676b79
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006INkl<ZSPAXH
z%}P{Z0LS6~jH8kSA&Lu2+hmBlAWIj~MTC$G+ej$gfFBp2<yMga>k0-YN(a1xHiF17
zH=rnl<D}u|IRwApWdb|rJ?A}VoQ>e~NOx`lvWzlMkqR|@d}>rEGRFv6-4y*SaX^%P
zKGLT~(Zd=(E*^Qhl^zrPBB>hVN`qFukXD|YlA(i58d0J{ZnUzA%{EgE&_)|inPvx@
z5;?i>nXn5c^&c`!aY<NS@t7d&f>*NOHJ60FRWy1yCTvm>m?rFqE=6IDux-^b#0KY_
z@tr{#WY{5WRd)2_6E-D-A%64E34=2DK$yov*|3DofDAUc?wbq-u~}3YSq`vilfgOH
zoywpcn>{iLVw5yaWzde@3k5Mx8ee7b47*tcQ6#xz24t{^T|q%qNa~p9GI-1>c4Y-o
zBbgJ1WzfkEQK|~UCy6s&%HRQ8MDrAcPZIBBaGxK<@f1W2w=LDNPQ0pusNnWq25)dF
zD~KX)Ph_xxOF==*;npgHpSa8@h!LDr#~)mV6-1VOnq`-a!uUk9EXamFe462kUfGeS
z8I~1=Zfe9(9dQonR5Zqkp*rG>DIR$usg7tXav?{F2&yB>IxTXegA$Ec=bn-wN1n7+
zXi*xBb3{^yj43_3SjEHTie)<0C?2uM9#M8#pjS6VmKV%YpiC7Hk1Ayf%rHzwcW!~d
XljjaTd^%zk00000NkvXXu0mjfI|1}c

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d49181785bf9d1d1135c6b4cd89f635999741f14
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009KNkl<ZXa()T
zL2DFe0LS4!kxY_Z<0;#XNn7yPeuNs5U}HQgO<PM({Q|L?i;`0>DHci#T4?D(6E&bG
z6+H+Fs|kjXZiKcTq||kLD}*KF((X>u{CayCB=gSu&P)~$`#e%dN5>nAA}5$-fmP}>
z2nlIWXO#tJnWUihq09`+gxIuL;v8>jzcJ2zc5t=LJw~-(IL1@bSY}LlV~AU1vB;qE
z!)dn2YLhADfgXM$FP90F4Tq?Zr-vL=dX#uZ-l~+84u^O~l9$Xe!C?XdhM3@MUXi3q
zzx>fd1-lv_)1}wY#i!J<dqf~#{D|E(3W`CI8`xcvA5LR;Q3?1KyN~3KA-1r&CI>8H
zvq@R5xQR`Tf*f#=zp%M3Hyp$66GhO=4C^#$Qspc?ir_QsM&*L1*u11m2Ji5ksNWct
zK^Jvwo+ugP*v-kHm*>3hR{|Ma#BM}MxR2e03})ENmok{d?yl@8vxD7X8LYFHUu5t$
zcH5L>!wg9R88q3;KQibc$r;(OOm_dupqnI*6^|kz*{#Xo2uYgsDGn#d!?X-OC)shu
zVV3OH31o1aWET{N1+sd<pbXw)hh$e3hgGuqgCQ9lU<ns1ibI_&{$yAYT*6IFacGd<
zE8bNE-{5LPaR^E4Z;mK}Io!1rhmdr38CL{f;iIKEG)U)XMQ|2B8;V1nG(v`DFvfrQ
zsVNStq;XpY2Y7+66~$qJG`^6*Dg0eg9A-)5eHqN-@4VtLNg4$i{Eoi~#i2lmH$||8
zuO@wp#}eKY!7jckvf&)<HZ2><Y|~C51G3{D?Q};;7^R&)P%@Tjmx^34MtkgXRBl+r
zgCg)TFINn*i8Dpuu0cuen8KMNaCcIE_yI?Xz}5HiMZiOxC;~SR=$1eFsp3EpxLBj8
zbSP0JZ)*%FJ^Fb>o*qzCHUwNIFW=FvJTS#3Sv5GR{7~iw>FqL4NqJ+GC!|qfMEivi
z?y`-mkUJdJext-09@E06Nrh<!)IRiaoC{oKg&G^QXt6<!6|Qie59w7$N5>oLf4U_M
U1!|y=uK)l507*qoM6N<$f*NFcH2?qr

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eb7241da221d5ae26d010433b34e5a5e5ed5908
GIT binary patch
literal 1132
zcmV-y1e5!TP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000CtNkl<ZcmeIf
z-)oh10LSr<M_uQ~6w2+WU5GQWL{hvM)J@RODF+cmyckRx4!SeZxh8edAJA2lE;p45
zmBec==C3l6MiN~#_M^ku#&S5OIXBPTVDsJe^Qe2i-{<*0XXoO)UQ$IxMMXu0Gpr*=
zJLkAbKNHNdzyh;O(9aFd(oT-GDo0eapDqfR$kWL_GAa)w$Z?q&Y!$i0ZW3BbtfrL_
zq8R2VtF#oz@C6TX;Q=Q|tF&n1E-sDIs8V4Q*NH<n8x=pAnI<leXi}U=@dI(|BB^+=
zjysgX?_}j3TNt5K3cMz_*v36dX^gFMhb`R0#uOK5p`JBVQAG{)v~ZCrY>cs4Zm^ya
z%ni^?O3y)>L;Qoe0$D{ziaVH^;TS8l2v%~OCz$FXsi^oKQ-f@i0k)IJ)EPxXGp7Ee
zR))y(7p4v>JT@_nnL%o0fh>8<Oi`z>xQ>}3+hmFDJi$!2!l4OM#}oo>m}-<gGTg<?
z04wwicGAHhbIdWoDR$@?tR#<_QPQ%-=a_1i4=K9vdP)aL`Ot!?HrZh{|6%44DS43M
z7SHoDNqLZA8Z-B)mJM1lbwNIK@gk?>!%vtxB6BQf1XC^YU?(s3lpXTm6HE<}kSTJQ
ztCt5IEaqEz@D}D8WQxm}TO$t!Sxlci$YSoI%uvk?=Bnhu9E+Ki2QOjnF=?4#Kk=E9
z2P?3#S0?BpK7I0FJvKUIf&%gRMjpJ2jR6H?9r0P<O?mJoc4`%b9P#;DKKzZHT?#@w
zak)m7Joo@x#}$Ng#N#Gud63`_Y;`IKH;Kb9WaL8|_O2-i{kZol)$$?7Job7Ogb7^x
zjaBmDJ!S}FTtS${tsYj(hj%CvPEkQvz@<K3mJe?;O<3~^!UFC*=5_f{&m`f^D+sf=
z^QnB;!9$`bDhLy}(#LXn@G4_OGp-=?<I2bKAi*u7>QxYK;Kn3Ld2op6t||y;apOmM
zkYI@DPAdrQxX~;R-p7Sj1tEtUJLSPwxX_>=ti_F2<iQPGs8ulXxUgIv3=`deOwfq~
z@}Wp{CuM?tI3ORM65Sq|AVZOIG)+ooxI{TRFH`KM9DO8HBp9aL6j&y69HrbGmJL?%
zfO0ZHMs_$sIcb$G(u`6rMo7sXjYJ?HqBx*%=q5Dz5Z)Dq#YP?xl6(kjk_`%vCPI=A
zVKpim&Jc=x2<JORMUoyukPl(prb^L~rGPd0U@uRN++Z_fSdtI6?ouar*vc5C^e=D7
zEjBYmspP4Xd#t60Qn*cx;z5$L#I1uW#fgJV5tm6C6+i0eCJtBFpi-fcQCu44fJ%!r
zpK%`-CTJz4r9d@D7$S-ShskIuk)VN#JjT{E=lPIjDi5UDO9z9P=;tJRNU0o=Wf#Zk
y<Qlz<Q)Hfbij33CRZi1N1GTECsHmu@aOQvIo_o~hccd=>0000<MNUMnLSTYkTK@<D

literal 0
HcmV?d00001

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 48a4733b9..1f78fb09b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -96,6 +96,7 @@
     <attr name="icon_refresh" format="reference" />
     <attr name="icon_remove" format="reference" />
     <attr name="icon_search" format="reference" />
+    <attr name="icon_help" format="reference" />
     <attr name="icon_secure" format="reference" />
     <attr name="icon_settings" format="reference" />
     <attr name="icon_share" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a6d951b56..75d839f0b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -917,6 +917,7 @@
     <string name="missed_call">Missed call</string>
     <string name="audio_call">Audio call</string>
     <string name="video_call">Video call</string>
+    <string name="help">Help</string>
     <string name="microphone_unavailable">Your microphone is unavailable</string>
     <string name="only_one_call_at_a_time">You can only have one call at a time.</string>
     <string name="return_to_ongoing_call">Return to ongoing call</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 3a19be555..50262913f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -114,6 +114,7 @@
         </item>
         <item name="icon_remove" type="reference">@drawable/ic_delete_black_24dp</item>
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
+        <item name="icon_help" type="reference">@drawable/ic_help_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
         <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
@@ -267,6 +268,7 @@
         </item>
         <item name="icon_remove" type="reference">@drawable/ic_delete_white_24dp</item>
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
+        <item name="icon_help" type="reference">@drawable/ic_help_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item>
         <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>

From 0ba4892d3e4efd71bba98d00e424f75db2f0536e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 09:08:09 +0200
Subject: [PATCH 10/29] RTP: write log message on background thread

---
 .../siacs/conversations/services/XmppConnectionService.java   | 4 ++++
 .../siacs/conversations/xmpp/jingle/JingleRtpConnection.java  | 2 +-
 src/{conversations => main}/res/menu/activity_rtp_session.xml | 0
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename src/{conversations => main}/res/menu/activity_rtp_session.xml (100%)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ebac40f99..a6cc30e98 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3303,6 +3303,10 @@ public class XmppConnectionService extends Service {
         updateConversationUi();
     }
 
+    public void createMessageAsync(final Message message) {
+        mDatabaseWriterExecutor.execute(()-> databaseBackend.createMessage(message));
+    }
+
     public void updateMessage(Message message, String uuid) {
         if (!databaseBackend.updateMessage(message, uuid)) {
             Log.e(Config.LOGTAG, "error updated message in DB after edit");
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 4dadb599d..e45b79997 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -1219,7 +1219,7 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
         final Conversational conversational = message.getConversation();
         if (conversational instanceof Conversation) {
             ((Conversation) conversational).add(this.message);
-            xmppConnectionService.databaseBackend.createMessage(message);
+            xmppConnectionService.createMessageAsync(message);
             xmppConnectionService.updateConversationUi();
         } else {
             throw new IllegalStateException("Somehow the conversation in a message was a stub");
diff --git a/src/conversations/res/menu/activity_rtp_session.xml b/src/main/res/menu/activity_rtp_session.xml
similarity index 100%
rename from src/conversations/res/menu/activity_rtp_session.xml
rename to src/main/res/menu/activity_rtp_session.xml

From 01bfb5fd56f7f0ec57dd750b290e6b324d2a9581 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 09:19:56 +0200
Subject: [PATCH 11/29] pulled translations from transifex

---
 src/main/res/values-de/strings.xml |  2 +-
 src/main/res/values-ru/strings.xml | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 4529e14de..f35175a36 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -901,7 +901,7 @@
   <string name="rtp_state_ringing">Klingelt</string>
   <string name="rtp_state_declined_or_busy">Besetzt</string>
   <string name="rtp_state_connectivity_error">Verbindungsaufbau fehlgeschlagen</string>
-  <string name="rtp_state_retracted">Rückrufruf</string>
+  <string name="rtp_state_retracted">Anruf zurückgenommen</string>
   <string name="rtp_state_application_failure">App-Fehler</string>
   <string name="hang_up">Auflegen</string>
   <string name="ongoing_call">Laufender Anruf</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 111a65c43..a5e07707e 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -30,6 +30,7 @@
   <string name="just_now">только что</string>
   <string name="minute_ago">1 минуту назад</string>
   <string name="minutes_ago">%d мин. назад</string>
+  <string name="x_unread_conversations">%d непрочитанных бесед</string>
   <string name="sending">отправка…</string>
   <string name="message_decrypting">Расшифровка сообщения. Подождите…</string>
   <string name="pgp_message">OpenPGP зашифр. сообщение</string>
@@ -40,12 +41,14 @@
   <string name="moderator">Модератор</string>
   <string name="participant">Участник</string>
   <string name="visitor">Посетитель</string>
+  <string name="remove_contact_text">Вы хотите удалить %s из своего списка контактов? Беседы, связанные с этим контактом, будут сохранены.</string>
   <string name="block_contact_text">Вы хотите заблокировать дальнейшие сообщения от %s?</string>
   <string name="unblock_contact_text">Вы хотите разблокировать пользователя %s?</string>
   <string name="block_domain_text">Заблокировать всех пользователей домена %s?</string>
   <string name="unblock_domain_text">Разблокировать всех пользователей домена %s?</string>
   <string name="contact_blocked">Контакт заблокирован</string>
   <string name="blocked">Заблокирован</string>
+  <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой, будут сохранены.</string>
   <string name="register_account">Создать новый аккаунт на сервере</string>
   <string name="change_password_on_server">Изменить пароль на сервере</string>
   <string name="share_with">Поделиться с</string>
@@ -64,14 +67,22 @@
   <string name="save">Сохранить</string>
   <string name="ok">ОК</string>
   <string name="crash_report_title">Conversations был неожиданно остановлен</string>
+  <string name="crash_report_message">Отправляя отчёты об ошибках, вы помогаете совершенствованию Conversations.</string>
   <string name="send_now">Отправить сейчас</string>
   <string name="send_never">Больше не спрашивать</string>
+  <string name="problem_connecting_to_account">Не удалось подключиться к учетной записи</string>
+  <string name="problem_connecting_to_accounts">Не удалось подключиться к учетным записям</string>
+  <string name="touch_to_fix">Нажмите, чтобы настроить учетные записи</string>
   <string name="attach_file">Прикрепить файл</string>
+  <string name="not_in_roster">Контакт не находится в вашем списке контактов. Хотите добавить его?</string>
   <string name="add_contact">Добавить контакт</string>
   <string name="send_failed">доставка не удалась</string>
+  <string name="preparing_image">Подготовка к передаче изображения</string>
+  <string name="preparing_images">Подготовка к передаче изображений</string>
   <string name="sharing_files_please_wait">Обмен файлами. Пожалуйста, подождите…</string>
   <string name="action_clear_history">Очистить историю</string>
   <string name="clear_conversation_history">Очистить историю</string>
+  <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Внимание:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах или серверах.</string>
   <string name="delete_file_dialog">Удалить файл</string>
   <string name="delete_file_dialog_msg">Вы уверены, что хотите удалить этот файл?\n\n<b>Предупреждение:</b> Данная операция не удалит копии этого файла, хранящиеся на других устройствах или серверах.</string>
   <string name="also_end_conversation">Закрыть эту беседу</string>
@@ -82,16 +93,20 @@
   <string name="send_omemo_message">OMEMO зашифр. сообщение</string>
   <string name="send_omemo_x509_message">v\\OMEMO зашифр. сообщение</string>
   <string name="send_pgp_message">OpenPGP зашифр. сообщение</string>
+  <string name="your_nick_has_been_changed">Имя уже используется</string>
   <string name="send_unencrypted">Отправить в незашифрованном виде</string>
   <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
   <string name="openkeychain_required">Установите OpenKeychain</string>
+  <string name="openkeychain_required_long">Conversations использует <b>OpenKeychain</b> для шифрования и дешифрования сообщений и управления открытыми ключами.\n\nOpenKeychain распространяется под лицензией GPLv3 и доступна для загрузки через F-Droid или Google Play.\n\n<small>(Потребуется перезапуск Conversations после установки.)</small></string>
   <string name="restart">Перезапуск</string>
   <string name="install">Установка</string>
   <string name="openkeychain_not_installed">Пожалуйста, установите OpenKeychain</string>
   <string name="offering">предложение…</string>
   <string name="waiting">ожидание…</string>
   <string name="no_pgp_key">Нет OpenPGP ключа</string>
+  <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что ваш собеседник не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите вашего собеседника настроить OpenPGP.</small></string>
   <string name="no_pgp_keys">Нет OpenPGP ключей</string>
+  <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщение, потому что ваши собеседники не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите ваших собеседников настроить OpenPGP.</small></string>
   <string name="pref_general">Общие</string>
   <string name="pref_accept_files">Принимать файлы</string>
   <string name="pref_accept_files_summary">Автоматический приём файлов…</string>
@@ -101,6 +116,10 @@
   <string name="pref_vibrate_summary">Вибрировать, когда приходят новые сообщения</string>
   <string name="pref_led">Светодиодное уведомление</string>
   <string name="pref_led_summary">Мерцание индикатора при получении нового сообщения</string>
+  <string name="pref_ringtone">Мелодия звонка</string>
+  <string name="pref_notification_sound">Звук уведомления</string>
+  <string name="pref_notification_sound_summary">Звук уведомления о новых сообщениях</string>
+  <string name="pref_call_ringtone_summary">Мелодия входящего звонка</string>
   <string name="pref_notification_grace_period">Грейс-период</string>
   <string name="pref_advanced_options">Дополнительно</string>
   <string name="pref_never_send_crash">Не отправлять отчёты об ошибках</string>
@@ -258,8 +277,6 @@
   <string name="hosted_on">размещено на %s</string>
   <string name="checking_x">Проверка %s на сервере HTTP</string>
   <string name="not_connected_try_again">Вы неподключены. Попробуйте позже</string>
-  <string name="check_x_filesize">Проверить размер %s</string>
-  <string name="check_x_filesize_on_host">Проверить размер %1$s на %2$s</string>
   <string name="message_options">Опции сообщения</string>
   <string name="quote">Цитировать</string>
   <string name="paste_as_quote">Вставить как цитату</string>
@@ -676,7 +693,7 @@
   <string name="pref_omemo_setting_summary_default_off">OMEMO нужно будет явно включать для новых бесед.</string>
   <string name="create_shortcut">Создать ярлык</string>
   <string name="pref_font_size">Размер шрифта</string>
-  <string name="pref_font_size_summary">Относительный размер шрифта используемый в приложении.</string>
+  <string name="pref_font_size_summary">Относительный размер шрифта, используемый в приложении.</string>
   <string name="default_on">Включено по умолчанию</string>
   <string name="default_off">Выключено по умолчанию</string>
   <string name="small">Маленький</string>
@@ -737,7 +754,7 @@
   <string name="media_browser">Просмотр медиафайлов</string>
   <string name="security_violation_not_attaching_file">Файл не прикреплен из соображений безопасности.</string>
   <string name="pref_video_compression">Качество видео</string>
-  <string name="pref_video_compression_summary">Низкое качество означает меньшие файлы</string>
+  <string name="pref_video_compression_summary">Чем ниже качество, тем меньше объем файлов</string>
   <string name="video_360p">Среднее (360p)</string>
   <string name="video_720p">Высокое (720р)</string>
   <string name="cancelled">отменено</string>

From 8059aa7b0dfa29aa2c8971ecd7216c63adcfdbef Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 09:40:00 +0200
Subject: [PATCH 12/29] version bump to 2.8.7-beta + changelog

---
 CHANGELOG.md | 5 +++++
 build.gradle | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a363926b2..278897e61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.8.7
+
+* Show help button if A/V call fails
+* Fixed some annoying crashes
+
 ### Version 2.8.6
 
 * Offer to record voice message when callee is busy
diff --git a/build.gradle b/build.gradle
index 0a54ad489..ce5bbd157 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 390
-        versionName "2.8.6"
+        versionCode 391
+        versionName "2.8.7-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId

From 971bb60f4288d160fd9560bdf128c4ff9b431ca0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 12 Jun 2020 20:06:49 +0200
Subject: [PATCH 13/29] add more logging to caps fetching

---
 .../services/XmppConnectionService.java       | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index a6cc30e98..484ed3c0a 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2778,6 +2778,7 @@ public class XmppConnectionService extends Service {
             updateConversationUi();
         }
     }
+
     private void fetchConferenceMembers(final Conversation conversation) {
         final Account account = conversation.getAccount();
         final AxolotlService axolotlService = account.getAxolotlService();
@@ -3304,7 +3305,7 @@ public class XmppConnectionService extends Service {
     }
 
     public void createMessageAsync(final Message message) {
-        mDatabaseWriterExecutor.execute(()-> databaseBackend.createMessage(message));
+        mDatabaseWriterExecutor.execute(() -> databaseBackend.createMessage(message));
     }
 
     public void updateMessage(Message message, String uuid) {
@@ -4444,34 +4445,38 @@ public class XmppConnectionService extends Service {
 
     public void fetchCaps(Account account, final Jid jid, final Presence presence) {
         final Pair<String, String> key = new Pair<>(presence.getHash(), presence.getVer());
-        ServiceDiscoveryResult disco = getCachedServiceDiscoveryResult(key);
+        final ServiceDiscoveryResult disco = getCachedServiceDiscoveryResult(key);
         if (disco != null) {
             presence.setServiceDiscoveryResult(disco);
         } else {
-            if (!account.inProgressDiscoFetches.contains(key)) {
-                account.inProgressDiscoFetches.add(key);
-                IqPacket request = new IqPacket(IqPacket.TYPE.GET);
-                request.setTo(jid);
-                final String node = presence.getNode();
-                final String ver = presence.getVer();
-                final Element query = request.query(Namespace.DISCO_INFO);
-                if (node != null && ver != null) {
-                    query.setAttribute("node", node + "#" + ver);
-                }
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": making disco request for " + key.second + " to " + jid);
-                sendIqPacket(account, request, (a, response) -> {
-                    if (response.getType() == IqPacket.TYPE.RESULT) {
-                        ServiceDiscoveryResult discoveryResult = new ServiceDiscoveryResult(response);
-                        if (presence.getVer().equals(discoveryResult.getVer())) {
-                            databaseBackend.insertDiscoveryResult(discoveryResult);
-                            injectServiceDiscoveryResult(a.getRoster(), presence.getHash(), presence.getVer(), discoveryResult);
-                        } else {
-                            Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": mismatch in caps for contact " + jid + " " + presence.getVer() + " vs " + discoveryResult.getVer());
-                        }
-                    }
-                    a.inProgressDiscoFetches.remove(key);
-                });
+            if (account.inProgressDiscoFetches.contains(key)) {
+                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": skipping duplicate disco request for " + key.second + " to " + jid);
+                return;
             }
+            account.inProgressDiscoFetches.add(key);
+            final IqPacket request = new IqPacket(IqPacket.TYPE.GET);
+            request.setTo(jid);
+            final String node = presence.getNode();
+            final String ver = presence.getVer();
+            final Element query = request.query(Namespace.DISCO_INFO);
+            if (node != null && ver != null) {
+                query.setAttribute("node", node + "#" + ver);
+            }
+            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": making disco request for " + key.second + " to " + jid);
+            sendIqPacket(account, request, (a, response) -> {
+                if (response.getType() == IqPacket.TYPE.RESULT) {
+                    ServiceDiscoveryResult discoveryResult = new ServiceDiscoveryResult(response);
+                    if (presence.getVer().equals(discoveryResult.getVer())) {
+                        databaseBackend.insertDiscoveryResult(discoveryResult);
+                        injectServiceDiscoveryResult(a.getRoster(), presence.getHash(), presence.getVer(), discoveryResult);
+                    } else {
+                        Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": mismatch in caps for contact " + jid + " " + presence.getVer() + " vs " + discoveryResult.getVer());
+                    }
+                } else {
+                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to fetch caps from " + jid);
+                }
+                a.inProgressDiscoFetches.remove(key);
+            });
         }
     }
 

From 56ea9647cd3b781a828748da5d493319f2c9cd34 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 13 Jun 2020 08:10:04 +0200
Subject: [PATCH 14/29] null check quicksy domain

---
 src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 1e88f8d82..85d879578 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1006,7 +1006,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 && !contact.isOwnServer()
                 && !contact.showInContactList()
                 && !contact.isSelf()
-                && !Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString())
+                && !(Config.QUICKSY_DOMAIN != null && Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString()))
                 && sentMessagesCount() == 0;
     }
 

From 0dba9f560cdeb4248a287ccd5d7f6c2fcd9377bc Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 13 Jun 2020 08:26:32 +0200
Subject: [PATCH 15/29] rework quicksy domain checks

---
 src/main/java/eu/siacs/conversations/Config.java             | 2 +-
 src/main/java/eu/siacs/conversations/entities/Contact.java   | 2 +-
 .../java/eu/siacs/conversations/entities/Conversation.java   | 2 +-
 .../siacs/conversations/services/XmppConnectionService.java  | 2 +-
 .../eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java | 2 +-
 src/main/java/eu/siacs/conversations/utils/JidHelper.java    | 5 +++++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index f22561722..86d771740 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -41,7 +41,7 @@ public final class Config {
 
     public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
     public static final String MAGIC_CREATE_DOMAIN = "conversations.im";
-    public static final String QUICKSY_DOMAIN = "quicksy.im";
+    public static final Jid QUICKSY_DOMAIN = Jid.of("quicksy.im");
 
     public static final String CHANNEL_DISCOVERY = "https://search.jabber.network";
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index d37646f78..7789a6686 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -134,7 +134,7 @@ public class Contact implements ListItem, Blockable {
 			return this.systemName;
 		} else if (!TextUtils.isEmpty(this.serverName)) {
 			return this.serverName;
-		} else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && Config.QUICKSY_DOMAIN.equals(jid.getDomain().toEscapedString())) ||mutualPresenceSubscription())) {
+		} else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && JidHelper.isQuicksyDomain(jid.getDomain())) ||mutualPresenceSubscription())) {
 			return this.presenceName;
 		} else if (jid.getLocal() != null) {
 			return JidHelper.localPartOrFallback(jid);
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 85d879578..83e49b9a5 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1006,7 +1006,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 && !contact.isOwnServer()
                 && !contact.showInContactList()
                 && !contact.isSelf()
-                && !(Config.QUICKSY_DOMAIN != null && Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString()))
+                && !JidHelper.isQuicksyDomain(contact.getJid())
                 && sentMessagesCount() == 0;
     }
 
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 484ed3c0a..48030e7f3 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -4146,7 +4146,7 @@ public class XmppConnectionService extends Service {
             }
         }
         if (Config.QUICKSY_DOMAIN != null) {
-            hosts.remove(Config.QUICKSY_DOMAIN); //we only want to show this when we type a e164 number
+            hosts.remove(Config.QUICKSY_DOMAIN.toEscapedString()); //we only want to show this when we type a e164 number
         }
         if (Config.DOMAIN_LOCK != null) {
             hosts.add(Config.DOMAIN_LOCK);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
index 61177d0dc..f6017cf4d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
@@ -27,7 +27,7 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
             if (split.length == 1) {
                 final String local = split[0].toLowerCase(Locale.ENGLISH);
                 if (Config.QUICKSY_DOMAIN != null && E164_PATTERN.matcher(local).matches()) {
-                    suggestions.add(local + '@' + Config.QUICKSY_DOMAIN);
+                    suggestions.add(local + '@' + Config.QUICKSY_DOMAIN.toEscapedString());
                 } else {
                     for (String domain : domains) {
                         suggestions.add(local + '@' + domain);
diff --git a/src/main/java/eu/siacs/conversations/utils/JidHelper.java b/src/main/java/eu/siacs/conversations/utils/JidHelper.java
index 603899fca..c53af65ed 100644
--- a/src/main/java/eu/siacs/conversations/utils/JidHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/JidHelper.java
@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xmpp.InvalidJid;
 import eu.siacs.conversations.xmpp.Jid;
 
@@ -59,4 +60,8 @@ public class JidHelper {
         }
     }
 
+    public static boolean isQuicksyDomain(final Jid jid) {
+        return Config.QUICKSY_DOMAIN != null && Config.QUICKSY_DOMAIN.equals(jid.getDomain());
+    }
+
 }

From fda9e7b51cf243658ff4fbff35ea56a630b757dc Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 13 Jun 2020 09:59:39 +0200
Subject: [PATCH 16/29] make presence selector work with empty resources (bare
 jid)

---
 .../siacs/conversations/ui/XmppActivity.java  | 1788 ++++++++---------
 .../ui/util/PresenceSelector.java             |   11 +-
 2 files changed, 902 insertions(+), 897 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 93196a8b0..fcdccb9c4 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -83,931 +83,927 @@ import eu.siacs.conversations.xmpp.Jid;
 
 public abstract class XmppActivity extends ActionBarActivity {
 
-	public static final String EXTRA_ACCOUNT = "account";
-	protected static final int REQUEST_ANNOUNCE_PGP = 0x0101;
-	protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
-	protected static final int REQUEST_CHOOSE_PGP_ID = 0x0103;
-	protected static final int REQUEST_BATTERY_OP = 0x49ff;
-	public XmppConnectionService xmppConnectionService;
-	public boolean xmppConnectionServiceBound = false;
-
-	protected static final String FRAGMENT_TAG_DIALOG = "dialog";
-
-	private boolean isCameraFeatureAvailable = false;
-
-	protected int mTheme;
-	protected boolean mUsingEnterKey = false;
-	protected boolean mUseTor = false;
-	protected Toast mToast;
-	public Runnable onOpenPGPKeyPublished = () -> Toast.makeText(XmppActivity.this, R.string.openpgp_has_been_published, Toast.LENGTH_SHORT).show();
-	protected ConferenceInvite mPendingConferenceInvite = null;
-	protected ServiceConnection mConnection = new ServiceConnection() {
-
-		@Override
-		public void onServiceConnected(ComponentName className, IBinder service) {
-			XmppConnectionBinder binder = (XmppConnectionBinder) service;
-			xmppConnectionService = binder.getService();
-			xmppConnectionServiceBound = true;
-			registerListeners();
-			onBackendConnected();
-		}
-
-		@Override
-		public void onServiceDisconnected(ComponentName arg0) {
-			xmppConnectionServiceBound = false;
-		}
-	};
-	private DisplayMetrics metrics;
-	private long mLastUiRefresh = 0;
-	private Handler mRefreshUiHandler = new Handler();
-	private Runnable mRefreshUiRunnable = () -> {
-		mLastUiRefresh = SystemClock.elapsedRealtime();
-		refreshUiReal();
-	};
-	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
-		@Override
-		public void success(final Conversation conversation) {
-			runOnUiThread(() -> {
-				switchToConversation(conversation);
-				hideToast();
-			});
-		}
-
-		@Override
-		public void error(final int errorCode, Conversation object) {
-			runOnUiThread(() -> replaceToast(getString(errorCode)));
-		}
-
-		@Override
-		public void userInputRequired(PendingIntent pi, Conversation object) {
-
-		}
-	};
-	public boolean mSkipBackgroundBinding = false;
-
-	public static boolean cancelPotentialWork(Message message, ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final Message oldMessage = bitmapWorkerTask.message;
-			if (oldMessage == null || message != oldMessage) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	protected void hideToast() {
-		if (mToast != null) {
-			mToast.cancel();
-		}
-	}
-
-	protected void replaceToast(String msg) {
-		replaceToast(msg, true);
-	}
-
-	protected void replaceToast(String msg, boolean showlong) {
-		hideToast();
-		mToast = Toast.makeText(this, msg, showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
-		mToast.show();
-	}
-
-	protected final void refreshUi() {
-		final long diff = SystemClock.elapsedRealtime() - mLastUiRefresh;
-		if (diff > Config.REFRESH_UI_INTERVAL) {
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			runOnUiThread(mRefreshUiRunnable);
-		} else {
-			final long next = Config.REFRESH_UI_INTERVAL - diff;
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			mRefreshUiHandler.postDelayed(mRefreshUiRunnable, next);
-		}
-	}
-
-	abstract protected void refreshUiReal();
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		if (!xmppConnectionServiceBound) {
-			if (this.mSkipBackgroundBinding) {
-				Log.d(Config.LOGTAG,"skipping background binding");
-			} else {
-				connectToBackend();
-			}
-		} else {
-			this.registerListeners();
-			this.onBackendConnected();
-		}
-		this.mUsingEnterKey = usingEnterKey();
-		this.mUseTor = useTor();
-	}
-
-	public void connectToBackend() {
-		Intent intent = new Intent(this, XmppConnectionService.class);
-		intent.setAction("ui");
-		try {
-			startService(intent);
-		} catch (IllegalStateException e) {
-			Log.w(Config.LOGTAG,"unable to start service from "+getClass().getSimpleName());
-		}
-		bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-		if (xmppConnectionServiceBound) {
-			this.unregisterListeners();
-			unbindService(mConnection);
-			xmppConnectionServiceBound = false;
-		}
-	}
-
-
-	public boolean hasPgp() {
-		return xmppConnectionService.getPgpEngine() != null;
-	}
-
-	public void showInstallPgpDialog() {
-		Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(getString(R.string.openkeychain_required));
-		builder.setIconAttribute(android.R.attr.alertDialogIcon);
-		builder.setMessage(getText(R.string.openkeychain_required_long));
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setNeutralButton(getString(R.string.restart),
-				(dialog, which) -> {
-					if (xmppConnectionServiceBound) {
-						unbindService(mConnection);
-						xmppConnectionServiceBound = false;
-					}
-					stopService(new Intent(XmppActivity.this,
-							XmppConnectionService.class));
-					finish();
-				});
-		builder.setPositiveButton(getString(R.string.install),
-				(dialog, which) -> {
-					Uri uri = Uri
-							.parse("market://details?id=org.sufficientlysecure.keychain");
-					Intent marketIntent = new Intent(Intent.ACTION_VIEW,
-							uri);
-					PackageManager manager = getApplicationContext()
-							.getPackageManager();
-					List<ResolveInfo> infos = manager
-							.queryIntentActivities(marketIntent, 0);
-					if (infos.size() > 0) {
-						startActivity(marketIntent);
-					} else {
-						uri = Uri.parse("http://www.openkeychain.org/");
-						Intent browserIntent = new Intent(
-								Intent.ACTION_VIEW, uri);
-						startActivity(browserIntent);
-					}
-					finish();
-				});
-		builder.create().show();
-	}
-
-	abstract void onBackendConnected();
-
-	protected void registerListeners() {
-		if (this instanceof XmppConnectionService.OnConversationUpdate) {
-			this.xmppConnectionService.setOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnAccountUpdate) {
-			this.xmppConnectionService.setOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnCaptchaRequested) {
-			this.xmppConnectionService.setOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
-		}
-		if (this instanceof XmppConnectionService.OnRosterUpdate) {
-			this.xmppConnectionService.setOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-			this.xmppConnectionService.setOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
-		}
-		if (this instanceof OnUpdateBlocklist) {
-			this.xmppConnectionService.setOnUpdateBlocklistListener((OnUpdateBlocklist) this);
-		}
-		if (this instanceof XmppConnectionService.OnShowErrorToast) {
-			this.xmppConnectionService.setOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
-		}
-		if (this instanceof OnKeyStatusUpdated) {
-			this.xmppConnectionService.setOnKeyStatusUpdatedListener((OnKeyStatusUpdated) this);
-		}
-		if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
-			this.xmppConnectionService.setOnRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
-		}
-	}
-
-	protected void unregisterListeners() {
-		if (this instanceof XmppConnectionService.OnConversationUpdate) {
-			this.xmppConnectionService.removeOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnAccountUpdate) {
-			this.xmppConnectionService.removeOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnCaptchaRequested) {
-			this.xmppConnectionService.removeOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
-		}
-		if (this instanceof XmppConnectionService.OnRosterUpdate) {
-			this.xmppConnectionService.removeOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-			this.xmppConnectionService.removeOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
-		}
-		if (this instanceof OnUpdateBlocklist) {
-			this.xmppConnectionService.removeOnUpdateBlocklistListener((OnUpdateBlocklist) this);
-		}
-		if (this instanceof XmppConnectionService.OnShowErrorToast) {
-			this.xmppConnectionService.removeOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
-		}
-		if (this instanceof OnKeyStatusUpdated) {
-			this.xmppConnectionService.removeOnNewKeysAvailableListener((OnKeyStatusUpdated) this);
-		}
-		if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
-			this.xmppConnectionService.removeRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_settings:
-				startActivity(new Intent(this, SettingsActivity.class));
-				break;
-			case R.id.action_accounts:
-				AccountUtils.launchManageAccounts(this);
-				break;
-			case R.id.action_account:
-				AccountUtils.launchManageAccount(this);
-				break;
-			case android.R.id.home:
-				finish();
-				break;
-			case R.id.action_show_qr_code:
-				showQrCode();
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	public void selectPresence(final Conversation conversation, final PresenceSelector.OnPresenceSelected listener) {
-		final Contact contact = conversation.getContact();
-		if (!contact.showInRoster()) {
-			showAddToRosterDialog(conversation.getContact());
-		} else {
-			final Presences presences = contact.getPresences();
-			if (presences.size() == 0) {
-				if (!contact.getOption(Contact.Options.TO)
-						&& !contact.getOption(Contact.Options.ASKING)
-						&& contact.getAccount().getStatus() == Account.State.ONLINE) {
-					showAskForPresenceDialog(contact);
-				} else if (!contact.getOption(Contact.Options.TO)
-						|| !contact.getOption(Contact.Options.FROM)) {
-					PresenceSelector.warnMutualPresenceSubscription(this, conversation, listener);
-				} else {
-					conversation.setNextCounterpart(null);
-					listener.onPresenceSelected();
-				}
-			} else if (presences.size() == 1) {
-				String presence = presences.toResourceArray()[0];
-				try {
-					conversation.setNextCounterpart(Jid.of(contact.getJid().getLocal(), contact.getJid().getDomain(), presence));
-				} catch (IllegalArgumentException e) {
-					conversation.setNextCounterpart(null);
-				}
-				listener.onPresenceSelected();
-			} else {
-				PresenceSelector.showPresenceSelectionDialog(this, conversation, listener);
-			}
-		}
-	}
-
-	@SuppressLint("UnsupportedChromeOsCameraSystemFeature")
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		metrics = getResources().getDisplayMetrics();
-		ExceptionHelper.init(getApplicationContext());
-		new EmojiService(this).init();
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-			this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
-		} else {
-			this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
-		}
-		this.mTheme = findTheme();
-		setTheme(this.mTheme);
-	}
-
-	protected boolean isCameraFeatureAvailable() {
-		return this.isCameraFeatureAvailable;
-	}
-
-	public boolean isDarkTheme() {
-		return ThemeHelper.isDark(mTheme);
-	}
-
-	public int getThemeResource(int r_attr_name, int r_drawable_def) {
-		int[] attrs = {r_attr_name};
-		TypedArray ta = this.getTheme().obtainStyledAttributes(attrs);
-
-		int res = ta.getResourceId(0, r_drawable_def);
-		ta.recycle();
-
-		return res;
-	}
-
-	protected boolean isOptimizingBattery() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			final PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
-			return pm != null
-					&& !pm.isIgnoringBatteryOptimizations(getPackageName());
-		} else {
-			return false;
-		}
-	}
-
-	protected boolean isAffectedByDataSaver() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-			return cm != null
-					&& cm.isActiveNetworkMetered()
-					&& cm.getRestrictBackgroundStatus() == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
-		} else {
-			return false;
-		}
-	}
-
-	private boolean usingEnterKey() {
-		return getBooleanPreference("display_enter_key", R.bool.display_enter_key);
-	}
-
-	private boolean useTor() {
-		return QuickConversationsService.isConversations() && getBooleanPreference("use_tor", R.bool.use_tor);
-	}
-
-	protected SharedPreferences getPreferences() {
-		return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-	}
-
-	protected boolean getBooleanPreference(String name, @BoolRes int res) {
-		return getPreferences().getBoolean(name, getResources().getBoolean(res));
-	}
-
-	public void switchToConversation(Conversation conversation) {
-		switchToConversation(conversation, null);
-	}
-
-	public void switchToConversationAndQuote(Conversation conversation, String text) {
-		switchToConversation(conversation, text, true, null, false, false);
-	}
-
-	public void switchToConversation(Conversation conversation, String text) {
-		switchToConversation(conversation, text, false, null, false, false);
-	}
-
-	public void switchToConversationDoNotAppend(Conversation conversation, String text) {
-		switchToConversation(conversation, text, false, null, false, true);
-	}
-
-	public void highlightInMuc(Conversation conversation, String nick) {
-		switchToConversation(conversation, null, false, nick, false, false);
-	}
-
-	public void privateMsgInMuc(Conversation conversation, String nick) {
-		switchToConversation(conversation, null, false, nick, true, false);
-	}
-
-	private void switchToConversation(Conversation conversation, String text, boolean asQuote, String nick, boolean pm, boolean doNotAppend) {
-		Intent intent = new Intent(this, ConversationsActivity.class);
-		intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION);
-		intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
-		if (text != null) {
-			intent.putExtra(Intent.EXTRA_TEXT, text);
-			if (asQuote) {
-				intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, true);
-			}
-		}
-		if (nick != null) {
-			intent.putExtra(ConversationsActivity.EXTRA_NICK, nick);
-			intent.putExtra(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
-		}
-		if (doNotAppend) {
-			intent.putExtra(ConversationsActivity.EXTRA_DO_NOT_APPEND, true);
-		}
-		intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-		startActivity(intent);
-		finish();
-	}
-
-	public void switchToContactDetails(Contact contact) {
-		switchToContactDetails(contact, null);
-	}
-
-	public void switchToContactDetails(Contact contact, String messageFingerprint) {
-		Intent intent = new Intent(this, ContactDetailsActivity.class);
-		intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
-		intent.putExtra(EXTRA_ACCOUNT, contact.getAccount().getJid().asBareJid().toEscapedString());
-		intent.putExtra("contact", contact.getJid().toEscapedString());
-		intent.putExtra("fingerprint", messageFingerprint);
-		startActivity(intent);
-	}
-
-	public void switchToAccount(Account account, String fingerprint) {
-		switchToAccount(account, false, fingerprint);
-	}
-
-	public void switchToAccount(Account account) {
-		switchToAccount(account, false, null);
-	}
-
-	public void switchToAccount(Account account, boolean init, String fingerprint) {
-		Intent intent = new Intent(this, EditAccountActivity.class);
-		intent.putExtra("jid", account.getJid().asBareJid().toEscapedString());
-		intent.putExtra("init", init);
-		if (init) {
-			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
-		}
-		if (fingerprint != null) {
-			intent.putExtra("fingerprint", fingerprint);
-		}
-		startActivity(intent);
-		if (init) {
-			overridePendingTransition(0, 0);
-		}
-	}
-
-	protected void delegateUriPermissionsToService(Uri uri) {
-		Intent intent = new Intent(this, XmppConnectionService.class);
-		intent.setAction(Intent.ACTION_SEND);
-		intent.setData(uri);
-		intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-		try {
-			startService(intent);
-		} catch (Exception e) {
-			Log.e(Config.LOGTAG,"unable to delegate uri permission",e);
-		}
-	}
-
-	protected void inviteToConversation(Conversation conversation) {
-		startActivityForResult(ChooseContactActivity.create(this,conversation), REQUEST_INVITE_TO_CONVERSATION);
-	}
-
-	protected void announcePgp(final Account account, final Conversation conversation, Intent intent, final Runnable onSuccess) {
-		if (account.getPgpId() == 0) {
-			choosePgpSignId(account);
-		} else {
-			String status = null;
-			if (manuallyChangePresence()) {
-				status = account.getPresenceStatusMessage();
-			}
-			if (status == null) {
-				status = "";
-			}
-			xmppConnectionService.getPgpEngine().generateSignature(intent, account, status, new UiCallback<String>() {
-
-				@Override
-				public void userInputRequired(PendingIntent pi, String signature) {
-					try {
-						startIntentSenderForResult(pi.getIntentSender(), REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
-					} catch (final SendIntentException ignored) {
-					}
-				}
-
-				@Override
-				public void success(String signature) {
-					account.setPgpSignature(signature);
-					xmppConnectionService.databaseBackend.updateAccount(account);
-					xmppConnectionService.sendPresence(account);
-					if (conversation != null) {
-						conversation.setNextEncryption(Message.ENCRYPTION_PGP);
-						xmppConnectionService.updateConversation(conversation);
-						refreshUi();
-					}
-					if (onSuccess != null) {
-						runOnUiThread(onSuccess);
-					}
-				}
-
-				@Override
-				public void error(int error, String signature) {
-					if (error == 0) {
-						account.setPgpSignId(0);
-						account.unsetPgpSignature();
-						xmppConnectionService.databaseBackend.updateAccount(account);
-						choosePgpSignId(account);
-					} else {
-						displayErrorDialog(error);
-					}
-				}
-			});
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-	protected void setListItemBackgroundOnView(View view) {
-		int sdk = android.os.Build.VERSION.SDK_INT;
-		if (sdk < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-			view.setBackgroundDrawable(getResources().getDrawable(R.drawable.greybackground));
-		} else {
-			view.setBackground(getResources().getDrawable(R.drawable.greybackground));
-		}
-	}
-
-	protected void choosePgpSignId(Account account) {
-		xmppConnectionService.getPgpEngine().chooseKey(account, new UiCallback<Account>() {
-			@Override
-			public void success(Account account1) {
-			}
-
-			@Override
-			public void error(int errorCode, Account object) {
-
-			}
-
-			@Override
-			public void userInputRequired(PendingIntent pi, Account object) {
-				try {
-					startIntentSenderForResult(pi.getIntentSender(),
-							REQUEST_CHOOSE_PGP_ID, null, 0, 0, 0);
-				} catch (final SendIntentException ignored) {
-				}
-			}
-		});
-	}
-
-	protected void displayErrorDialog(final int errorCode) {
-		runOnUiThread(() -> {
-			Builder builder = new Builder(XmppActivity.this);
-			builder.setIconAttribute(android.R.attr.alertDialogIcon);
-			builder.setTitle(getString(R.string.error));
-			builder.setMessage(errorCode);
-			builder.setNeutralButton(R.string.accept, null);
-			builder.create().show();
-		});
-
-	}
-
-	protected void showAddToRosterDialog(final Contact contact) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(contact.getJid().toString());
-		builder.setMessage(getString(R.string.not_in_roster));
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setPositiveButton(getString(R.string.add_contact), (dialog, which) -> xmppConnectionService.createContact(contact,true));
-		builder.create().show();
-	}
-
-	private void showAskForPresenceDialog(final Contact contact) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(contact.getJid().toString());
-		builder.setMessage(R.string.request_presence_updates);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.request_now,
-				(dialog, which) -> {
-					if (xmppConnectionServiceBound) {
-						xmppConnectionService.sendPresencePacket(contact
-								.getAccount(), xmppConnectionService
-								.getPresenceGenerator()
-								.requestPresenceUpdatesFrom(contact));
-					}
-				});
-		builder.create().show();
-	}
-
-	protected void quickEdit(String previousValue, @StringRes int hint, OnValueEdited callback) {
-		quickEdit(previousValue, callback, hint, false, false);
-	}
-
-	protected void quickEdit(String previousValue, @StringRes int hint, OnValueEdited callback, boolean permitEmpty) {
-		quickEdit(previousValue, callback, hint, false, permitEmpty);
-	}
-
-	protected void quickPasswordEdit(String previousValue, OnValueEdited callback) {
-		quickEdit(previousValue, callback, R.string.password, true, false);
-	}
-
-	@SuppressLint("InflateParams")
-	private void quickEdit(final String previousValue,
-	                       final OnValueEdited callback,
-	                       final @StringRes int hint,
-	                       boolean password,
-	                       boolean permitEmpty) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		DialogQuickeditBinding binding = DataBindingUtil.inflate(getLayoutInflater(),R.layout.dialog_quickedit, null, false);
-		if (password) {
-			binding.inputEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-		}
-		builder.setPositiveButton(R.string.accept, null);
-		if (hint != 0) {
-			binding.inputLayout.setHint(getString(hint));
-		}
-		binding.inputEditText.requestFocus();
-		if (previousValue != null) {
-			binding.inputEditText.getText().append(previousValue);
-		}
-		builder.setView(binding.getRoot());
-		builder.setNegativeButton(R.string.cancel, null);
-		final AlertDialog dialog = builder.create();
-		dialog.setOnShowListener(d -> SoftKeyboardUtils.showKeyboard(binding.inputEditText));
-		dialog.show();
-		View.OnClickListener clickListener = v -> {
-			String value = binding.inputEditText.getText().toString();
-			if (!value.equals(previousValue) && (!value.trim().isEmpty() || permitEmpty)) {
-				String error = callback.onValueEdited(value);
-				if (error != null) {
-					binding.inputLayout.setError(error);
-					return;
-				}
-			}
-			SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
-			dialog.dismiss();
-		};
-		dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(clickListener);
-		dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((v -> {
-			SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
-			dialog.dismiss();
-		}));
-		dialog.setCanceledOnTouchOutside(false);
-		dialog.setOnDismissListener(dialog1 -> {
-			SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+    public static final String EXTRA_ACCOUNT = "account";
+    protected static final int REQUEST_ANNOUNCE_PGP = 0x0101;
+    protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
+    protected static final int REQUEST_CHOOSE_PGP_ID = 0x0103;
+    protected static final int REQUEST_BATTERY_OP = 0x49ff;
+    public XmppConnectionService xmppConnectionService;
+    public boolean xmppConnectionServiceBound = false;
+
+    protected static final String FRAGMENT_TAG_DIALOG = "dialog";
+
+    private boolean isCameraFeatureAvailable = false;
+
+    protected int mTheme;
+    protected boolean mUsingEnterKey = false;
+    protected boolean mUseTor = false;
+    protected Toast mToast;
+    public Runnable onOpenPGPKeyPublished = () -> Toast.makeText(XmppActivity.this, R.string.openpgp_has_been_published, Toast.LENGTH_SHORT).show();
+    protected ConferenceInvite mPendingConferenceInvite = null;
+    protected ServiceConnection mConnection = new ServiceConnection() {
+
+        @Override
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            XmppConnectionBinder binder = (XmppConnectionBinder) service;
+            xmppConnectionService = binder.getService();
+            xmppConnectionServiceBound = true;
+            registerListeners();
+            onBackendConnected();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName arg0) {
+            xmppConnectionServiceBound = false;
+        }
+    };
+    private DisplayMetrics metrics;
+    private long mLastUiRefresh = 0;
+    private Handler mRefreshUiHandler = new Handler();
+    private Runnable mRefreshUiRunnable = () -> {
+        mLastUiRefresh = SystemClock.elapsedRealtime();
+        refreshUiReal();
+    };
+    private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
+        @Override
+        public void success(final Conversation conversation) {
+            runOnUiThread(() -> {
+                switchToConversation(conversation);
+                hideToast();
+            });
+        }
+
+        @Override
+        public void error(final int errorCode, Conversation object) {
+            runOnUiThread(() -> replaceToast(getString(errorCode)));
+        }
+
+        @Override
+        public void userInputRequired(PendingIntent pi, Conversation object) {
+
+        }
+    };
+    public boolean mSkipBackgroundBinding = false;
+
+    public static boolean cancelPotentialWork(Message message, ImageView imageView) {
+        final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+
+        if (bitmapWorkerTask != null) {
+            final Message oldMessage = bitmapWorkerTask.message;
+            if (oldMessage == null || message != oldMessage) {
+                bitmapWorkerTask.cancel(true);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
+        if (imageView != null) {
+            final Drawable drawable = imageView.getDrawable();
+            if (drawable instanceof AsyncDrawable) {
+                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+                return asyncDrawable.getBitmapWorkerTask();
+            }
+        }
+        return null;
+    }
+
+    protected void hideToast() {
+        if (mToast != null) {
+            mToast.cancel();
+        }
+    }
+
+    protected void replaceToast(String msg) {
+        replaceToast(msg, true);
+    }
+
+    protected void replaceToast(String msg, boolean showlong) {
+        hideToast();
+        mToast = Toast.makeText(this, msg, showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
+        mToast.show();
+    }
+
+    protected final void refreshUi() {
+        final long diff = SystemClock.elapsedRealtime() - mLastUiRefresh;
+        if (diff > Config.REFRESH_UI_INTERVAL) {
+            mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
+            runOnUiThread(mRefreshUiRunnable);
+        } else {
+            final long next = Config.REFRESH_UI_INTERVAL - diff;
+            mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
+            mRefreshUiHandler.postDelayed(mRefreshUiRunnable, next);
+        }
+    }
+
+    abstract protected void refreshUiReal();
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (!xmppConnectionServiceBound) {
+            if (this.mSkipBackgroundBinding) {
+                Log.d(Config.LOGTAG, "skipping background binding");
+            } else {
+                connectToBackend();
+            }
+        } else {
+            this.registerListeners();
+            this.onBackendConnected();
+        }
+        this.mUsingEnterKey = usingEnterKey();
+        this.mUseTor = useTor();
+    }
+
+    public void connectToBackend() {
+        Intent intent = new Intent(this, XmppConnectionService.class);
+        intent.setAction("ui");
+        try {
+            startService(intent);
+        } catch (IllegalStateException e) {
+            Log.w(Config.LOGTAG, "unable to start service from " + getClass().getSimpleName());
+        }
+        bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (xmppConnectionServiceBound) {
+            this.unregisterListeners();
+            unbindService(mConnection);
+            xmppConnectionServiceBound = false;
+        }
+    }
+
+
+    public boolean hasPgp() {
+        return xmppConnectionService.getPgpEngine() != null;
+    }
+
+    public void showInstallPgpDialog() {
+        Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(getString(R.string.openkeychain_required));
+        builder.setIconAttribute(android.R.attr.alertDialogIcon);
+        builder.setMessage(getText(R.string.openkeychain_required_long));
+        builder.setNegativeButton(getString(R.string.cancel), null);
+        builder.setNeutralButton(getString(R.string.restart),
+                (dialog, which) -> {
+                    if (xmppConnectionServiceBound) {
+                        unbindService(mConnection);
+                        xmppConnectionServiceBound = false;
+                    }
+                    stopService(new Intent(XmppActivity.this,
+                            XmppConnectionService.class));
+                    finish();
+                });
+        builder.setPositiveButton(getString(R.string.install),
+                (dialog, which) -> {
+                    Uri uri = Uri
+                            .parse("market://details?id=org.sufficientlysecure.keychain");
+                    Intent marketIntent = new Intent(Intent.ACTION_VIEW,
+                            uri);
+                    PackageManager manager = getApplicationContext()
+                            .getPackageManager();
+                    List<ResolveInfo> infos = manager
+                            .queryIntentActivities(marketIntent, 0);
+                    if (infos.size() > 0) {
+                        startActivity(marketIntent);
+                    } else {
+                        uri = Uri.parse("http://www.openkeychain.org/");
+                        Intent browserIntent = new Intent(
+                                Intent.ACTION_VIEW, uri);
+                        startActivity(browserIntent);
+                    }
+                    finish();
+                });
+        builder.create().show();
+    }
+
+    abstract void onBackendConnected();
+
+    protected void registerListeners() {
+        if (this instanceof XmppConnectionService.OnConversationUpdate) {
+            this.xmppConnectionService.setOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnAccountUpdate) {
+            this.xmppConnectionService.setOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnCaptchaRequested) {
+            this.xmppConnectionService.setOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
+        }
+        if (this instanceof XmppConnectionService.OnRosterUpdate) {
+            this.xmppConnectionService.setOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
+            this.xmppConnectionService.setOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
+        }
+        if (this instanceof OnUpdateBlocklist) {
+            this.xmppConnectionService.setOnUpdateBlocklistListener((OnUpdateBlocklist) this);
+        }
+        if (this instanceof XmppConnectionService.OnShowErrorToast) {
+            this.xmppConnectionService.setOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
+        }
+        if (this instanceof OnKeyStatusUpdated) {
+            this.xmppConnectionService.setOnKeyStatusUpdatedListener((OnKeyStatusUpdated) this);
+        }
+        if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
+            this.xmppConnectionService.setOnRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
+        }
+    }
+
+    protected void unregisterListeners() {
+        if (this instanceof XmppConnectionService.OnConversationUpdate) {
+            this.xmppConnectionService.removeOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnAccountUpdate) {
+            this.xmppConnectionService.removeOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnCaptchaRequested) {
+            this.xmppConnectionService.removeOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
+        }
+        if (this instanceof XmppConnectionService.OnRosterUpdate) {
+            this.xmppConnectionService.removeOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
+        }
+        if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
+            this.xmppConnectionService.removeOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
+        }
+        if (this instanceof OnUpdateBlocklist) {
+            this.xmppConnectionService.removeOnUpdateBlocklistListener((OnUpdateBlocklist) this);
+        }
+        if (this instanceof XmppConnectionService.OnShowErrorToast) {
+            this.xmppConnectionService.removeOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
+        }
+        if (this instanceof OnKeyStatusUpdated) {
+            this.xmppConnectionService.removeOnNewKeysAvailableListener((OnKeyStatusUpdated) this);
+        }
+        if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
+            this.xmppConnectionService.removeRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_settings:
+                startActivity(new Intent(this, SettingsActivity.class));
+                break;
+            case R.id.action_accounts:
+                AccountUtils.launchManageAccounts(this);
+                break;
+            case R.id.action_account:
+                AccountUtils.launchManageAccount(this);
+                break;
+            case android.R.id.home:
+                finish();
+                break;
+            case R.id.action_show_qr_code:
+                showQrCode();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void selectPresence(final Conversation conversation, final PresenceSelector.OnPresenceSelected listener) {
+        final Contact contact = conversation.getContact();
+        if (!contact.showInRoster()) {
+            showAddToRosterDialog(conversation.getContact());
+        } else {
+            final Presences presences = contact.getPresences();
+            if (presences.size() == 0) {
+                if (!contact.getOption(Contact.Options.TO)
+                        && !contact.getOption(Contact.Options.ASKING)
+                        && contact.getAccount().getStatus() == Account.State.ONLINE) {
+                    showAskForPresenceDialog(contact);
+                } else if (!contact.getOption(Contact.Options.TO)
+                        || !contact.getOption(Contact.Options.FROM)) {
+                    PresenceSelector.warnMutualPresenceSubscription(this, conversation, listener);
+                } else {
+                    conversation.setNextCounterpart(null);
+                    listener.onPresenceSelected();
+                }
+            } else if (presences.size() == 1) {
+                final String presence = presences.toResourceArray()[0];
+                conversation.setNextCounterpart(PresenceSelector.getNextCounterpart(contact, presence));
+                listener.onPresenceSelected();
+            } else {
+                PresenceSelector.showPresenceSelectionDialog(this, conversation, listener);
+            }
+        }
+    }
+
+    @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        metrics = getResources().getDisplayMetrics();
+        ExceptionHelper.init(getApplicationContext());
+        new EmojiService(this).init();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
+        } else {
+            this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
+        }
+        this.mTheme = findTheme();
+        setTheme(this.mTheme);
+    }
+
+    protected boolean isCameraFeatureAvailable() {
+        return this.isCameraFeatureAvailable;
+    }
+
+    public boolean isDarkTheme() {
+        return ThemeHelper.isDark(mTheme);
+    }
+
+    public int getThemeResource(int r_attr_name, int r_drawable_def) {
+        int[] attrs = {r_attr_name};
+        TypedArray ta = this.getTheme().obtainStyledAttributes(attrs);
+
+        int res = ta.getResourceId(0, r_drawable_def);
+        ta.recycle();
+
+        return res;
+    }
+
+    protected boolean isOptimizingBattery() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            final PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
+            return pm != null
+                    && !pm.isIgnoringBatteryOptimizations(getPackageName());
+        } else {
+            return false;
+        }
+    }
+
+    protected boolean isAffectedByDataSaver() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+            return cm != null
+                    && cm.isActiveNetworkMetered()
+                    && cm.getRestrictBackgroundStatus() == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean usingEnterKey() {
+        return getBooleanPreference("display_enter_key", R.bool.display_enter_key);
+    }
+
+    private boolean useTor() {
+        return QuickConversationsService.isConversations() && getBooleanPreference("use_tor", R.bool.use_tor);
+    }
+
+    protected SharedPreferences getPreferences() {
+        return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    }
+
+    protected boolean getBooleanPreference(String name, @BoolRes int res) {
+        return getPreferences().getBoolean(name, getResources().getBoolean(res));
+    }
+
+    public void switchToConversation(Conversation conversation) {
+        switchToConversation(conversation, null);
+    }
+
+    public void switchToConversationAndQuote(Conversation conversation, String text) {
+        switchToConversation(conversation, text, true, null, false, false);
+    }
+
+    public void switchToConversation(Conversation conversation, String text) {
+        switchToConversation(conversation, text, false, null, false, false);
+    }
+
+    public void switchToConversationDoNotAppend(Conversation conversation, String text) {
+        switchToConversation(conversation, text, false, null, false, true);
+    }
+
+    public void highlightInMuc(Conversation conversation, String nick) {
+        switchToConversation(conversation, null, false, nick, false, false);
+    }
+
+    public void privateMsgInMuc(Conversation conversation, String nick) {
+        switchToConversation(conversation, null, false, nick, true, false);
+    }
+
+    private void switchToConversation(Conversation conversation, String text, boolean asQuote, String nick, boolean pm, boolean doNotAppend) {
+        Intent intent = new Intent(this, ConversationsActivity.class);
+        intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION);
+        intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
+        if (text != null) {
+            intent.putExtra(Intent.EXTRA_TEXT, text);
+            if (asQuote) {
+                intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, true);
+            }
+        }
+        if (nick != null) {
+            intent.putExtra(ConversationsActivity.EXTRA_NICK, nick);
+            intent.putExtra(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
+        }
+        if (doNotAppend) {
+            intent.putExtra(ConversationsActivity.EXTRA_DO_NOT_APPEND, true);
+        }
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
+        finish();
+    }
+
+    public void switchToContactDetails(Contact contact) {
+        switchToContactDetails(contact, null);
+    }
+
+    public void switchToContactDetails(Contact contact, String messageFingerprint) {
+        Intent intent = new Intent(this, ContactDetailsActivity.class);
+        intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
+        intent.putExtra(EXTRA_ACCOUNT, contact.getAccount().getJid().asBareJid().toEscapedString());
+        intent.putExtra("contact", contact.getJid().toEscapedString());
+        intent.putExtra("fingerprint", messageFingerprint);
+        startActivity(intent);
+    }
+
+    public void switchToAccount(Account account, String fingerprint) {
+        switchToAccount(account, false, fingerprint);
+    }
+
+    public void switchToAccount(Account account) {
+        switchToAccount(account, false, null);
+    }
+
+    public void switchToAccount(Account account, boolean init, String fingerprint) {
+        Intent intent = new Intent(this, EditAccountActivity.class);
+        intent.putExtra("jid", account.getJid().asBareJid().toEscapedString());
+        intent.putExtra("init", init);
+        if (init) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        }
+        if (fingerprint != null) {
+            intent.putExtra("fingerprint", fingerprint);
+        }
+        startActivity(intent);
+        if (init) {
+            overridePendingTransition(0, 0);
+        }
+    }
+
+    protected void delegateUriPermissionsToService(Uri uri) {
+        Intent intent = new Intent(this, XmppConnectionService.class);
+        intent.setAction(Intent.ACTION_SEND);
+        intent.setData(uri);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        try {
+            startService(intent);
+        } catch (Exception e) {
+            Log.e(Config.LOGTAG, "unable to delegate uri permission", e);
+        }
+    }
+
+    protected void inviteToConversation(Conversation conversation) {
+        startActivityForResult(ChooseContactActivity.create(this, conversation), REQUEST_INVITE_TO_CONVERSATION);
+    }
+
+    protected void announcePgp(final Account account, final Conversation conversation, Intent intent, final Runnable onSuccess) {
+        if (account.getPgpId() == 0) {
+            choosePgpSignId(account);
+        } else {
+            String status = null;
+            if (manuallyChangePresence()) {
+                status = account.getPresenceStatusMessage();
+            }
+            if (status == null) {
+                status = "";
+            }
+            xmppConnectionService.getPgpEngine().generateSignature(intent, account, status, new UiCallback<String>() {
+
+                @Override
+                public void userInputRequired(PendingIntent pi, String signature) {
+                    try {
+                        startIntentSenderForResult(pi.getIntentSender(), REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
+                    } catch (final SendIntentException ignored) {
+                    }
+                }
+
+                @Override
+                public void success(String signature) {
+                    account.setPgpSignature(signature);
+                    xmppConnectionService.databaseBackend.updateAccount(account);
+                    xmppConnectionService.sendPresence(account);
+                    if (conversation != null) {
+                        conversation.setNextEncryption(Message.ENCRYPTION_PGP);
+                        xmppConnectionService.updateConversation(conversation);
+                        refreshUi();
+                    }
+                    if (onSuccess != null) {
+                        runOnUiThread(onSuccess);
+                    }
+                }
+
+                @Override
+                public void error(int error, String signature) {
+                    if (error == 0) {
+                        account.setPgpSignId(0);
+                        account.unsetPgpSignature();
+                        xmppConnectionService.databaseBackend.updateAccount(account);
+                        choosePgpSignId(account);
+                    } else {
+                        displayErrorDialog(error);
+                    }
+                }
+            });
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    protected void setListItemBackgroundOnView(View view) {
+        int sdk = android.os.Build.VERSION.SDK_INT;
+        if (sdk < android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            view.setBackgroundDrawable(getResources().getDrawable(R.drawable.greybackground));
+        } else {
+            view.setBackground(getResources().getDrawable(R.drawable.greybackground));
+        }
+    }
+
+    protected void choosePgpSignId(Account account) {
+        xmppConnectionService.getPgpEngine().chooseKey(account, new UiCallback<Account>() {
+            @Override
+            public void success(Account account1) {
+            }
+
+            @Override
+            public void error(int errorCode, Account object) {
+
+            }
+
+            @Override
+            public void userInputRequired(PendingIntent pi, Account object) {
+                try {
+                    startIntentSenderForResult(pi.getIntentSender(),
+                            REQUEST_CHOOSE_PGP_ID, null, 0, 0, 0);
+                } catch (final SendIntentException ignored) {
+                }
+            }
         });
-	}
+    }
 
-	protected boolean hasStoragePermission(int requestCode) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-				requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestCode);
-				return false;
-			} else {
-				return true;
-			}
-		} else {
-			return true;
-		}
-	}
+    protected void displayErrorDialog(final int errorCode) {
+        runOnUiThread(() -> {
+            Builder builder = new Builder(XmppActivity.this);
+            builder.setIconAttribute(android.R.attr.alertDialogIcon);
+            builder.setTitle(getString(R.string.error));
+            builder.setMessage(errorCode);
+            builder.setNeutralButton(R.string.accept, null);
+            builder.create().show();
+        });
 
-	protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == REQUEST_INVITE_TO_CONVERSATION && resultCode == RESULT_OK) {
-			mPendingConferenceInvite = ConferenceInvite.parse(data);
-			if (xmppConnectionServiceBound && mPendingConferenceInvite != null) {
-				if (mPendingConferenceInvite.execute(this)) {
-					mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
-					mToast.show();
-				}
-				mPendingConferenceInvite = null;
-			}
-		}
-	}
+    }
 
-	public boolean copyTextToClipboard(String text, int labelResId) {
-		ClipboardManager mClipBoardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-		String label = getResources().getString(labelResId);
-		if (mClipBoardManager != null) {
-			ClipData mClipData = ClipData.newPlainText(label, text);
-			mClipBoardManager.setPrimaryClip(mClipData);
-			return true;
-		}
-		return false;
-	}
+    protected void showAddToRosterDialog(final Contact contact) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(contact.getJid().toString());
+        builder.setMessage(getString(R.string.not_in_roster));
+        builder.setNegativeButton(getString(R.string.cancel), null);
+        builder.setPositiveButton(getString(R.string.add_contact), (dialog, which) -> xmppConnectionService.createContact(contact, true));
+        builder.create().show();
+    }
 
-	protected boolean manuallyChangePresence() {
-		return getBooleanPreference(SettingsActivity.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
-	}
+    private void showAskForPresenceDialog(final Contact contact) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(contact.getJid().toString());
+        builder.setMessage(R.string.request_presence_updates);
+        builder.setNegativeButton(R.string.cancel, null);
+        builder.setPositiveButton(R.string.request_now,
+                (dialog, which) -> {
+                    if (xmppConnectionServiceBound) {
+                        xmppConnectionService.sendPresencePacket(contact
+                                .getAccount(), xmppConnectionService
+                                .getPresenceGenerator()
+                                .requestPresenceUpdatesFrom(contact));
+                    }
+                });
+        builder.create().show();
+    }
 
-	protected String getShareableUri() {
-		return getShareableUri(false);
-	}
+    protected void quickEdit(String previousValue, @StringRes int hint, OnValueEdited callback) {
+        quickEdit(previousValue, callback, hint, false, false);
+    }
 
-	protected String getShareableUri(boolean http) {
-		return null;
-	}
+    protected void quickEdit(String previousValue, @StringRes int hint, OnValueEdited callback, boolean permitEmpty) {
+        quickEdit(previousValue, callback, hint, false, permitEmpty);
+    }
 
-	protected void shareLink(boolean http) {
-		String uri = getShareableUri(http);
-		if (uri == null || uri.isEmpty()) {
-			return;
-		}
-		Intent intent = new Intent(Intent.ACTION_SEND);
-		intent.setType("text/plain");
-		intent.putExtra(Intent.EXTRA_TEXT, getShareableUri(http));
-		try {
-			startActivity(Intent.createChooser(intent, getText(R.string.share_uri_with)));
-		} catch (ActivityNotFoundException e) {
-			Toast.makeText(this, R.string.no_application_to_share_uri, Toast.LENGTH_SHORT).show();
-		}
-	}
+    protected void quickPasswordEdit(String previousValue, OnValueEdited callback) {
+        quickEdit(previousValue, callback, R.string.password, true, false);
+    }
 
-	protected void launchOpenKeyChain(long keyId) {
-		PgpEngine pgp = XmppActivity.this.xmppConnectionService.getPgpEngine();
-		try {
-			startIntentSenderForResult(
-					pgp.getIntentForKey(keyId).getIntentSender(), 0, null, 0,
-					0, 0);
-		} catch (Throwable e) {
-			Toast.makeText(XmppActivity.this, R.string.openpgp_error, Toast.LENGTH_SHORT).show();
-		}
-	}
+    @SuppressLint("InflateParams")
+    private void quickEdit(final String previousValue,
+                           final OnValueEdited callback,
+                           final @StringRes int hint,
+                           boolean password,
+                           boolean permitEmpty) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        DialogQuickeditBinding binding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.dialog_quickedit, null, false);
+        if (password) {
+            binding.inputEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        }
+        builder.setPositiveButton(R.string.accept, null);
+        if (hint != 0) {
+            binding.inputLayout.setHint(getString(hint));
+        }
+        binding.inputEditText.requestFocus();
+        if (previousValue != null) {
+            binding.inputEditText.getText().append(previousValue);
+        }
+        builder.setView(binding.getRoot());
+        builder.setNegativeButton(R.string.cancel, null);
+        final AlertDialog dialog = builder.create();
+        dialog.setOnShowListener(d -> SoftKeyboardUtils.showKeyboard(binding.inputEditText));
+        dialog.show();
+        View.OnClickListener clickListener = v -> {
+            String value = binding.inputEditText.getText().toString();
+            if (!value.equals(previousValue) && (!value.trim().isEmpty() || permitEmpty)) {
+                String error = callback.onValueEdited(value);
+                if (error != null) {
+                    binding.inputLayout.setError(error);
+                    return;
+                }
+            }
+            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+            dialog.dismiss();
+        };
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(clickListener);
+        dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((v -> {
+            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+            dialog.dismiss();
+        }));
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setOnDismissListener(dialog1 -> {
+            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+        });
+    }
 
-	@Override
-	public void onResume() {
-		super.onResume();
-	}
+    protected boolean hasStoragePermission(int requestCode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestCode);
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return true;
+        }
+    }
 
-	protected int findTheme() {
-		return ThemeHelper.find(this);
-	}
+    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_INVITE_TO_CONVERSATION && resultCode == RESULT_OK) {
+            mPendingConferenceInvite = ConferenceInvite.parse(data);
+            if (xmppConnectionServiceBound && mPendingConferenceInvite != null) {
+                if (mPendingConferenceInvite.execute(this)) {
+                    mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
+                    mToast.show();
+                }
+                mPendingConferenceInvite = null;
+            }
+        }
+    }
 
-	@Override
-	public void onPause() {
-		super.onPause();
-	}
+    public boolean copyTextToClipboard(String text, int labelResId) {
+        ClipboardManager mClipBoardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+        String label = getResources().getString(labelResId);
+        if (mClipBoardManager != null) {
+            ClipData mClipData = ClipData.newPlainText(label, text);
+            mClipBoardManager.setPrimaryClip(mClipData);
+            return true;
+        }
+        return false;
+    }
 
-	@Override
-	public boolean onMenuOpened(int id, Menu menu) {
-		if(id == AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR && menu != null) {
-			MenuDoubleTabUtil.recordMenuOpen();
-		}
-		return super.onMenuOpened(id, menu);
-	}
+    protected boolean manuallyChangePresence() {
+        return getBooleanPreference(SettingsActivity.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
+    }
 
-	protected void showQrCode() {
-		showQrCode(getShareableUri());
-	}
+    protected String getShareableUri() {
+        return getShareableUri(false);
+    }
 
-	protected void showQrCode(final String uri) {
-		if (uri == null || uri.isEmpty()) {
-			return;
-		}
-		Point size = new Point();
-		getWindowManager().getDefaultDisplay().getSize(size);
-		final int width = (size.x < size.y ? size.x : size.y);
-		Bitmap bitmap = BarcodeProvider.create2dBarcodeBitmap(uri, width);
-		ImageView view = new ImageView(this);
-		view.setBackgroundColor(Color.WHITE);
-		view.setImageBitmap(bitmap);
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setView(view);
-		builder.create().show();
-	}
+    protected String getShareableUri(boolean http) {
+        return null;
+    }
 
-	protected Account extractAccount(Intent intent) {
-		final String jid = intent != null ? intent.getStringExtra(EXTRA_ACCOUNT) : null;
-		try {
-			return jid != null ? xmppConnectionService.findAccountByJid(Jid.ofEscaped(jid)) : null;
-		} catch (IllegalArgumentException e) {
-			return null;
-		}
-	}
+    protected void shareLink(boolean http) {
+        String uri = getShareableUri(http);
+        if (uri == null || uri.isEmpty()) {
+            return;
+        }
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TEXT, getShareableUri(http));
+        try {
+            startActivity(Intent.createChooser(intent, getText(R.string.share_uri_with)));
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_application_to_share_uri, Toast.LENGTH_SHORT).show();
+        }
+    }
 
-	public AvatarService avatarService() {
-		return xmppConnectionService.getAvatarService();
-	}
+    protected void launchOpenKeyChain(long keyId) {
+        PgpEngine pgp = XmppActivity.this.xmppConnectionService.getPgpEngine();
+        try {
+            startIntentSenderForResult(
+                    pgp.getIntentForKey(keyId).getIntentSender(), 0, null, 0,
+                    0, 0);
+        } catch (Throwable e) {
+            Toast.makeText(XmppActivity.this, R.string.openpgp_error, Toast.LENGTH_SHORT).show();
+        }
+    }
 
-	public void loadBitmap(Message message, ImageView imageView) {
-		Bitmap bm;
-		try {
-			bm = xmppConnectionService.getFileBackend().getThumbnail(message, (int) (metrics.density * 288), true);
-		} catch (IOException e) {
-			bm = null;
-		}
-		if (bm != null) {
-			cancelPotentialWork(message, imageView);
-			imageView.setImageBitmap(bm);
-			imageView.setBackgroundColor(0x00000000);
-		} else {
-			if (cancelPotentialWork(message, imageView)) {
-				imageView.setBackgroundColor(0xff333333);
-				imageView.setImageDrawable(null);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(
-						getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(message);
-				} catch (final RejectedExecutionException ignored) {
-					ignored.printStackTrace();
-				}
-			}
-		}
-	}
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
 
-	protected interface OnValueEdited {
-		String onValueEdited(String value);
-	}
+    protected int findTheme() {
+        return ThemeHelper.find(this);
+    }
 
-	public static class ConferenceInvite {
-		private String uuid;
-		private List<Jid> jids = new ArrayList<>();
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
 
-		public static ConferenceInvite parse(Intent data) {
-			ConferenceInvite invite = new ConferenceInvite();
-			invite.uuid = data.getStringExtra(ChooseContactActivity.EXTRA_CONVERSATION);
-			if (invite.uuid == null) {
-				return null;
-			}
-			invite.jids.addAll(ChooseContactActivity.extractJabberIds(data));
-			return invite;
-		}
+    @Override
+    public boolean onMenuOpened(int id, Menu menu) {
+        if (id == AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR && menu != null) {
+            MenuDoubleTabUtil.recordMenuOpen();
+        }
+        return super.onMenuOpened(id, menu);
+    }
 
-		public boolean execute(XmppActivity activity) {
-			XmppConnectionService service = activity.xmppConnectionService;
-			Conversation conversation = service.findConversationByUuid(this.uuid);
-			if (conversation == null) {
-				return false;
-			}
-			if (conversation.getMode() == Conversation.MODE_MULTI) {
-				for (Jid jid : jids) {
-					service.invite(conversation, jid);
-				}
-				return false;
-			} else {
-				jids.add(conversation.getJid().asBareJid());
-				return service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback);
-			}
-		}
-	}
+    protected void showQrCode() {
+        showQrCode(getShareableUri());
+    }
 
-	static class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
-		private final WeakReference<ImageView> imageViewReference;
-		private Message message = null;
+    protected void showQrCode(final String uri) {
+        if (uri == null || uri.isEmpty()) {
+            return;
+        }
+        Point size = new Point();
+        getWindowManager().getDefaultDisplay().getSize(size);
+        final int width = (size.x < size.y ? size.x : size.y);
+        Bitmap bitmap = BarcodeProvider.create2dBarcodeBitmap(uri, width);
+        ImageView view = new ImageView(this);
+        view.setBackgroundColor(Color.WHITE);
+        view.setImageBitmap(bitmap);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setView(view);
+        builder.create().show();
+    }
 
-		private BitmapWorkerTask(ImageView imageView) {
-			this.imageViewReference = new WeakReference<>(imageView);
-		}
+    protected Account extractAccount(Intent intent) {
+        final String jid = intent != null ? intent.getStringExtra(EXTRA_ACCOUNT) : null;
+        try {
+            return jid != null ? xmppConnectionService.findAccountByJid(Jid.ofEscaped(jid)) : null;
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
 
-		@Override
-		protected Bitmap doInBackground(Message... params) {
-			if (isCancelled()) {
-				return null;
-			}
-			message = params[0];
-			try {
-				final XmppActivity activity = find(imageViewReference);
-				if (activity != null && activity.xmppConnectionService != null) {
-					return activity.xmppConnectionService.getFileBackend().getThumbnail(message, (int) (activity.metrics.density * 288), false);
-				} else {
-					return null;
-				}
-			} catch (IOException e) {
-				return null;
-			}
-		}
+    public AvatarService avatarService() {
+        return xmppConnectionService.getAvatarService();
+    }
 
-		@Override
-		protected void onPostExecute(final Bitmap bitmap) {
-			if (!isCancelled()) {
-				final ImageView imageView = imageViewReference.get();
-				if (imageView != null) {
-					imageView.setImageBitmap(bitmap);
-					imageView.setBackgroundColor(bitmap == null ? 0xff333333 : 0x00000000);
-				}
-			}
-		}
-	}
+    public void loadBitmap(Message message, ImageView imageView) {
+        Bitmap bm;
+        try {
+            bm = xmppConnectionService.getFileBackend().getThumbnail(message, (int) (metrics.density * 288), true);
+        } catch (IOException e) {
+            bm = null;
+        }
+        if (bm != null) {
+            cancelPotentialWork(message, imageView);
+            imageView.setImageBitmap(bm);
+            imageView.setBackgroundColor(0x00000000);
+        } else {
+            if (cancelPotentialWork(message, imageView)) {
+                imageView.setBackgroundColor(0xff333333);
+                imageView.setImageDrawable(null);
+                final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
+                final AsyncDrawable asyncDrawable = new AsyncDrawable(
+                        getResources(), null, task);
+                imageView.setImageDrawable(asyncDrawable);
+                try {
+                    task.execute(message);
+                } catch (final RejectedExecutionException ignored) {
+                    ignored.printStackTrace();
+                }
+            }
+        }
+    }
 
-	private static class AsyncDrawable extends BitmapDrawable {
-		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
+    protected interface OnValueEdited {
+        String onValueEdited(String value);
+    }
 
-		private AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
-			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
-		}
+    public static class ConferenceInvite {
+        private String uuid;
+        private List<Jid> jids = new ArrayList<>();
 
-		private BitmapWorkerTask getBitmapWorkerTask() {
-			return bitmapWorkerTaskReference.get();
-		}
-	}
+        public static ConferenceInvite parse(Intent data) {
+            ConferenceInvite invite = new ConferenceInvite();
+            invite.uuid = data.getStringExtra(ChooseContactActivity.EXTRA_CONVERSATION);
+            if (invite.uuid == null) {
+                return null;
+            }
+            invite.jids.addAll(ChooseContactActivity.extractJabberIds(data));
+            return invite;
+        }
 
-	public static XmppActivity find(@NonNull  WeakReference<ImageView> viewWeakReference) {
-		final View view = viewWeakReference.get();
-		return view == null ? null : find(view);
-	}
+        public boolean execute(XmppActivity activity) {
+            XmppConnectionService service = activity.xmppConnectionService;
+            Conversation conversation = service.findConversationByUuid(this.uuid);
+            if (conversation == null) {
+                return false;
+            }
+            if (conversation.getMode() == Conversation.MODE_MULTI) {
+                for (Jid jid : jids) {
+                    service.invite(conversation, jid);
+                }
+                return false;
+            } else {
+                jids.add(conversation.getJid().asBareJid());
+                return service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback);
+            }
+        }
+    }
 
-	public static XmppActivity find(@NonNull final View view) {
-		Context context = view.getContext();
-		while (context instanceof ContextWrapper) {
-			if (context instanceof XmppActivity) {
-				return (XmppActivity) context;
-			}
-			context = ((ContextWrapper)context).getBaseContext();
-		}
-		return null;
-	}
+    static class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
+        private final WeakReference<ImageView> imageViewReference;
+        private Message message = null;
+
+        private BitmapWorkerTask(ImageView imageView) {
+            this.imageViewReference = new WeakReference<>(imageView);
+        }
+
+        @Override
+        protected Bitmap doInBackground(Message... params) {
+            if (isCancelled()) {
+                return null;
+            }
+            message = params[0];
+            try {
+                final XmppActivity activity = find(imageViewReference);
+                if (activity != null && activity.xmppConnectionService != null) {
+                    return activity.xmppConnectionService.getFileBackend().getThumbnail(message, (int) (activity.metrics.density * 288), false);
+                } else {
+                    return null;
+                }
+            } catch (IOException e) {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(final Bitmap bitmap) {
+            if (!isCancelled()) {
+                final ImageView imageView = imageViewReference.get();
+                if (imageView != null) {
+                    imageView.setImageBitmap(bitmap);
+                    imageView.setBackgroundColor(bitmap == null ? 0xff333333 : 0x00000000);
+                }
+            }
+        }
+    }
+
+    private static class AsyncDrawable extends BitmapDrawable {
+        private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
+
+        private AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
+            super(res, bitmap);
+            bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
+        }
+
+        private BitmapWorkerTask getBitmapWorkerTask() {
+            return bitmapWorkerTaskReference.get();
+        }
+    }
+
+    public static XmppActivity find(@NonNull WeakReference<ImageView> viewWeakReference) {
+        final View view = viewWeakReference.get();
+        return view == null ? null : find(view);
+    }
+
+    public static XmppActivity find(@NonNull final View view) {
+        Context context = view.getContext();
+        while (context instanceof ContextWrapper) {
+            if (context instanceof XmppActivity) {
+                return (XmppActivity) context;
+            }
+            context = ((ContextWrapper) context).getBaseContext();
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
index 14e82b406..870fdc268 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
@@ -106,12 +106,21 @@ public class PresenceSelector {
         builder.setPositiveButton(
                 R.string.ok,
                 (dialog, which) -> onFullJidSelected.onFullJidSelected(
-                        Jid.of(contact.getJid().getLocal(), contact.getJid().getDomain(), resourceArray[selectedResource.get()])
+                        getNextCounterpart(contact, resourceArray[selectedResource.get()])
                 )
         );
         builder.create().show();
     }
 
+
+    public static Jid getNextCounterpart(final Contact contact, final String resource) {
+        if (resource.isEmpty()) {
+            return contact.getJid().asBareJid();
+        } else {
+            return contact.getJid().withResource(resource);
+        }
+    }
+
     public static void warnMutualPresenceSubscription(Activity activity, final Conversation conversation, final OnPresenceSelected listener) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle(conversation.getContact().getJid().toString());

From 400c8461fc1fb9a76a91b2ffffba9c533684534a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 13 Jun 2020 22:53:24 +0200
Subject: [PATCH 17/29] fix feature discovery in jingle file transfer for empty
 resources

---
 .../siacs/conversations/entities/Message.java  | 18 +++++++-----------
 .../ui/util/PresenceSelector.java              |  9 ++++++---
 .../jingle/JingleFileTransferConnection.java   | 14 +++++---------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 4263a6ef8..44b8db691 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -6,6 +6,8 @@ import android.graphics.Color;
 import android.text.SpannableStringBuilder;
 import android.util.Log;
 
+import com.google.common.base.Strings;
+
 import org.json.JSONException;
 
 import java.lang.ref.WeakReference;
@@ -21,6 +23,7 @@ import java.util.Set;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
 import eu.siacs.conversations.services.AvatarService;
+import eu.siacs.conversations.ui.util.PresenceSelector;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.Emoticons;
 import eu.siacs.conversations.utils.GeoHelper;
@@ -745,19 +748,12 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 	}
 
 	public boolean fixCounterpart() {
-		Presences presences = conversation.getContact().getPresences();
-		if (counterpart != null && presences.has(counterpart.getResource())) {
+		final Presences presences = conversation.getContact().getPresences();
+		if (counterpart != null && presences.has(Strings.nullToEmpty(counterpart.getResource()))) {
 			return true;
 		} else if (presences.size() >= 1) {
-			try {
-				counterpart = Jid.of(conversation.getJid().getLocal(),
-						conversation.getJid().getDomain(),
-						presences.toResourceArray()[0]);
-				return true;
-			} catch (IllegalArgumentException e) {
-				counterpart = null;
-				return false;
-			}
+			counterpart = PresenceSelector.getNextCounterpart(getContact(),presences.toResourceArray()[0]);
+			return true;
 		} else {
 			counterpart = null;
 			return false;
diff --git a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
index 870fdc268..2f29e5b76 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java
@@ -112,12 +112,15 @@ public class PresenceSelector {
         builder.create().show();
     }
 
-
     public static Jid getNextCounterpart(final Contact contact, final String resource) {
+        return getNextCounterpart(contact.getJid(), resource);
+    }
+
+    public static Jid getNextCounterpart(final Jid jid, final String resource) {
         if (resource.isEmpty()) {
-            return contact.getJid().asBareJid();
+            return jid.asBareJid();
         } else {
-            return contact.getJid().withResource(resource);
+            return jid.withResource(resource);
         }
     }
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
index 36948d48b..0cab56279 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
@@ -4,6 +4,7 @@ import android.util.Base64;
 import android.util.Log;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Iterables;
@@ -416,15 +417,10 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
     }
 
     private List<String> getRemoteFeatures() {
-        final Jid jid = this.id.with;
-        String resource = jid != null ? jid.getResource() : null;
-        if (resource != null) {
-            Presence presence = this.id.account.getRoster().getContact(jid).getPresences().get(resource);
-            ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
-            return result == null ? Collections.emptyList() : result.getFeatures();
-        } else {
-            return Collections.emptyList();
-        }
+        final String resource = Strings.nullToEmpty(this.id.with.getResource());
+        final Presence presence = this.id.account.getRoster().getContact(id.with).getPresences().get(resource);
+        final ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
+        return result == null ? Collections.emptyList() : result.getFeatures();
     }
 
     private void init(JinglePacket packet) { //should move to deliverPacket

From ccdc91a4974dee9aa98c2a11906aaf6d97e24056 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 09:01:47 +0200
Subject: [PATCH 18/29] remove check that would ensure you use jingle only with
 full jids

---
 .../xmpp/jingle/AbstractJingleConnection.java              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
index 679a30abe..bd50a22a2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
@@ -16,10 +16,10 @@ public abstract class AbstractJingleConnection {
     public static final String JINGLE_MESSAGE_PROPOSE_ID_PREFIX = "jm-propose-";
     public static final String JINGLE_MESSAGE_PROCEED_ID_PREFIX = "jm-proceed-";
 
-    protected final JingleConnectionManager jingleConnectionManager;
+    final JingleConnectionManager jingleConnectionManager;
     protected final XmppConnectionService xmppConnectionService;
     protected final Id id;
-    protected final Jid initiator;
+    private final Jid initiator;
 
     AbstractJingleConnection(final JingleConnectionManager jingleConnectionManager, final Id id, final Jid initiator) {
         this.jingleConnectionManager = jingleConnectionManager;
@@ -47,8 +47,9 @@ public abstract class AbstractJingleConnection {
         public final String sessionId;
 
         private Id(final Account account, final Jid with, final String sessionId) {
+            Preconditions.checkNotNull(account);
             Preconditions.checkNotNull(with);
-            Preconditions.checkArgument(with.isFullJid());
+            Preconditions.checkNotNull(sessionId);
             this.account = account;
             this.with = with;
             this.sessionId = sessionId;

From c3b9a4dabcbc24e96e429ee4533e0e164ce48e50 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 10:34:40 +0200
Subject: [PATCH 19/29] parse jmi proposals from MAM reloads. fixes #3778

---
 .../conversations/parser/MessageParser.java   | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 37cf7ed33..991fea547 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -836,6 +836,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                 for (Element child : packet.getChildren()) {
                     if (Namespace.JINGLE_MESSAGE.equals(child.getNamespace()) && JINGLE_MESSAGE_ELEMENT_NAMES.contains(child.getName())) {
                         final String action = child.getName();
+                        final String sessionId = child.getAttribute("id");
+                            if (sessionId == null) {
+                                break;
+                            }
                         if (query == null) {
                             if (serverMsgId == null) {
                                 serverMsgId = extractStanzaId(account, packet);
@@ -845,10 +849,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                 processMessageReceipts(account, packet, query);
                             }
                         } else if (query.isCatchup()) {
-                            final String sessionId = child.getAttribute("id");
-                            if (sessionId == null) {
-                                break;
-                            }
                             if ("propose".equals(action)) {
                                 final Element description = child.findChild("description");
                                 final String namespace = description == null ? null : description.getNamespace();
@@ -872,7 +872,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                     c.add(message);
                                     mXmppConnectionService.databaseBackend.createMessage(message);
                                 }
-
                             } else if ("proceed".equals(action)) {
                                 //status needs to be flipped to find the original propose
                                 final Conversation c = mXmppConnectionService.findOrCreateConversation(account, counterpart.asBareJid(), false, false);
@@ -890,6 +889,37 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                 }
 
                             }
+                        } else {
+                            //MAM reloads (non catchups
+                            if ("propose".equals(action)) {
+                                final Element description = child.findChild("description");
+                                final String namespace = description == null ? null : description.getNamespace();
+                                if (Namespace.JINGLE_APPS_RTP.equals(namespace)) {
+                                    final Conversation c = mXmppConnectionService.findOrCreateConversation(account, counterpart.asBareJid(), false, false);
+                                    final Message preExistingMessage = c.findRtpSession(sessionId, status);
+                                    if (preExistingMessage != null) {
+                                        preExistingMessage.setServerMsgId(serverMsgId);
+                                        mXmppConnectionService.updateMessage(preExistingMessage);
+                                        break;
+                                    }
+                                    final Message message = new Message(
+                                            c,
+                                            status,
+                                            Message.TYPE_RTP_SESSION,
+                                            sessionId
+                                    );
+                                    message.setServerMsgId(serverMsgId);
+                                    message.setTime(timestamp);
+                                    message.setBody(new RtpSessionStatus(true, 0).toString());
+                                    if (query.getPagingOrder() == MessageArchiveService.PagingOrder.REVERSE) {
+                                        c.prepend(query.getActualInThisQuery(), message);
+                                    } else {
+                                        c.add(message);
+                                    }
+                                    query.incrementActualMessageCount();
+                                    mXmppConnectionService.databaseBackend.createMessage(message);
+                                }
+                            }
                         }
                         break;
                     }

From 16bc210211bd8c31e1466bb3a13a4b976d852eb6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 11:28:25 +0200
Subject: [PATCH 20/29] fix regression for fixed domain

---
 src/main/java/eu/siacs/conversations/utils/AccountUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/utils/AccountUtils.java b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java
index 09b65f694..a324b242e 100644
--- a/src/main/java/eu/siacs/conversations/utils/AccountUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java
@@ -39,7 +39,7 @@ public class AccountUtils {
         for (Account account : service.getAccounts()) {
             if (account.getStatus() != Account.State.DISABLED) {
                 if (Config.DOMAIN_LOCK != null) {
-                    accounts.add(account.getJid().toEscapedString());
+                    accounts.add(account.getJid().getEscapedLocal());
                 } else {
                     accounts.add(account.getJid().asBareJid().toEscapedString());
                 }

From 61aac78af0c4b84df09b0ac9e41c0a9fa00d3cba Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 14:29:40 +0200
Subject: [PATCH 21/29] pulled translations from transifex

---
 src/main/res/values-de/strings.xml     | 2 ++
 src/main/res/values-es/strings.xml     | 2 ++
 src/main/res/values-gl/strings.xml     | 2 ++
 src/main/res/values-pl/strings.xml     | 2 ++
 src/main/res/values-ro-rRO/strings.xml | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f35175a36..e6dccaa8d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -901,6 +901,7 @@
   <string name="rtp_state_ringing">Klingelt</string>
   <string name="rtp_state_declined_or_busy">Besetzt</string>
   <string name="rtp_state_connectivity_error">Verbindungsaufbau fehlgeschlagen</string>
+  <string name="rtp_state_connectivity_lost_error">Verbindung unterbrochen</string>
   <string name="rtp_state_retracted">Anruf zurückgenommen</string>
   <string name="rtp_state_application_failure">App-Fehler</string>
   <string name="hang_up">Auflegen</string>
@@ -914,6 +915,7 @@
   <string name="missed_call">Entgangener Anruf</string>
   <string name="audio_call">Audioanruf</string>
   <string name="video_call">Videoanruf</string>
+  <string name="help">Hilfe</string>
   <string name="microphone_unavailable">Dein Mikrofon ist nicht verfügbar</string>
   <string name="only_one_call_at_a_time">Du kannst immer nur einen Anruf zur gleichen Zeit machen.</string>
   <string name="return_to_ongoing_call">Zurück zum laufenden Aufruf</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index adff37f82..7bada1588 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -901,6 +901,7 @@
   <string name="rtp_state_ringing">Llamando</string>
   <string name="rtp_state_declined_or_busy">Ocupado</string>
   <string name="rtp_state_connectivity_error">No se ha podido realizar la llamada</string>
+  <string name="rtp_state_connectivity_lost_error">Conexión perdida</string>
   <string name="rtp_state_retracted">Llamada rechazada</string>
   <string name="rtp_state_application_failure">Fallo en la aplicación</string>
   <string name="hang_up">Colgar</string>
@@ -914,6 +915,7 @@
   <string name="missed_call">Llamada perdida</string>
   <string name="audio_call">Audio llamada</string>
   <string name="video_call">Video llamada</string>
+  <string name="help">Ayuda</string>
   <string name="microphone_unavailable">Tu micrófono no está disponible</string>
   <string name="only_one_call_at_a_time">Solo puedes hacer una llamada a la vez</string>
   <string name="return_to_ongoing_call">Volver a la llamada en curso</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index c11373e9e..50b85e6bb 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -901,6 +901,7 @@
   <string name="rtp_state_ringing">Sonando</string>
   <string name="rtp_state_declined_or_busy">Ocupado</string>
   <string name="rtp_state_connectivity_error">Non se pode establecer a chamada</string>
+  <string name="rtp_state_connectivity_lost_error">Perdeuse a conexión</string>
   <string name="rtp_state_retracted">Chamada cortada</string>
   <string name="rtp_state_application_failure">Fallo na aplicación</string>
   <string name="hang_up">Colgar</string>
@@ -914,6 +915,7 @@
   <string name="missed_call">Chamada perdida</string>
   <string name="audio_call">Chamada de audio</string>
   <string name="video_call">Chamada de vídeo</string>
+  <string name="help">Axuda</string>
   <string name="microphone_unavailable">O micrófono non está dispoñible</string>
   <string name="only_one_call_at_a_time">Só podes manter unha chamada en cada momento.</string>
   <string name="return_to_ongoing_call">Voltar á chamada activa</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 119f063bf..6ade662c9 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -919,6 +919,7 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="rtp_state_ringing">Dzwonienie</string>
   <string name="rtp_state_declined_or_busy">Zajęty</string>
   <string name="rtp_state_connectivity_error">Nie można wykonać połączenia</string>
+  <string name="rtp_state_connectivity_lost_error">Utracono połączenie</string>
   <string name="rtp_state_retracted">Anulowane połączenie</string>
   <string name="rtp_state_application_failure">Błąd aplikacji</string>
   <string name="hang_up">Rozłącz</string>
@@ -932,6 +933,7 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="missed_call">Nieodebrane połączenie</string>
   <string name="audio_call">Połączenie audio</string>
   <string name="video_call">Połączenie wideo</string>
+  <string name="help">Pomoc</string>
   <string name="microphone_unavailable">Twój mikrofon jest niedostępny</string>
   <string name="only_one_call_at_a_time">Możesz mieć tylko jedno połączenie na raz.</string>
   <string name="return_to_ongoing_call">Powróć do trwającego połączenia</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index bd12f4b79..b25555ea3 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -909,6 +909,7 @@
   <string name="rtp_state_ringing">Sună</string>
   <string name="rtp_state_declined_or_busy">Ocupat</string>
   <string name="rtp_state_connectivity_error">Nu s-a putut conecta apelul</string>
+  <string name="rtp_state_connectivity_lost_error">Conexiune pierdută</string>
   <string name="rtp_state_retracted">Apel anulat</string>
   <string name="rtp_state_application_failure">Eroare de aplicație</string>
   <string name="hang_up">Închide</string>
@@ -922,6 +923,7 @@
   <string name="missed_call">Apel pierdut</string>
   <string name="audio_call">Apel audio</string>
   <string name="video_call">Apel video</string>
+  <string name="help">Ajutor</string>
   <string name="microphone_unavailable">Microfonul nu este disponibil</string>
   <string name="only_one_call_at_a_time">Puteți avea un singur apel simultan.</string>
   <string name="return_to_ongoing_call">Reveniți la apelul în curs</string>

From 1f77d5e1152976321a3bdbe8843992f8cb061bb1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 16:22:53 +0200
Subject: [PATCH 22/29] pass selected audio device to proximity sensor toggle

---
 .../eu/siacs/conversations/ui/RtpSessionActivity.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index a11f5b053..23a743eda 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -280,9 +280,9 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             this.mProximityWakeLock = null;
         }
     }
-
-    private void putProximityWakeLockInProperState() {
-        if (requireRtpConnection().getAudioManager().getSelectedAudioDevice() == AppRTCAudioManager.AudioDevice.EARPIECE) {
+    
+    private void putProximityWakeLockInProperState(final AppRTCAudioManager.AudioDevice audioDevice) {
+        if (audioDevice == AppRTCAudioManager.AudioDevice.EARPIECE) {
             acquireProximityWakeLock();
         } else {
             releaseProximityWakeLock();
@@ -1037,7 +1037,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             } else if (END_CARD.contains(endUserState)) {
                 Log.d(Config.LOGTAG, "onAudioDeviceChanged() nothing to do because end card has been reached");
             } else {
-                putProximityWakeLockInProperState();
+                putProximityWakeLockInProperState(selectedAudioDevice);
             }
         } catch (IllegalStateException e) {
             Log.d(Config.LOGTAG, "RTP connection was not available when audio device changed");

From 20286ea8d2a1917fe2316b729c005aac6a210483 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 19:09:55 +0200
Subject: [PATCH 23/29] fixed concurrent modification when displaying read
 markers

---
 src/main/java/eu/siacs/conversations/entities/Message.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 44b8db691..44f7588f8 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -7,6 +7,7 @@ import android.text.SpannableStringBuilder;
 import android.util.Log;
 
 import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
 
 import org.json.JSONException;
 
@@ -534,7 +535,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 	}
 
 	public Set<ReadByMarker> getReadByMarkers() {
-		return Collections.unmodifiableSet(this.readByMarkers);
+		return ImmutableSet.copyOf(this.readByMarkers);
 	}
 
 	boolean similar(Message message) {

From 38b2764c81ccd91cb348f8b9aa66d508ece7b28d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 14 Jun 2020 19:11:03 +0200
Subject: [PATCH 24/29] version bump to 2.8.7-beta.2

---
 CHANGELOG.md | 1 +
 build.gradle | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278897e61..ce7f4430e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Show help button if A/V call fails
 * Fixed some annoying crashes
+* Fixed Jingle connections (file transfer + calls) with bare JIDs
 
 ### Version 2.8.6
 
diff --git a/build.gradle b/build.gradle
index ce5bbd157..de399f4f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 391
-        versionName "2.8.7-beta"
+        versionCode 392
+        versionName "2.8.7-beta.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId

From d823cefe47109571e73932a276c0e2fbeed5f699 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Jun 2020 12:40:43 +0200
Subject: [PATCH 25/29] pulled translations from transifex

---
 src/main/res/values-de/strings.xml | 2 +-
 src/main/res/values-it/strings.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e6dccaa8d..eea90eeac 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -41,7 +41,7 @@
   <string name="moderator">Moderator</string>
   <string name="participant">Teilnehmer</string>
   <string name="visitor">Besucher</string>
-  <string name="remove_contact_text">Möchtest du  %svon deiner Kontaktliste entfernen? Unterhaltungen mit diesem Kontakt werden dabei nicht entfernt.</string>
+  <string name="remove_contact_text">Möchtest du  %s von deiner Kontaktliste entfernen? Unterhaltungen mit diesem Kontakt werden dabei nicht entfernt.</string>
   <string name="block_contact_text">Möchtest du %s sperren und keine Nachrichten mehr erhalten?</string>
   <string name="unblock_contact_text">Möchtest du %s entsperren und wieder Nachrichten empfangen?</string>
   <string name="block_domain_text">Alle Kontakte von %s sperren?</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 526e662d2..c2d1d7d88 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -901,6 +901,7 @@
   <string name="rtp_state_ringing">Sta squillando</string>
   <string name="rtp_state_declined_or_busy">Occupato</string>
   <string name="rtp_state_connectivity_error">Impossibile connettere la chiamata</string>
+  <string name="rtp_state_connectivity_lost_error">Connessione persa</string>
   <string name="rtp_state_retracted">Chiamata ritirata</string>
   <string name="rtp_state_application_failure">Errore dell\'app</string>
   <string name="hang_up">Riaggancia</string>
@@ -914,6 +915,7 @@
   <string name="missed_call">Chiamata persa</string>
   <string name="audio_call">Chiamata vocale</string>
   <string name="video_call">Chiamata video</string>
+  <string name="help">Aiuto</string>
   <string name="microphone_unavailable">Il tuo microfono non è disponibile</string>
   <string name="only_one_call_at_a_time">Puoi fare solo una chiamata alla volta.</string>
   <string name="return_to_ongoing_call">Torna alla chiamata in corso</string>

From 98e1044bddde162e47944d1c969884cdf14a0d98 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Jun 2020 19:17:21 +0200
Subject: [PATCH 26/29] use Jid.ofLocalAndDomainEscaped when transforming
 account with locked domain

---
 .../eu/siacs/conversations/ui/ChannelDiscoveryActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
index c0b97759d..398be7f68 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
@@ -263,7 +263,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
     }
 
     public void joinChannelSearchResult(String selectedAccount, Room result) {
-        final Jid jid = Config.DOMAIN_LOCK == null ? Jid.ofEscaped(selectedAccount) : Jid.ofEscaped(selectedAccount, Config.DOMAIN_LOCK, null);
+        final Jid jid = Config.DOMAIN_LOCK == null ? Jid.ofEscaped(selectedAccount) : Jid.ofLocalAndDomainEscaped(selectedAccount, Config.DOMAIN_LOCK);
         final boolean syncAutoJoin = getBooleanPreference("autojoin", R.bool.autojoin);
         final Account account = xmppConnectionService.findAccountByJid(jid);
         final Conversation conversation = xmppConnectionService.findOrCreateConversation(account, result.getRoom(), true, true, true);

From c8f23aef4edc0d4da82eb0e9ed95ebc7b88e64bf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Jun 2020 21:33:32 +0200
Subject: [PATCH 27/29] error response to sending the jingle ft hash should not
 file the transfer

---
 .../jingle/JingleFileTransferConnection.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
index 0cab56279..408635f93 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
@@ -200,7 +200,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
         }
     };
 
-    public JingleFileTransferConnection(JingleConnectionManager jingleConnectionManager, Id id, Jid initiator) {
+    JingleFileTransferConnection(JingleConnectionManager jingleConnectionManager, Id id, Jid initiator) {
         super(jingleConnectionManager, id, initiator);
     }
 
@@ -630,10 +630,14 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
 
         final JinglePacket packet = this.bootstrapPacket(JinglePacket.Action.SESSION_INFO);
         packet.addJingleChild(checksum);
-        this.sendJinglePacket(packet);
+        xmppConnectionService.sendIqPacket(id.account, packet, (account, response) -> {
+            if (response.getType() == IqPacket.TYPE.ERROR) {
+                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ignoring error response to our session-info (hash transmission)");
+            }
+        });
     }
 
-    public Collection<JingleCandidate> getOurCandidates() {
+    private Collection<JingleCandidate> getOurCandidates() {
         return Collections2.filter(this.candidates, c -> c != null && c.isOurs());
     }
 
@@ -1019,7 +1023,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
         abort(Reason.CANCEL);
     }
 
-    void abort(final Reason reason) {
+    private void abort(final Reason reason) {
         this.disconnectSocks5Connections();
         if (this.transport instanceof JingleInBandTransport) {
             this.transport.disconnect();
@@ -1163,7 +1167,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
         }
     }
 
-    public int getJingleStatus() {
+    private int getJingleStatus() {
         return this.mJingleStatus;
     }
 
@@ -1206,11 +1210,11 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
         jingleConnectionManager.updateConversationUi(false);
     }
 
-    public String getTransportId() {
+    String getTransportId() {
         return this.transportId;
     }
 
-    public FileTransferDescription.Version getFtVersion() {
+    FileTransferDescription.Version getFtVersion() {
         return this.description.getVersion();
     }
 

From 23c4a264045c27212a7a76eca7a2a248d29416f3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 16 Jun 2020 10:16:25 +0200
Subject: [PATCH 28/29] pulled translations from transifex

---
 src/main/res/values-sv/strings.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index cf936ef56..affc4780d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -3,6 +3,7 @@
   <string name="action_settings">Inställningar</string>
   <string name="action_add">Ny konversation</string>
   <string name="action_accounts">Kontoinställningar</string>
+  <string name="action_account">Hantera konto</string>
   <string name="action_end_conversation">Stäng denna konversation</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_muc_details">Gruppchattdetaljer</string>
@@ -34,18 +35,20 @@
   <string name="message_decrypting">Avkrypterar meddelande. Vänta…</string>
   <string name="pgp_message">OpenPGP-krypterat meddelande</string>
   <string name="nick_in_use">Nick används redan</string>
-  <string name="invalid_muc_nick">Ogiltigt nick</string>
+  <string name="invalid_muc_nick">Ogiltigt smeknamn</string>
   <string name="admin">Admin</string>
   <string name="owner">Ägare</string>
   <string name="moderator">Moderator</string>
   <string name="participant">Deltagare</string>
   <string name="visitor">Besökare</string>
+  <string name="remove_contact_text">Vill du ta bort %s från din kontaktlista? Konversationer med denna kontakt kommer inte tas bort.</string>
   <string name="block_contact_text">Vill du blockera %s från att skicka dig meddelanden?</string>
   <string name="unblock_contact_text">Vill du avblockera %s och tillåta denne att skicka dig meddelanden?</string>
   <string name="block_domain_text">Blockera alla kontakter från %s?</string>
   <string name="unblock_domain_text">Avblockera alla kontakter från %s?</string>
   <string name="contact_blocked">Kontakt blockerad</string>
   <string name="blocked">Blockerad</string>
+  <string name="remove_bookmark_text">Vill du ta bort %s som ett bokmärke? Konversationer med detta bokmärke kommer inte tas bort.</string>
   <string name="register_account">Registrera nytt konto på servern</string>
   <string name="change_password_on_server">Byt lösenord på server</string>
   <string name="share_with">Dela med…</string>
@@ -66,9 +69,13 @@
   <string name="crash_report_title">Conversations har kraschat</string>
   <string name="send_now">Skicka nu</string>
   <string name="send_never">Fråga aldrig igen</string>
+  <string name="problem_connecting_to_account">Kunde inte ansluta till konto</string>
+  <string name="problem_connecting_to_accounts">Kunde inte ansluta till flera konton</string>
   <string name="attach_file">Bifoga fil</string>
   <string name="add_contact">Lägg till kontakt</string>
   <string name="send_failed">sändning misslyckades</string>
+  <string name="preparing_image">Förbereder att skicka bild</string>
+  <string name="preparing_images">Förbereder att skicka bilder</string>
   <string name="sharing_files_please_wait">Delar filer. Vänta...</string>
   <string name="action_clear_history">Rensa historik</string>
   <string name="clear_conversation_history">Rensa konversationshistorik</string>
@@ -81,6 +88,7 @@
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
   <string name="send_omemo_x509_message">Skicka v\\OMEMO-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
+  <string name="your_nick_has_been_changed">Nytt smeknamn används</string>
   <string name="send_unencrypted">Skicka okrypterat</string>
   <string name="decryption_failed">Avkryptering misslyckades. Du har kanske kanske inte rätt privat nyckel.</string>
   <string name="openkeychain_required">OpenKeychain</string>
@@ -304,6 +312,7 @@
   <string name="ban_now">Bannlys nu</string>
   <string name="could_not_change_role">Kunde inte ändra rollen för %s</string>
   <string name="members_only">Privat, medlemsskap krävs</string>
+  <string name="non_anonymous">Gör XMPP-adresser synliga för alla</string>
   <string name="you_are_not_participating">Du deltar ej</string>
   <string name="never">Aldrig</string>
   <string name="until_further_notice">Tills vidare</string>
@@ -389,6 +398,8 @@
     <item quantity="other">%d meddelanden</item>
   </plurals>
   <string name="load_more_messages">Ladda fler meddelanden</string>
+  <string name="no_storage_permission">Ge Conversations tillgång till extern lagring</string>
+  <string name="no_camera_permission">Ge Conversations tillgång till kameran</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
@@ -442,6 +453,7 @@
   <string name="allow">Tillåt</string>
   <string name="no_permission_to_access_x">Saknar rättigheter för access till %s</string>
   <string name="remote_server_not_found">Fjärrserver hittas inte</string>
+  <string name="unable_to_update_account">Kunde inte uppdatera konto</string>
   <string name="pref_delete_omemo_identities">Ta bort OMEMO identiteter</string>
   <string name="delete_selected_keys">Ta bort valda nycklar</string>
   <string name="error_publish_avatar_offline">Du måste vara ansluten för att publicera din avatarbild</string>
@@ -451,6 +463,7 @@
   <string name="device_does_not_support_data_saver">Din enhet stödjer inte att deaktivera databesparing för Conversations.</string>
   <string name="this_device_has_been_verified">Denna enhet har verifierats</string>
   <string name="copy_fingerprint">Kopiera fingeravtryck</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Streckkoden innehåller inte fingeravtryck för denna konversation.</string>
   <string name="verified_fingerprints">Verifierade fingeravtryck</string>
   <string name="use_camera_icon_to_scan_barcode">Använd kameran för att scanna en kontakts streckkod</string>
   <string name="please_wait_for_keys_to_be_fetched">Vänta medans nycklar hämtas</string>
@@ -554,6 +567,7 @@
   <string name="ebook">e-bok</string>
   <string name="open_with">Öppna med...</string>
   <string name="choose_account">Välj konto</string>
+  <string name="enter_password_to_restore">Ange ditt lösenord till kontot %s för att återställa säkerhetskopian.</string>
   <string name="create_group_chat">Skapa gruppchatt</string>
   <string name="create_private_group_chat">Skapa sluten gruppchatt</string>
   <string name="create_dialog_channel_name">Kanalnamn</string>
@@ -576,5 +590,7 @@
   <string name="this_looks_like_a_domain">Detta verkar vara ett domännamn</string>
   <string name="add_anway">Lägg till ändå</string>
   <string name="this_looks_like_channel">Detta ser ut som en kanaladress</string>
+  <string name="not_a_backup_file">Filen du valde är inte en säkerhetskopia till Conversations</string>
   <string name="category_about">Om</string>
+  <string name="please_enable_an_account">Aktivera ett konto</string>
 </resources>

From 9649ba16b5bf24709e342eff0af820f24c1771db Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 16 Jun 2020 10:22:48 +0200
Subject: [PATCH 29/29] version bump to 2.8.7

---
 build.gradle                                       | 4 ++--
 fastlane/metadata/android/en-US/changelogs/394.txt | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/394.txt

diff --git a/build.gradle b/build.gradle
index de399f4f9..eef177a04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 392
-        versionName "2.8.7-beta.2"
+        versionCode 393
+        versionName "2.8.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/394.txt b/fastlane/metadata/android/en-US/changelogs/394.txt
new file mode 100644
index 000000000..82250ee87
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/394.txt
@@ -0,0 +1,3 @@
+* Show help button if A/V call fails
+* Fixed some annoying crashes
+* Fixed Jingle connections (file transfer + calls) with bare JIDs