diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader index 66042fe4a..1c2a91e46 160000 --- a/extern/Universal-Image-Loader +++ b/extern/Universal-Image-Loader @@ -1 +1 @@ -Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28 +Subproject commit 1c2a91e464b49874068a8bf2a6e39d39aae9208a diff --git a/media/README b/media/README new file mode 100644 index 000000000..64cec334c --- /dev/null +++ b/media/README @@ -0,0 +1,4 @@ +Most of the SVG files found in here are in the Inkscape format You should +convert them to plain SVG with Inkscape if you would like to use them in a +website, for example. Depending on the viewer/browser, the resulting look of +the SVG might differ. diff --git a/res/values-bg/array.xml b/res/values-bg/array.xml index ce46f3cf1..d7738bcf9 100644 --- a/res/values-bg/array.xml +++ b/res/values-bg/array.xml @@ -7,6 +7,10 @@ През 12 часа Всеки ден + + Dark + Light + Изключено (опасно) Нормално diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 96924eb7e..213e2b4b8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -48,6 +48,9 @@ Die Adresse einer Paketquelle sieht etwa so aus: https://f-droid.org/repoPaketquelle hinzufügen Hinzufügen Abbrechen + Aktivieren + Schlüssel hinzufügen + Überschreiben Zu entfernende Paketquelle auswählen Paketquellen aktualisieren Installiert @@ -60,6 +63,12 @@ Die Adresse einer Paketquelle sieht etwa so aus: https://f-droid.org/repoAnwendungsliste wird aktualisiert … Anwendung wird heruntergeladen von Adresse der Paketquelle + Fingerabdruck (optional) + Diese Paketquelle existiert bereits! + Diese Paketquelle ist bereits eingerichtet, dieses wird neue Schlüsselinformationen hinzuzufügen. + Diese Paketquelle ist bereits eingerichtet, bestätigen, dass Sie diese wieder aktivieren möchten. + Die eingehende Paketquelle ist bereits eingerichtet und aktiviert! + Sie müssen zuerst diese Paketquelle löschen, bevor Sie eine mit einem anderen Schlüssel hinzuzufügen! Die Liste der genutzten Paketquellen hat sich geändert. Sollen diese aktualisiert werden? Paketquellen aktualisieren @@ -69,7 +78,7 @@ Sollen diese aktualisiert werden? Suchen Paketquelle hinzufügen Paketquelle entfernen - Ausführen + Starten Empfehlen Installieren Entfernen @@ -89,6 +98,7 @@ Sollen diese aktualisiert werden? Diese Anwendung bewirbt nicht freie Erweiterungen Diese Anwendung bewirbt nicht freie Netzwerkdienste Diese Anwendung hängt ab von nicht freien Anwendungen + Der Originalcode ist nicht völlig frei Anzeige Experte Expertenmodus einschalten diff --git a/res/values-eo/array.xml b/res/values-eo/array.xml index c818014f5..fface9219 100644 --- a/res/values-eo/array.xml +++ b/res/values-eo/array.xml @@ -2,5 +2,18 @@ Neniam + Hourly + Every 4 Hours + Every 12 Hours + Daily + + + Dark + Light + + + Off (unsafe) + Normal + Full diff --git a/res/values-eu/array.xml b/res/values-eu/array.xml index 678ceeedd..80e6b4251 100644 --- a/res/values-eu/array.xml +++ b/res/values-eu/array.xml @@ -7,6 +7,10 @@ 12 orduero Egunero + + Dark + Light + Itzalita (ez da segurua) Normala diff --git a/res/values-gu/array.xml b/res/values-gu/array.xml index 188c56e92..42eac981d 100644 --- a/res/values-gu/array.xml +++ b/res/values-gu/array.xml @@ -7,6 +7,10 @@ દર 12 કલાકે દરરોજ + + Dark + Light + બંધ (અસુરક્ષિત) સામાન્ય diff --git a/res/values-pl/array.xml b/res/values-pl/array.xml index 84993164b..61ff85ad2 100644 --- a/res/values-pl/array.xml +++ b/res/values-pl/array.xml @@ -7,6 +7,10 @@ Co 12 godzin Codziennie + + Dark + Light + Wyłączone (niebezpieczne) Normalny diff --git a/res/values-ro/array.xml b/res/values-ro/array.xml index 02edbf5b4..d8e58ad04 100644 --- a/res/values-ro/array.xml +++ b/res/values-ro/array.xml @@ -7,6 +7,10 @@ La 12 ore Zilnic + + Dark + Light + Inchis (nerecomandat) Normal diff --git a/res/values-ru/array.xml b/res/values-ru/array.xml index d2ccd082d..13a7defd0 100644 --- a/res/values-ru/array.xml +++ b/res/values-ru/array.xml @@ -7,6 +7,10 @@ Каждые 12 часов Ежедневно + + Dark + Light + Откл. (опасно) Обычный diff --git a/res/values-sl/array.xml b/res/values-sl/array.xml index 87071f1db..ba22674f8 100644 --- a/res/values-sl/array.xml +++ b/res/values-sl/array.xml @@ -7,6 +7,10 @@ Vsakih 12 ur Dnevno + + Dark + Light + Izključeno (ni varno) Običajno diff --git a/res/values-sr/array.xml b/res/values-sr/array.xml index 1b0f443c4..0a0c851a6 100644 --- a/res/values-sr/array.xml +++ b/res/values-sr/array.xml @@ -7,6 +7,10 @@ Сваких 12 сати Једном Дневно + + Dark + Light + Искључено (није безбедно) Нормално diff --git a/res/values-uk/array.xml b/res/values-uk/array.xml index 0841599e0..0d43d54c8 100644 --- a/res/values-uk/array.xml +++ b/res/values-uk/array.xml @@ -7,6 +7,10 @@ Кожні 12 годин Щодня + + Dark + Light + Ніколи (небезпечно) Типово diff --git a/res/values-zh-rCN/array.xml b/res/values-zh-rCN/array.xml index 34ce01989..120aefcf0 100644 --- a/res/values-zh-rCN/array.xml +++ b/res/values-zh-rCN/array.xml @@ -7,6 +7,10 @@ 每12个小时 每天 + + Dark + Light + 关闭(存在安全风险) 正常 diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java index 4ea973050..7d42b422c 100644 --- a/src/org/fdroid/fdroid/DB.java +++ b/src/org/fdroid/fdroid/DB.java @@ -47,6 +47,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.preference.PreferenceManager; import android.text.TextUtils.SimpleStringSplitter; +import android.util.DisplayMetrics; import android.util.Log; import org.fdroid.fdroid.compat.Compatibility; @@ -705,16 +706,8 @@ public class DB { } } - // Start the map at the actual number of apps we will have - Cursor c = db.rawQuery("select count(*) from "+TABLE_APP, null); - c.moveToFirst(); - int count = c.getInt(0); - c.close(); - c = null; - - Log.d("FDroid", "Will be fetching " + count + " apps, and this took us "); - - Map apps = new HashMap(count); + Map apps = new HashMap(); + Cursor c = null; long startTime = System.currentTimeMillis(); try { @@ -772,7 +765,7 @@ public class DB { c.close(); c = null; - Log.d("FDroid", "Read app data from database (took " + Log.d("FDroid", "Read app data from database " + " (took " + (System.currentTimeMillis() - startTime) + " ms)"); List repos = getRepos(); @@ -784,6 +777,25 @@ public class DB { c = db.query(TABLE_APK, cols, null, null, null, null, "vercode desc"); c.moveToFirst(); + + DisplayMetrics metrics = mContext.getResources() + .getDisplayMetrics(); + String iconsDir = null; + if (metrics.densityDpi >= 640) { + iconsDir = "/icons-640/"; + } else if (metrics.densityDpi >= 480) { + iconsDir = "/icons-480/"; + } else if (metrics.densityDpi >= 320) { + iconsDir = "/icons-320/"; + } else if (metrics.densityDpi >= 240) { + iconsDir = "/icons-240/"; + } else if (metrics.densityDpi >= 160) { + iconsDir = "/icons-160/"; + } else { + iconsDir = "/icons-120/"; + } + metrics = null; + while (!c.isAfterLast()) { String id = c.getString(0); App app = apps.get(id); @@ -811,11 +823,13 @@ public class DB { app.apks.add(apk); if (app.iconUrl == null && app.icon != null) { for (DB.Repo repo : repos) { - if (repo.id == repoid) { - app.iconUrl = - repo.address + "/icons/" + app.icon; - break; + if (repo.id != repoid) continue; + if (repo.version >= 11) { + app.iconUrl = repo.address + iconsDir + app.icon; + } else { + app.iconUrl = repo.address + "/icons/" + app.icon; } + break; } } c.moveToNext(); @@ -831,7 +845,7 @@ public class DB { c.close(); } - Log.d("FDroid", "Read app and apk data from database (took " + Log.d("FDroid", "Read app and apk data from database " + " (took " + (System.currentTimeMillis() - startTime) + " ms)"); } diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java index 300ce5074..ab06b5e20 100644 --- a/src/org/fdroid/fdroid/ManageRepo.java +++ b/src/org/fdroid/fdroid/ManageRepo.java @@ -151,7 +151,7 @@ public class ManageRepo extends ListActivity { DB.Repo repo = (DB.Repo)getListView().getItemAtPosition(position); editRepo(repo); - } + } private void refreshList() { repoAdapter.refresh(); diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java index 0ee545c98..72d71efd2 100644 --- a/src/org/fdroid/fdroid/SearchResults.java +++ b/src/org/fdroid/fdroid/SearchResults.java @@ -119,14 +119,11 @@ public class SearchResults extends ListActivity { TextView tv = (TextView) findViewById(R.id.description); String headertext; if (apps.size() == 0) { - headertext = String.format(getString(R.string.searchres_noapps), - mQuery); + headertext = getString(R.string.searchres_noapps, mQuery); } else if (apps.size() == 1) { - headertext = String.format(getString(R.string.searchres_oneapp), - mQuery); + headertext = getString(R.string.searchres_oneapp, mQuery); } else { - headertext = String.format(getString(R.string.searchres_napps), - apps.size(), mQuery); + headertext = getString(R.string.searchres_napps, apps.size(), mQuery); } tv.setText(headertext); Log.d("FDroid", "Search for '" + mQuery + "' returned " + apps.size()