sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #448 from betheg/add_break 

add a forgotten break and remove some unused imports
This commit is contained in:
Daniel Gultsch 2014-09-19 10:32:40 +02:00
parent 96e2dfa246 b9e7f4870c
commit 8796af22d1
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/crypto/OtrEngine.java
View File

@ -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 {

1
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -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;

1
src/eu/siacs/conversations/ui/SettingsActivity.java
View File

@ -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;

2
src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

@ -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<Message> {
case Message.STATUS_RECEPTION_FAILED:
info = getContext().getString(R.string.reception_failed);
error = true;
break;
default:
if (multiReceived) {
Contact contact = message.getContact();