From 586c30b3831fa23666f6367a34b131d807694750 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Mar 2014 02:35:42 -0500 Subject: [PATCH] Remove a totally pointless null comparison in MainActivity.java. Also kill off a case where null literally won't happen in FileBrowser.java. --- .../src/com/reicast/emulator/FileBrowser.java | 15 ++++++--------- .../src/com/reicast/emulator/MainActivity.java | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/shell/android/src/com/reicast/emulator/FileBrowser.java b/shell/android/src/com/reicast/emulator/FileBrowser.java index 69ed5178e..c31bc7423 100644 --- a/shell/android/src/com/reicast/emulator/FileBrowser.java +++ b/shell/android/src/com/reicast/emulator/FileBrowser.java @@ -293,21 +293,18 @@ public class FileBrowser extends Fragment { private void createListItem(LinearLayout list, final File game) { final String name = game.getName(); + final String nameLower = name.toLowerCase(Locale.getDefault()); final View childview = parentActivity.getLayoutInflater().inflate( R.layout.app_list_item, null, false); ((TextView) childview.findViewById(R.id.item_name)).setText(name); ((ImageView) childview.findViewById(R.id.item_icon)) - .setImageResource(game == null ? R.drawable.config : game - .isDirectory() ? R.drawable.open_folder - : name.toLowerCase(Locale.getDefault()) - .endsWith(".gdi") ? R.drawable.gdi : name - .toLowerCase(Locale.getDefault()).endsWith( - ".cdi") ? R.drawable.cdi : name - .toLowerCase(Locale.getDefault()).endsWith( - ".chd") ? R.drawable.chd - : R.drawable.disk_unknown); + .setImageResource(game.isDirectory() ? R.drawable.open_folder + : nameLower.endsWith(".gdi") ? R.drawable.gdi + : nameLower.endsWith(".cdi") ? R.drawable.cdi + : nameLower.endsWith(".chd") ? R.drawable.chd + : R.drawable.disk_unknown); childview.setTag(name); diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java index 594d3ad95..5115ba2cd 100644 --- a/shell/android/src/com/reicast/emulator/MainActivity.java +++ b/shell/android/src/com/reicast/emulator/MainActivity.java @@ -60,7 +60,7 @@ public class MainActivity extends SlidingFragmentActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.mainuilayout_fragment); - setBehindContentView(R.layout.drawer_menu); + setBehindContentView(R.layout.drawer_menu); mPrefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -71,7 +71,7 @@ public class MainActivity extends SlidingFragmentActivity implements } String prior_error = mPrefs.getString("prior_error", null); - if (prior_error != null && !prior_error.equals(null)) { + if (prior_error != null) { displayLogOutput(prior_error); mPrefs.edit().remove("prior_error").commit(); } else {