From b9e7f4870ca94e70c1072a9f3d28419184090471 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 13 Sep 2014 21:15:45 +0200 Subject: add a forgotten break and remove some unused imports --- src/eu/siacs/conversations/crypto/OtrEngine.java | 4 ---- src/eu/siacs/conversations/ui/ConversationActivity.java | 1 - src/eu/siacs/conversations/ui/SettingsActivity.java | 1 - src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src') diff --git a/src/eu/siacs/conversations/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java index 5dfd6fd6..e0bd0e79 100644 --- a/src/eu/siacs/conversations/crypto/OtrEngine.java +++ b/src/eu/siacs/conversations/crypto/OtrEngine.java @@ -18,8 +18,6 @@ import android.util.Log; import eu.siacs.conversations.Config; import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.xmpp.stanzas.MessagePacket; @@ -29,8 +27,6 @@ import net.java.otr4j.OtrPolicy; import net.java.otr4j.OtrPolicyImpl; import net.java.otr4j.session.InstanceTag; import net.java.otr4j.session.SessionID; -import net.java.otr4j.session.SessionImpl; -import net.java.otr4j.session.SessionStatus; public class OtrEngine implements OtrEngineHost { diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 40ad0f33..f58b4ddd 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -16,7 +16,6 @@ import eu.siacs.conversations.utils.UIHelper; import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; -import android.preference.PreferenceManager; import android.provider.MediaStore; import android.app.ActionBar; import android.app.AlertDialog; diff --git a/src/eu/siacs/conversations/ui/SettingsActivity.java b/src/eu/siacs/conversations/ui/SettingsActivity.java index 6b280719..c522e058 100644 --- a/src/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/eu/siacs/conversations/ui/SettingsActivity.java @@ -2,7 +2,6 @@ package eu.siacs.conversations.ui; import java.util.Locale; -import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index db01eabe..876fbfe7 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -11,7 +11,6 @@ import eu.siacs.conversations.entities.Downloadable; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.ui.ConversationActivity; import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.jingle.JingleConnection; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; @@ -129,6 +128,7 @@ public class MessageAdapter extends ArrayAdapter { case Message.STATUS_RECEPTION_FAILED: info = getContext().getString(R.string.reception_failed); error = true; + break; default: if (multiReceived) { Contact contact = message.getContact(); -- cgit v1.2.3