Load icons on main thread (#2536)

Only reason to offload icon loading to background thread is to avoid
supposed network on main thread calls which happen only in debug since
icons are passed loaded from localhost.

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -13,11 +13,13 @@ import java.util.List;
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
 	private ReactGateway reactGateway;
+	public static NavigationApplication instance;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		reactGateway = new ReactGateway(this, isDebug(), createAdditionalReactPackages());
+        instance = this;
+        reactGateway = new ReactGateway(this, isDebug(), createAdditionalReactPackages());
 	}
 
 	public ReactGateway getReactGateway() {

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -23,8 +23,8 @@ public class OptionsPresenter {
     }
 
     public void applyOptions(Options options) {
-        applyTopBarOptions(options.topBarOptions);
         applyButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
+        applyTopBarOptions(options.topBarOptions);
         applyTopTabsOptions(options.topTabsOptions);
         applyTopTabOptions(options.topTabOptions);
     }

lib/android/app/src/main/java/com/reactnativenavigation/utils/ImageUtils.java

@@ -8,7 +8,11 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.StrictMode;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
+import com.reactnativenavigation.NavigationApplication;
+
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -21,46 +25,45 @@ public class ImageUtils {
 		void onError(Throwable error);
 	}
 
-	public static void tryLoadIcon(final Context context, final String uri, final ImageLoadingListener listener) {
-		if (uri == null) {
-			if (listener != null) {
-				listener.onError(new IllegalArgumentException("Uri is null"));
-			}
-			return;
-		}
-		runWorkerThread(new Runnable() {
-			@Override
-			public void run() {
-				loadIcon(context, uri, listener);
-			}
-		});
-	}
+	public static void loadIcon(final Context context, final String uri, final ImageLoadingListener listener) {
+        try {
+            StrictMode.ThreadPolicy threadPolicy = adjustThreadPolicyDebug();
+            
+            InputStream is = openStream(context, uri);
+            Bitmap bitmap = BitmapFactory.decodeStream(is);
+            Drawable drawable = new BitmapDrawable(context.getResources(), bitmap);
+            listener.onComplete(drawable);
 
-	private static void loadIcon(Context context, String uri, final ImageLoadingListener listener) {
-		try {
-			InputStream is = null;
-			if (uri.contains("http")) {
-				URL url = new URL(uri);
-				is = url.openStream();
-			} else {
-				is = context.getContentResolver().openInputStream(Uri.parse(uri));
-			}
+            restoreThreadPolicyDebug(threadPolicy);
+        } catch (IOException e) {
+            listener.onError(e);
+        }
+    }
 
-			Bitmap bitmap = BitmapFactory.decodeStream(is);
-			Drawable drawable = new BitmapDrawable(context.getResources(), bitmap);
-			if (listener != null) {
-				listener.onComplete(drawable);
-			}
-		} catch (IOException e) {
-			if (listener != null) {
-				listener.onError(e);
-			} else {
-				e.printStackTrace();
-			}
-		}
-	}
+    private static StrictMode.ThreadPolicy adjustThreadPolicyDebug() {
+        StrictMode.ThreadPolicy threadPolicy = null;
+        if (NavigationApplication.instance.isDebug()) {
+            threadPolicy = StrictMode.getThreadPolicy();
+            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().permitNetwork().build());
+        }
+        return threadPolicy;
+    }
 
-	private static void runWorkerThread(Runnable runnable) {
-		new Thread(runnable).start();
-	}
+    private static void restoreThreadPolicyDebug(@Nullable StrictMode.ThreadPolicy threadPolicy) {
+        if (NavigationApplication.instance.isDebug() && threadPolicy != null) {
+            StrictMode.setThreadPolicy(threadPolicy);
+        }
+    }
+
+    private static InputStream openStream(Context context, String uri) throws IOException {
+        return uri.contains("http") ? remoteUrl(uri) : localFile(context, uri);
+    }
+
+    private static InputStream remoteUrl(String uri) throws IOException {
+        return new URL(uri).openStream();
+    }
+
+    private static InputStream localFile(Context context, String uri) throws FileNotFoundException {
+        return context.getContentResolver().openInputStream(Uri.parse(uri));
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java

@@ -57,39 +57,33 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 			return;
 		}
 
-		ImageUtils.tryLoadIcon(context, button.icon.get(), new ImageUtils.ImageLoadingListener() {
+		ImageUtils.loadIcon(context, button.icon.get(), new ImageUtils.ImageLoadingListener() {
 			@Override
 			public void onComplete(@NonNull Drawable drawable) {
 				icon = drawable;
-				UiUtils.runOnMainThread(() -> {
-                    setIconColor();
-                    setNavigationClickListener();
-                    toolbar.setNavigationIcon(icon);
-                });
+                setIconColor();
+                setNavigationClickListener();
+                toolbar.setNavigationIcon(icon);
 			}
 
 			@Override
 			public void onError(Throwable error) {
-				//TODO: handle
 				error.printStackTrace();
 			}
 		});
 	}
 
 	private void applyIcon(Context context, final MenuItem menuItem) {
-		ImageUtils.tryLoadIcon(context, button.icon.get(), new ImageUtils.ImageLoadingListener() {
+		ImageUtils.loadIcon(context, button.icon.get(), new ImageUtils.ImageLoadingListener() {
 			@Override
 			public void onComplete(@NonNull Drawable drawable) {
 				icon = drawable;
-				UiUtils.runOnMainThread(() -> {
-                    menuItem.setIcon(icon);
-                    setIconColor();
-                });
+                menuItem.setIcon(icon);
+                setIconColor();
 			}
 
 			@Override
 			public void onError(Throwable error) {
-				//TODO: handle
 				error.printStackTrace();
 			}
 		});