FileBackend splitted into several util classes for separate concerns: AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.

1 files changed, 3 insertions, 7 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index bbe0d362..9ab7abf0 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -11,7 +11,6 @@ import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
-import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
@@ -34,6 +33,7 @@ import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.Message.FileParams;
+import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
 import de.thedevstack.conversationsplus.utils.GeoHelper;
 import de.thedevstack.conversationsplus.utils.UIHelper;
@@ -47,8 +47,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	private ConversationActivity activity;
 
-	private DisplayMetrics metrics;
-
 	private OnContactPictureClicked mOnContactPictureClickedListener;
 	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
 
@@ -64,7 +62,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
 		this.activity = activity;
-		metrics = getContext().getResources().getDisplayMetrics();
 	}
 
 	public void setOnContactPictureClicked(OnContactPictureClicked listener) {
@@ -363,8 +360,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setDataAndType(activity.xmppConnectionService
-                        .getFileBackend().getJingleFileUri(message), "image/*");
+                intent.setDataAndType(FileBackend.getJingleFileUri(message), "image/*");
                 getContext().startActivity(intent);
             }
         });
@@ -551,7 +547,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	}
 
 	public void openDownloadable(Message message) {
-		DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
+		DownloadableFile file = FileBackend.getFile(message);
 		if (!file.exists()) {
 			Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
 			return;