diff --git a/shell/android/src/com/reicast/emulator/FileBrowser.java b/shell/android/src/com/reicast/emulator/FileBrowser.java index 2004c5625..f0b121e17 100644 --- a/shell/android/src/com/reicast/emulator/FileBrowser.java +++ b/shell/android/src/com/reicast/emulator/FileBrowser.java @@ -290,7 +290,9 @@ public class FileBrowser extends Fragment { final View childview = parentActivity.getLayoutInflater().inflate( R.layout.app_list_item, null, false); - final XMLParser xmlParser = new XMLParser(game, index); + final boolean webInfo = mPrefs.getBoolean(Config.pref_gamedetails, true); + + final XMLParser xmlParser = new XMLParser(game, index, webInfo); xmlParser.setViewParent(parentActivity, childview); xmlParser.execute(game.getName()); @@ -302,7 +304,7 @@ public class FileBrowser extends Fragment { new OnClickListener() { public void onClick(View view) { vib.vibrate(50); - if (mPrefs.getBoolean(Config.pref_gamedetails, true)) { + if (webInfo) { final AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); builder.setCancelable(true); builder.setTitle(getString(R.string.game_details, diff --git a/shell/android/src/com/reicast/emulator/XMLParser.java b/shell/android/src/com/reicast/emulator/XMLParser.java index 5bfa3fc3a..c99337198 100755 --- a/shell/android/src/com/reicast/emulator/XMLParser.java +++ b/shell/android/src/com/reicast/emulator/XMLParser.java @@ -44,6 +44,7 @@ import android.widget.TextView; public class XMLParser extends AsyncTask { + private boolean webInfo; private File game; private int index; private View childview; @@ -55,11 +56,12 @@ public class XMLParser extends AsyncTask { public SparseArray game_details = new SparseArray(); public SparseArray game_preview = new SparseArray(); - public XMLParser(File game, int index) { + public XMLParser(File game, int index, boolean webInfo) { + this.webInfo = webInfo; this.game = game; this.index = index; } - + public void setViewParent(Context mContext, View childview) { this.mContext = mContext; this.childview = childview; @@ -111,31 +113,31 @@ public class XMLParser extends AsyncTask { @Override protected String doInBackground(String... params) { - if (isNetworkAvailable()) { - String filename = game_name = params[0]; - if (params[0].contains("[")) { - filename = params[0].substring(0, params[0].lastIndexOf("[")); - } else { - filename = params[0].substring(0, params[0].lastIndexOf(".")); - } - filename = filename.replace(" ", "+").replace("_", "+"); - if (filename.endsWith("+")) { - filename = filename.substring(0, filename.length() - 1); - } - try { - DefaultHttpClient httpClient = new DefaultHttpClient(); - HttpPost httpPost = new HttpPost(game_index + filename); + if (isNetworkAvailable() && webInfo) { + String filename = game_name = params[0]; + if (params[0].contains("[")) { + filename = params[0].substring(0, params[0].lastIndexOf("[")); + } else { + filename = params[0].substring(0, params[0].lastIndexOf(".")); + } + filename = filename.replace(" ", "+").replace("_", "+"); + if (filename.endsWith("+")) { + filename = filename.substring(0, filename.length() - 1); + } + try { + DefaultHttpClient httpClient = new DefaultHttpClient(); + HttpPost httpPost = new HttpPost(game_index + filename); - HttpResponse httpResponse = httpClient.execute(httpPost); - HttpEntity httpEntity = httpResponse.getEntity(); - return EntityUtils.toString(httpEntity); - } catch (UnsupportedEncodingException e) { + HttpResponse httpResponse = httpClient.execute(httpPost); + HttpEntity httpEntity = httpResponse.getEntity(); + return EntityUtils.toString(httpEntity); + } catch (UnsupportedEncodingException e) { - } catch (ClientProtocolException e) { + } catch (ClientProtocolException e) { - } catch (IOException e) { + } catch (IOException e) { - } + } } return null; } @@ -163,15 +165,17 @@ public class XMLParser extends AsyncTask { } } } else { - game_details.put(index, mContext.getString(R.string.info_unavailable)); - final String nameLower = game.getName().toLowerCase(Locale.getDefault()); + game_details.put(index, + mContext.getString(R.string.info_unavailable)); + final String nameLower = game.getName().toLowerCase( + Locale.getDefault()); game_icon = mContext.getResources().getDrawable( 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); - + } ((TextView) childview.findViewById(R.id.item_name)).setText(game_name);