cleanup; removed unnecessary imports and log outputs

13 files changed, 5 insertions, 41 deletions

diff --git a/src/eu/siacs/conversations/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java
index 5391e86a3..a0047cdf3 100644
--- a/src/eu/siacs/conversations/entities/Contact.java
+++ b/src/eu/siacs/conversations/entities/Contact.java
@@ -1,7 +1,6 @@
 package eu.siacs.conversations.entities;
 
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Set;
 
 import org.json.JSONArray;
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index e440b27cc..0d344c7fb 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -16,7 +16,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.util.Log;
 
 public class Conversation extends AbstractEntity {
 
diff --git a/src/eu/siacs/conversations/persistance/FileBackend.java b/src/eu/siacs/conversations/persistance/FileBackend.java
index 9d64c45fd..82a7a3f9a 100644
--- a/src/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/eu/siacs/conversations/persistance/FileBackend.java
@@ -8,8 +8,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.bouncycastle.crypto.engines.ISAACEngine;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java
index 9e9952bc2..0047513dd 100644
--- a/src/eu/siacs/conversations/ui/ContactsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactsActivity.java
@@ -18,7 +18,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 51fe6c5e2..ec9eccd0e 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -3,7 +3,6 @@ package eu.siacs.conversations.ui;
 import java.io.FileNotFoundException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 
 import eu.siacs.conversations.R;
diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java
index d1863f7e4..e1bcaeb5e 100644
--- a/src/eu/siacs/conversations/ui/EditAccount.java
+++ b/src/eu/siacs/conversations/ui/EditAccount.java
@@ -7,7 +7,6 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 5f96526a3..c52916a22 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -3,25 +3,19 @@ package eu.siacs.conversations.ui;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openintents.openpgp.OpenPgpError;
-
 import eu.siacs.conversations.R;
-import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.ui.EditAccount.EditAccountListener;
 import eu.siacs.conversations.xmpp.OnTLSExceptionReceived;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
index cb994137e..ee6709b75 100644
--- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
@@ -24,8 +24,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
diff --git a/src/eu/siacs/conversations/utils/CryptoHelper.java b/src/eu/siacs/conversations/utils/CryptoHelper.java
index 98dbea4de..ac189fc13 100644
--- a/src/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/eu/siacs/conversations/utils/CryptoHelper.java
@@ -10,7 +10,6 @@ import java.util.Random;
 import eu.siacs.conversations.entities.Account;
 
 import android.util.Base64;
-import android.util.Log;
 
 public class CryptoHelper {
 	final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 4ac61ca7f..f2c0962a3 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -17,7 +17,6 @@ import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -241,7 +240,7 @@ public class XmppConnection implements Runnable {
 				processStream(tagReader.readTag());
 				break;
 			} else if (nextTag.isStart("failure")) {
-				Element failure = tagReader.readElement(nextTag);
+				tagReader.readElement(nextTag);
 				changeStatus(Account.STATUS_UNAUTHORIZED);
 			} else if (nextTag.isStart("challenge")) {
 				String challange = tagReader.readElement(nextTag).getContent();
@@ -442,17 +441,14 @@ public class XmppConnection implements Runnable {
 
 	private void switchOverToTls(Tag currentTag) throws XmlPullParserException,
 			IOException {
-		Tag nextTag = tagReader.readTag(); // should be proceed end tag
+		tagReader.readTag();
 		try {
 			SSLContext sc = SSLContext.getInstance("TLS");
 			TrustManagerFactory tmf = TrustManagerFactory
 					.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-			// Initialise the TMF as you normally would, for example:
-			// tmf.in
 			try {
 				tmf.init((KeyStore) null);
 			} catch (KeyStoreException e1) {
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
 
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index 8326fa397..a46e4a477 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
@@ -8,12 +8,10 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 import android.util.Base64;
-import android.util.Log;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.PacketReceived;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
 public class JingleInbandTransport extends JingleTransport {
@@ -39,7 +37,6 @@ public class JingleInbandTransport extends JingleTransport {
 	private OnIqPacketReceived onAckReceived = new OnIqPacketReceived() {
 		@Override
 		public void onIqPacketReceived(Account account, IqPacket packet) {
-			Log.d("xmppService", "on ack received");
 			if (packet.getType() == IqPacket.TYPE_RESULT) {
 				sendNextBlock();
 			}
@@ -82,7 +79,6 @@ public class JingleInbandTransport extends JingleTransport {
 	public void receive(JingleFile file, OnFileTransmitted callback) {
 		this.onFileTransmitted = callback;
 		this.file = file;
-		Log.d("xmppService", "receiving file over ibb");
 		try {
 			this.digest = MessageDigest.getInstance("SHA-1");
 			digest.reset();
@@ -101,7 +97,6 @@ public class JingleInbandTransport extends JingleTransport {
 	public void send(JingleFile file, OnFileTransmitted callback) {
 		this.onFileTransmitted = callback;
 		this.file = file;
-		Log.d("xmppService", "sending file over ibb");
 		try {
 			this.digest = MessageDigest.getInstance("SHA-1");
 			this.digest.reset();
@@ -151,10 +146,8 @@ public class JingleInbandTransport extends JingleTransport {
 			this.fileOutputStream.write(buffer);
 
 			this.digest.update(buffer);
-			Log.d("xmppService", "remaining file size:" + this.remainingSize);
 			if (this.remainingSize <= 0) {
 				file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-				Log.d("xmppService","file name: "+file.getAbsolutePath());
 				fileOutputStream.flush();
 				fileOutputStream.close();
 				this.onFileTransmitted.onFileTransmitted(file);
@@ -179,7 +172,7 @@ public class JingleInbandTransport extends JingleTransport {
 			this.account.getXmppConnection().sendIqPacket(
 					packet.generateRespone(IqPacket.TYPE_RESULT), null);
 		} else {
-			Log.d("xmppServic","couldnt deliver payload "+packet.toString());
+			//TODO some sort of exception
 		}
 	}
 }
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index ea5d7285f..0f2d4caef 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -13,10 +13,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.xml.Element;
-
-import android.util.Log;
-import android.widget.Button;
 
 public class JingleSocks5Transport extends JingleTransport {
 	private JingleCandidate candidate;
@@ -150,13 +146,12 @@ public class JingleSocks5Transport extends JingleTransport {
 					byte[] buffer = new byte[8192];
 					int count = buffer.length;
 					while(remainingSize > 0) {
-						Log.d("xmppService","remaning size:"+remainingSize);
 						if (remainingSize<=count) {
 							count = (int) remainingSize;
 						}
 						count = inputStream.read(buffer, 0, count);
 						if (count==-1) {
-							Log.d("xmppService","end of stream");
+							// TODO throw exception
 						} else {
 							fileOutputStream.write(buffer, 0, count);
 							digest.update(buffer, 0, count);
@@ -166,7 +161,6 @@ public class JingleSocks5Transport extends JingleTransport {
 					fileOutputStream.flush();
 					fileOutputStream.close();
 					file.setSha1Sum(CryptoHelper.bytesToHex(digest.digest()));
-					Log.d("xmppService","transmitted filename was: "+file.getAbsolutePath());
 					callback.onFileTransmitted(file);
 				} catch (FileNotFoundException e) {
 					// TODO Auto-generated catch block
@@ -194,9 +188,8 @@ public class JingleSocks5Transport extends JingleTransport {
 		if (this.socket!=null) {
 			try {
 				this.socket.close();
-				Log.d("xmppService","cloesd socket with "+candidate.getHost()+":"+candidate.getPort());
 			} catch (IOException e) {
-				Log.d("xmppService","error closing socket with "+candidate.getHost()+":"+candidate.getPort());
+				
 			}
 		}
 	}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
index 6e9482a9a..290bb5d38 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
@@ -1,7 +1,5 @@
 package eu.siacs.conversations.xmpp.jingle;
 
-import eu.siacs.conversations.xml.Element;
-
 public abstract class JingleTransport {
 	public abstract void connect(final OnTransportConnected callback);
 	public abstract void receive(final JingleFile file, final OnFileTransmitted callback);