Fixed message model to work with retrofit and image loading.

Removed poorly styled code, accidental revert on httprequest.

.

Author: koziodigitalinc

.gitignore

@@ -1,6 +1,5 @@
 gen/
 bin/
-build.gradle
 /res/raw/ormlite_config.txt
 .settings
 *-sources.jar

app/src/main/java/com/zulip/android/models/Message.java

@@ -38,7 +38,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -58,7 +57,6 @@ public class Message {
     public static final String MESSAGE_READ_FIELD = "read";
     private static final String MESSAGE_EDITED = "MESSAGE_EDITED";
     private static final String MESSAGE_EDIT_DATE = "MESSAGE_EDIT_DATE";
-    private Map<String, Drawable> cachedImages = new HashMap<>(1);
 
     //region fields
     @SerializedName("recipient_id")
@@ -143,9 +141,6 @@ public class Message {
     //IGNORE - This will always be empty due to persistence
     @SerializedName("edit_history")
     public List<MessageHistory> _history;
-
-    //endregion
-
     //endregion
 
     /**
@@ -488,14 +483,6 @@ public Void call() throws Exception {
 
     }
 
-    /**
-     * Used to notify an outside observer if the state of a message has changed... e.g. offthread loaded images.
-     * @param runnable
-     */
-    public void setValueChangedPromise(Runnable runnable){
-        this.promise = runnable;
-    }
-
     public String concatStreamAndTopic() {
         return getStream().getId() + getSubject();
     }
@@ -510,8 +497,6 @@ public String getIdForHolder() {
     private static final HTMLSchema schema = new HTMLSchema();
 
     public Spanned getFormattedContent(ZulipApp app) {
-//        if(getContent() != null && getContent().contains("<img"))
-
         Spanned formattedMessage = formatContent(getFormattedContent(),
                 app);
 

app/src/main/java/com/zulip/android/networking/HTTPRequest.java

@@ -57,14 +57,22 @@ void clearProperties() {
 
     void abort() {
         aborting = true;
-        if (response != null) {
-            (new AsyncTask<Void, Void, Void>() {
-                @Override
-                protected Void doInBackground(Void... voids) {
-                    response.body().close();
-                    return null;
-                }
-            }).execute();
+        synchronized (synchronization) {
+            if (response != null) {
+                final Response finalResponse = response;
+                response = null;
+                (new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... voids) {
+                        try {
+                            finalResponse.body().close();
+                        } catch (IllegalStateException e) {
+                            //fail silently
+                        }
+                        return null;
+                    }
+                }).execute();
+            }
         }
     }
 

build.gradle

@@ -8,7 +8,6 @@ buildscript {
         classpath 'com.google.gms:google-services:2.1.0'
     }
 }
-project.ext.fabricKey = "";
 
 allprojects {
     repositories {