Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get versionName from AndroidManifest.xml, remove duplicate strings field

Browse Source 
No need to have the version set it more than one place!
This commit is contained in:
Hans-Christoph Steiner 2015-05-07 15:51:09 -04:00
parent e543895940
commit c23d4e1988
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
F-Droid/res/values/donottranslate.xml
View File

@ -2,7 +2,6 @@
<resources> <resources>
<string name="app_name">F-Droid</string> <string name="app_name">F-Droid</string>
<string name="version_name">0.88</string>
<string name="about_sitec">https://f-droid.org</string> <string name="about_sitec">https://f-droid.org</string>
<string name="about_mailc">team@f-droid.org</string> <string name="about_mailc">team@f-droid.org</string>

9
F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java
View File

@ -1,6 +1,7 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.FDroidApp;
@ -109,7 +110,13 @@ public class SignedRepoUpdater extends RepoUpdater {
@Override @Override
protected String getIndexAddress() { protected String getIndexAddress() {
return repo.address + "/index.jar?client_version=" + context.getString(R.string.version_name); try {
String versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
return repo.address + "/index.jar?client_version=" + versionName;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
return repo.address + "/index.jar";
} }
/** /**