Merge pull request #1298 from kiwix/feature/macgills/#1297-real-version-code

#1297 Read VersionCode from Manifest
This commit is contained in:
Seán Mac Gillicuddy 2019-07-23 10:05:32 +01:00 committed by GitHub
commit f6b31dba56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,6 +21,7 @@ package org.kiwix.kiwixmobile.settings;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
@ -229,11 +230,16 @@ public class KiwixSettingsActivity extends BaseActivity {
} }
private void setAppVersionNumber() { private void setAppVersionNumber() {
String version; EditTextPreference versionPref = (EditTextPreference) findPreference(PREF_VERSION);
version = BuildConfig.VERSION_NAME + " Build: " + BuildConfig.VERSION_CODE; versionPref.setSummary(BuildConfig.VERSION_NAME + " Build: " + getVersionCode());
EditTextPreference versionPref = (EditTextPreference) PrefsFragment.this }
.findPreference(PREF_VERSION);
versionPref.setSummary(version); private int getVersionCode() {
try {
return getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionCode;
} catch (PackageManager.NameNotFoundException e) {
throw new RuntimeException(e);
}
} }
@Override @Override