diff --git a/shell/android/res/layout/about_fragment.xml b/shell/android/res/layout/about_fragment.xml index 2db297a1c..4c806fb71 100755 --- a/shell/android/res/layout/about_fragment.xml +++ b/shell/android/res/layout/about_fragment.xml @@ -15,6 +15,16 @@ android:ems="12" android:gravity="center" android:text="@string/about_text" /> + + MOGA Pro Connected! MOGA Connected! - reicast is a dreamcast emulator\n\nVersion: %1$s + reicast is a dreamcast emulator + Version: %1$s [%2$s] Homepage: http://reicast.com Betas: http://reicast.loungekatt.com https://api.github.com/repos/reicast/reicast-emulator/commits diff --git a/shell/android/src/com/reicast/emulator/AboutFragment.java b/shell/android/src/com/reicast/emulator/AboutFragment.java index 3976291c2..7c967c18e 100644 --- a/shell/android/src/com/reicast/emulator/AboutFragment.java +++ b/shell/android/src/com/reicast/emulator/AboutFragment.java @@ -100,6 +100,7 @@ public class AboutFragment extends Fragment { private ListView list; private GitAdapter adapter; private Handler handler; + String buildId = ""; private Activity parentActivity; @@ -114,15 +115,33 @@ public class AboutFragment extends Fragment { public void onViewCreated(View view, Bundle savedInstanceState) { parentActivity = getActivity(); handler = new Handler(); + + try { + InputStream file = parentActivity.getAssets().open("build"); + if (file != null) { + BufferedReader reader = new BufferedReader( + new InputStreamReader(file)); + buildId = reader.readLine(); + file.close(); + } + } catch (IOException ioe) { + ioe.printStackTrace(); + } + try { String versionName = parentActivity.getPackageManager() .getPackageInfo(parentActivity.getPackageName(), 0).versionName; int versionCode = parentActivity.getPackageManager() .getPackageInfo(parentActivity.getPackageName(), 0).versionCode; TextView version = (TextView) getView().findViewById( - R.id.about_text); - version.setText(parentActivity.getString(R.string.about_text, - versionName + "(" + String.valueOf(versionCode) + ")")); + R.id.revision_text); + String revision = parentActivity.getString(R.string.revision_text, + versionName, String.valueOf(versionCode)); + if (!buildId.equals("")) { + revision = parentActivity.getString(R.string.revision_text, + versionName, buildId); + } + version.setText(revision); } catch (NameNotFoundException e) { e.printStackTrace(); } @@ -155,21 +174,9 @@ public class AboutFragment extends Fragment { public class retrieveGitTask extends AsyncTask>> { - private String buildId = ""; - @Override protected void onPreExecute() { - try { - InputStream file = parentActivity.getAssets().open("build"); - if (file != null) { - BufferedReader reader = new BufferedReader( - new InputStreamReader(file)); - buildId = reader.readLine(); - file.close(); - } - } catch (IOException ioe) { - ioe.printStackTrace(); - } + } @Override