aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/utils/UIHelper.java
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
committerkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
commitc7088489bd339e4b8b5128e909a1b4377864a5c9 (patch)
tree56974ad74bfdb025a56e817b952221ce4f2dbbe6 /src/eu/siacs/conversations/utils/UIHelper.java
parent71324261e5560fa70ef028fba35bd121f2527578 (diff)
parentda79e2cca2ffce6e4e5c3b479c4de702ecca1872 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/utils/UIHelper.java')
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index f3f1d9e5..eeefa591 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -492,7 +492,7 @@ public class UIHelper {
public static AlertDialog getVerifyFingerprintDialog(
final ConversationActivity activity,
- final Conversation conversation, final LinearLayout msg) {
+ final Conversation conversation, final View msg) {
final Contact contact = conversation.getContact();
final Account account = conversation.getAccount();