fix networkimageview url verification

apptik · Mar 21, 2016 · 7743ad0 · 7743ad0
1 parent 00d005e
commit 7743ad0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/android/jus-android/src/main/java/io/apptik/comm/jus/ui/NetworkImageView.java b/android/jus-android/src/main/java/io/apptik/comm/jus/ui/NetworkImageView.java
@@ -185,7 +185,8 @@ public void onError(JusError error) {
                     @Override
                     public void onResponse(final ImageContainer response, boolean isImmediate) {
                         //verify if we expect the same url
-                        if (NetworkImageView.this.mUrl != response.getRequestUrl()) {
+                        if (NetworkImageView.this.mUrl == null ||
+                                !NetworkImageView.this.mUrl.equals(response.getRequestUrl())) {
                             Log.w("NetworkImageView", "received: " + response.getRequestUrl()
                                     + ", expected: " + NetworkImageView.this.mUrl);
                             return;
@@ -226,7 +227,7 @@ public void run() {
      */
     protected static boolean isOk2Draw(Bitmap bitmap) {
         //ignore this if bitmap is null.
-        if(bitmap==null) return true;
+        if (bitmap == null) return true;
 
         if (bitmap.isRecycled()) {
             return false;