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

Merge commit 'refs/merge-requests/6' of git://gitorious.org/f-droid/fdroidclient into merge-requests/6

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-10-11 13:49:46 +01:00
commit 1fd7fa835c
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -124,6 +124,8 @@
<string name="antinonfreeadlong">Show apps that promote non-free add-ons</string>
<string name="antinonfreenet">Network Services</string>
<string name="antinonfreenetlong">Show apps that promote non-free network services</string>
<string name="antinonfreedep">Dependencies</string>
<string name="antinonfreedeplong">Show apps that depend on other non-free apps</string>
<string name="expert">Expert</string>
<string name="expert_mode">Enable expert mode</string>

3
res/xml/preferences.xml
View File

@ -32,6 +32,9 @@
<CheckBoxPreference android:title="@string/antinonfreenet"
android:defaultValue="false" android:summary="@string/antinonfreenetlong"
android:key="antiNonFreeNet" />
<CheckBoxPreference android:title="@string/antinonfreedep"
android:defaultValue="false" android:summary="@string/antinonfreedeplong"
android:key="antiNonFreeDep" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/appcompatibility">
<CheckBoxPreference android:title="@string/showincompat"

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

@ -472,6 +472,7 @@ public class DB {
boolean pref_antiTracking = prefs.getBoolean("antiTracking", false);
boolean pref_antiNonFreeAdd = prefs.getBoolean("antiNonFreeAdd", false);
boolean pref_antiNonFreeNet = prefs.getBoolean("antiNonFreeNet", false);
boolean pref_antiNonFreeDep = prefs.getBoolean("antiNonFreeDep", false);
boolean pref_showIncompat = prefs.getBoolean("showIncompatible", false);
boolean pref_rooted = prefs.getBoolean("rooted", true);
@ -509,6 +510,9 @@ public class DB {
else if (af.equals("NonFreeAdd")
&& !pref_antiNonFreeAdd)
include = false;
else if (af.equals("NonFreeDep")
&& !pref_antiNonFreeDep)
include = false;
}
}
app.requirements = DB.CommaSeparatedList.make(c