Replace readBitmap callbacks with method references as don't need executing on UI Thread

mythz · mythz · commit 35c7f618d92f · 2017-03-22T23:49:58.000-04:00
diff --git a/src/androidchat/app/src/main/java/servicestack/net/androidchat/App.java b/src/androidchat/app/src/main/java/servicestack/net/androidchat/App.java
@@ -24,11 +24,6 @@ public class App extends Application {
     private SharedPreferences prefs;
     private AndroidServerEventsClient serverEventsClient;
     private static App instance;
-    private LruCache bitmapCache = new LruCache(4 * 1024 * 1024) {// 4MiB
-        protected int sizeOf(String key, Bitmap value) {
-            return value.getByteCount();
-        }
-    };
 
     public App() {}
 
@@ -99,6 +94,12 @@ public void logout(){
         editor.apply();
     }
 
+    private LruCache bitmapCache = new LruCache(4 * 1024 * 1024) {// 4MiB
+        protected int sizeOf(String key, Bitmap value) {
+            return value.getByteCount();
+        }
+    };
+
     public void readBitmap(final String url, final AsyncSuccess<Bitmap> success){
         Bitmap cachedBitmap = (Bitmap)bitmapCache.get(url);
         if (cachedBitmap != null){
@@ -110,9 +111,7 @@ public void readBitmap(final String url, final AsyncSuccess<Bitmap> success){
             bitmapCache.put(url, imageBitmap);
             success.success(imageBitmap);
         },
-        error -> {
-            error.printStackTrace();
-        });
+        Throwable::printStackTrace);
     }
 
 }
diff --git a/src/androidchat/app/src/main/java/servicestack/net/androidchat/ChatCommandHandler.java b/src/androidchat/app/src/main/java/servicestack/net/androidchat/ChatCommandHandler.java
@@ -128,10 +128,8 @@ public void changeBackground(String message)
             ? message.substring(4, message.length() - 1)
             : message;
 
-        App.get().readBitmap(url, bitmap -> {
-            ImageView chatBackground = (ImageView)parentActivity.findViewById(R.id.chat_background);
-            parentActivity.runOnUiThread(() -> chatBackground.setImageBitmap(bitmap));
-        });
+        ImageView chatBackground = (ImageView)parentActivity.findViewById(R.id.chat_background);
+        App.get().readBitmap(url, chatBackground::setImageBitmap);
     }
 
     public void changeBackgroundColor(String message, String cssSelector){
diff --git a/src/androidchat/app/src/main/java/servicestack/net/androidchat/Extensions.java b/src/androidchat/app/src/main/java/servicestack/net/androidchat/Extensions.java
@@ -65,10 +65,8 @@ public static void updateUserProfile(ServerEventConnect connectMsg, MainActivity
             TextView txtUser = (TextView)activity.findViewById(R.id.txtUserName);
             txtUser.setText(connectMsg.getDisplayName());
 
-            App.get().readBitmap(connectMsg.getProfileUrl(), bitmap -> {
-                ImageView imgProfile = (ImageView)activity.findViewById(R.id.imgProfile);
-                imgProfile.setImageBitmap(bitmap);
-            });
+            ImageView imgProfile = (ImageView)activity.findViewById(R.id.imgProfile);
+            App.get().readBitmap(connectMsg.getProfileUrl(), imgProfile::setImageBitmap);
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,8 @@ public static void updateUserProfile(ServerEventConnect connectMsg, MainActivity`
`65`	`65`	`TextView txtUser = (TextView)activity.findViewById(R.id.txtUserName);`
`66`	`66`	`txtUser.setText(connectMsg.getDisplayName());`
`67`	`67`
`68`		`- App.get().readBitmap(connectMsg.getProfileUrl(), bitmap -> {`
`69`		`- ImageView imgProfile = (ImageView)activity.findViewById(R.id.imgProfile);`
`70`		`- imgProfile.setImageBitmap(bitmap);`
`71`		`- });`
	`68`	`+ ImageView imgProfile = (ImageView)activity.findViewById(R.id.imgProfile);`
	`69`	`+ App.get().readBitmap(connectMsg.getProfileUrl(), imgProfile::setImageBitmap);`
`72`	`70`	`});`
`73`	`71`	`}`
`74`	`72`	`}`