diff --git a/extern/Universal-Image-Loader b/extern/Universal-Image-Loader index 75ea56004..66042fe4a 160000 --- a/extern/Universal-Image-Loader +++ b/extern/Universal-Image-Loader @@ -1 +1 @@ -Subproject commit 75ea560049c9a256ca4fba0a70de1971aa852612 +Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28 diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java index 415feffef..0f9dcac7f 100644 --- a/src/org/fdroid/fdroid/DB.java +++ b/src/org/fdroid/fdroid/DB.java @@ -719,6 +719,10 @@ public class DB { if (oldVersion < 30) { db.execSQL("alter table " + TABLE_REPO + " add column maxage integer not null default 0"); } + + if (oldVersion < 33) { + db.execSQL("alter table " + TABLE_REPO + " add column version integer not null default 0"); + } if (oldVersion < 35) { if (!columnExists(db, TABLE_REPO, "lastUpdated")) diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java index 0bc843cc4..30a629925 100644 --- a/src/org/fdroid/fdroid/FDroid.java +++ b/src/org/fdroid/fdroid/FDroid.java @@ -127,11 +127,8 @@ public class FDroid extends FragmentActivity { public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - MenuItem update = menu.add(Menu.NONE, UPDATE_REPO, 1, R.string.menu_update_repo).setIcon( + menu.add(Menu.NONE, UPDATE_REPO, 1, R.string.menu_update_repo).setIcon( android.R.drawable.ic_menu_rotate); - MenuItemCompat.setShowAsAction(update, - MenuItemCompat.SHOW_AS_ACTION_ALWAYS | - MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT); menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon( android.R.drawable.ic_menu_agenda); MenuItem search = menu.add(Menu.NONE, SEARCH, 3, R.string.menu_search).setIcon( diff --git a/tests/local.properties b/tests/local.properties new file mode 100644 index 000000000..12a01149a --- /dev/null +++ b/tests/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/opt/android-sdk