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

simplify local repo XML writing and remove dead code

Browse Source 
This has a couple of things stuck in it that aren't really used at all,
like maxage.
This commit is contained in:
Hans-Christoph Steiner 2016-05-12 21:11:41 +02:00
parent de238f3f5f
commit 3ec206b152
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
View File

@ -1,7 +1,6 @@
package org.fdroid.fdroid.localrepo; package org.fdroid.fdroid.localrepo;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.AssetManager; import android.content.res.AssetManager;
@ -11,7 +10,6 @@ import android.graphics.Bitmap.Config;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
@ -65,9 +63,6 @@ import java.util.jar.JarOutputStream;
public final class LocalRepoManager { public final class LocalRepoManager {
private static final String TAG = "LocalRepoManager"; private static final String TAG = "LocalRepoManager";
// For ref, official F-droid repo presently uses a maxage of 14 days
private static final String DEFAULT_REPO_MAX_AGE_DAYS = "14";
private final Context context; private final Context context;
private final PackageManager pm; private final PackageManager pm;
private final AssetManager assetManager; private final AssetManager assetManager;
@ -354,43 +349,27 @@ public final class LocalRepoManager {
Writer output = new FileWriter(file); Writer output = new FileWriter(file);
serializer.setOutput(output); serializer.setOutput(output);
serializer.startDocument(null, null); serializer.startDocument(null, null);
tagFdroid();
serializer.endDocument();
output.close();
}
private void tagFdroid() throws IOException, LocalRepoKeyStore.InitException {
serializer.startTag("", "fdroid"); serializer.startTag("", "fdroid");
tagRepo();
for (Map.Entry<String, App> entry : apps.entrySet()) {
tagApplication(entry.getValue());
}
serializer.endTag("", "fdroid");
}
private void tagRepo() throws IOException, LocalRepoKeyStore.InitException {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
// max age is an EditTextPreference, which is always a String
// TODO: This pref is probably never being set. Also, why
// are we mixing floats and ints?
int repoMaxAge = Float.valueOf(prefs.getString("max_repo_age_days", DEFAULT_REPO_MAX_AGE_DAYS)).intValue(); // NOPMD
// <repo> block
serializer.startTag("", "repo"); serializer.startTag("", "repo");
serializer.attribute("", "icon", "blah.png"); serializer.attribute("", "icon", "blah.png");
serializer.attribute("", "maxage", String.valueOf(repoMaxAge));
serializer.attribute("", "name", Preferences.get().getLocalRepoName() + " on " + FDroidApp.ipAddressString); serializer.attribute("", "name", Preferences.get().getLocalRepoName() + " on " + FDroidApp.ipAddressString);
serializer.attribute("", "pubkey", Hasher.hex(LocalRepoKeyStore.get(context).getCertificate())); serializer.attribute("", "pubkey", Hasher.hex(LocalRepoKeyStore.get(context).getCertificate()));
long timestamp = System.currentTimeMillis() / 1000L; long timestamp = System.currentTimeMillis() / 1000L;
serializer.attribute("", "timestamp", String.valueOf(timestamp)); serializer.attribute("", "timestamp", String.valueOf(timestamp));
serializer.attribute("", "version", "10"); serializer.attribute("", "version", "10");
tag("description", "A local FDroid repo generated from apps installed on " + Preferences.get().getLocalRepoName()); tag("description", "A local FDroid repo generated from apps installed on " + Preferences.get().getLocalRepoName());
serializer.endTag("", "repo"); serializer.endTag("", "repo");
// <application> blocks
for (Map.Entry<String, App> entry : apps.entrySet()) {
tagApplication(entry.getValue());
}
serializer.endTag("", "fdroid");
serializer.endDocument();
output.close();
} }
/** /**