From e8337aad308ecab66391f20210bbce072d47c779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 08:54:02 +0100 Subject: [PATCH 1/8] Revert "getApps(): Start Map size with the number of apps we have" This reverts commit 21747dcf408bef108187588c5ba8b8d72c4b34dc. --- src/org/fdroid/fdroid/DB.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java index 4485ef21b..208e144b0 100644 --- a/src/org/fdroid/fdroid/DB.java +++ b/src/org/fdroid/fdroid/DB.java @@ -810,16 +810,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 { @@ -877,7 +869,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(); @@ -936,7 +928,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)"); } From 9e30d442e15d336b68ae7bbe4f45a3834c1d612b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 09:13:00 +0100 Subject: [PATCH 2/8] Add README specifying that the svg files are from inkscape --- media/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 media/README diff --git a/media/README b/media/README new file mode 100644 index 000000000..351841d62 --- /dev/null +++ b/media/README @@ -0,0 +1,3 @@ +Most of the SVG files found in here are in the Inkscape format, i.e. they +might need conversion to plain SVG if you plan to use them on web pages, for +example. If that is not done, the renders might look different. From 72c2a6a942d5259944ec30c6d8284a21e8b1af20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 09:37:58 +0100 Subject: [PATCH 3/8] README fix; Plain SVG doesn't fix possible rendering issues --- media/README | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media/README b/media/README index 351841d62..64cec334c 100644 --- a/media/README +++ b/media/README @@ -1,3 +1,4 @@ -Most of the SVG files found in here are in the Inkscape format, i.e. they -might need conversion to plain SVG if you plan to use them on web pages, for -example. If that is not done, the renders might look different. +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. From 34211bb1b7f4374b39026c73d070161cd0777910 Mon Sep 17 00:00:00 2001 From: F-Droid Translatebot Date: Tue, 7 Jan 2014 16:13:48 +0000 Subject: [PATCH 4/8] Translation updates --- res/values-bg/array.xml | 4 ++++ res/values-de/strings.xml | 12 +++++++++++- res/values-en-rGB/array.xml | 19 +++++++++++++++++++ res/values-en-rGB/strings.xml | 8 ++++++++ res/values-eo/array.xml | 13 +++++++++++++ res/values-eu/array.xml | 4 ++++ res/values-gu/array.xml | 4 ++++ res/values-pl/array.xml | 4 ++++ res/values-ro/array.xml | 4 ++++ res/values-ru/array.xml | 4 ++++ res/values-sl/array.xml | 4 ++++ res/values-sr/array.xml | 4 ++++ res/values-uk/array.xml | 4 ++++ res/values-zh-rCN/array.xml | 4 ++++ 14 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 res/values-en-rGB/array.xml create mode 100644 res/values-en-rGB/strings.xml 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-en-rGB/array.xml b/res/values-en-rGB/array.xml new file mode 100644 index 000000000..e4b629278 --- /dev/null +++ b/res/values-en-rGB/array.xml @@ -0,0 +1,19 @@ + + + + Nigdy + Hourly + Every 4 Hours + Every 12 Hours + Daily + + + Dark + Light + + + Off (unsafe) + Normal + Full + + diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml new file mode 100644 index 000000000..9d75613ee --- /dev/null +++ b/res/values-en-rGB/strings.xml @@ -0,0 +1,8 @@ + + + Powiadom gdy będDroid Fire + Historia aktualizacji + Email: + Wersja: + Co nowego + 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 + 关闭(存在安全风险) 正常 From a2fb86f51857d16ac1984cc9ef2bf3236b641747 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 7 Jan 2014 16:28:10 +0000 Subject: [PATCH 5/8] Remove bogus translations --- extern/Universal-Image-Loader | 2 +- res/values-en-rGB/array.xml | 19 ------------------- res/values-en-rGB/strings.xml | 8 -------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 res/values-en-rGB/array.xml delete mode 100644 res/values-en-rGB/strings.xml diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader index 75ea56004..4aec20347 160000 --- a/extern/Universal-Image-Loader +++ b/extern/Universal-Image-Loader @@ -1 +1 @@ -Subproject commit 75ea560049c9a256ca4fba0a70de1971aa852612 +Subproject commit 4aec203474927e98ef6da4d0f04e6e98e6d082ab diff --git a/res/values-en-rGB/array.xml b/res/values-en-rGB/array.xml deleted file mode 100644 index e4b629278..000000000 --- a/res/values-en-rGB/array.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Nigdy - Hourly - Every 4 Hours - Every 12 Hours - Daily - - - Dark - Light - - - Off (unsafe) - Normal - Full - - diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml deleted file mode 100644 index 9d75613ee..000000000 --- a/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - Powiadom gdy będDroid Fire - Historia aktualizacji - Email: - Wersja: - Co nowego - From 3d66f7f3113bddefc3776e938b29587b4c6758f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 17:45:57 +0100 Subject: [PATCH 6/8] Pull UIL from master again --- extern/Universal-Image-Loader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader index 4aec20347..1c2a91e46 160000 --- a/extern/Universal-Image-Loader +++ b/extern/Universal-Image-Loader @@ -1 +1 @@ -Subproject commit 4aec203474927e98ef6da4d0f04e6e98e6d082ab +Subproject commit 1c2a91e464b49874068a8bf2a6e39d39aae9208a From 9709b4f51cbcc2e2be52828c86341223cb4fe22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 17:50:36 +0100 Subject: [PATCH 7/8] No need to use String.format explicitly --- src/org/fdroid/fdroid/SearchResults.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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() From d3686de3cdc381cace7a6884eada98bc01e929cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 7 Jan 2014 18:23:26 +0100 Subject: [PATCH 8/8] Support /icons-* per-density icon folders (repo version 11) --- src/org/fdroid/fdroid/DB.java | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java index 208e144b0..87998eb9c 100644 --- a/src/org/fdroid/fdroid/DB.java +++ b/src/org/fdroid/fdroid/DB.java @@ -46,6 +46,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.preference.PreferenceManager; import android.text.TextUtils.SimpleStringSplitter; +import android.util.DisplayMetrics; import android.util.Log; import org.fdroid.fdroid.compat.Compatibility; @@ -881,6 +882,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); @@ -908,11 +928,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();