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

Replace HashSet types with Set

Browse Source
This commit is contained in:
Daniel Martí 2014-01-29 01:02:03 +01:00
parent 50ee88fbc7
commit 510e8e1ba5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/fdroid/fdroid/DB.java
View File

@ -30,6 +30,7 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.Formatter; import java.util.Formatter;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -325,8 +326,8 @@ public class DB {
// check if an APK is compatible with the user's device. // check if an APK is compatible with the user's device.
private static class CompatibilityChecker extends Compatibility { private static class CompatibilityChecker extends Compatibility {
private HashSet<String> features; private Set<String> features;
private HashSet<String> cpuAbis; private Set<String> cpuAbis;
private String cpuAbisDesc; private String cpuAbisDesc;
private boolean ignoreTouchscreen; private boolean ignoreTouchscreen;

11
src/org/fdroid/fdroid/compat/SupportedArchitectures.java
View File

@ -1,5 +1,6 @@
package org.fdroid.fdroid.compat; package org.fdroid.fdroid.compat;
import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
import android.annotation.TargetApi; import android.annotation.TargetApi;
@ -8,21 +9,21 @@ import android.os.Build;
public class SupportedArchitectures extends Compatibility { public class SupportedArchitectures extends Compatibility {
private static HashSet<String> getOneAbi() { private static Set<String> getOneAbi() {
HashSet<String> abis = new HashSet<String>(1); Set<String> abis = new HashSet<String>(1);
abis.add(Build.CPU_ABI); abis.add(Build.CPU_ABI);
return abis; return abis;
} }
@TargetApi(8) @TargetApi(8)
private static HashSet<String> getTwoAbis() { private static Set<String> getTwoAbis() {
HashSet<String> abis = new HashSet<String>(2); Set<String> abis = new HashSet<String>(2);
abis.add(Build.CPU_ABI); abis.add(Build.CPU_ABI);
abis.add(Build.CPU_ABI2); abis.add(Build.CPU_ABI2);
return abis; return abis;
} }
public static HashSet<String> getAbis() { public static Set<String> getAbis() {
if (hasApi(8)) return getTwoAbis(); if (hasApi(8)) return getTwoAbis();
return getOneAbi(); return getOneAbi();
} }