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

Moved 'reset DB' to the preferences screen

Browse Source
This commit is contained in:
Ciaran Gultnieks 2010-11-13 10:35:39 +00:00
parent f3eca41937
commit 87ea1dfc3f
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/preferences.xml
View File

@ -14,4 +14,10 @@
android:defaultValue="false" android:summary="Notify when new updates are available" android:defaultValue="false" android:summary="Notify when new updates are available"
android:key="updateNotify" /> android:key="updateNotify" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Maintenance">
<Preference
android:title="Reset"
android:summary="Clear all cached data"
android:key="reset" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

17
src/org/fdroid/fdroid/FDroid.java
View File

@ -137,9 +137,8 @@ public class FDroid extends TabActivity implements OnItemClickListener {
private static final int UPDATE_REPO = Menu.FIRST; private static final int UPDATE_REPO = Menu.FIRST;
private static final int MANAGE_REPO = Menu.FIRST + 1; private static final int MANAGE_REPO = Menu.FIRST + 1;
private static final int RESET_DB = Menu.FIRST + 2; private static final int PREFERENCES = Menu.FIRST + 2;
private static final int PREFERENCES = Menu.FIRST + 3; private static final int ABOUT = Menu.FIRST + 3;
private static final int ABOUT = Menu.FIRST + 4;
private DB db = null; private DB db = null;
@ -212,11 +211,9 @@ public class FDroid extends TabActivity implements OnItemClickListener {
android.R.drawable.ic_menu_rotate); android.R.drawable.ic_menu_rotate);
menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon( menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon(
android.R.drawable.ic_menu_agenda); android.R.drawable.ic_menu_agenda);
menu.add(Menu.NONE, RESET_DB, 3, "Reset DB").setIcon( menu.add(Menu.NONE, PREFERENCES, 3, R.string.menu_preferences).setIcon(
android.R.drawable.ic_menu_revert);
menu.add(Menu.NONE, PREFERENCES, 4, R.string.menu_preferences).setIcon(
android.R.drawable.ic_menu_preferences); android.R.drawable.ic_menu_preferences);
menu.add(Menu.NONE, ABOUT, 5, R.string.menu_about).setIcon( menu.add(Menu.NONE, ABOUT, 4, R.string.menu_about).setIcon(
android.R.drawable.ic_menu_help); android.R.drawable.ic_menu_help);
return true; return true;
} }
@ -235,14 +232,10 @@ public class FDroid extends TabActivity implements OnItemClickListener {
startActivityForResult(i, REQUEST_MANAGEREPOS); startActivityForResult(i, REQUEST_MANAGEREPOS);
return true; return true;
case RESET_DB:
db.upgrade(true);
populateLists(true);
return true;
case PREFERENCES: case PREFERENCES:
Intent prefs = new Intent(getBaseContext(), Preferences.class); Intent prefs = new Intent(getBaseContext(), Preferences.class);
startActivityForResult(prefs, REQUEST_PREFS); startActivityForResult(prefs, REQUEST_PREFS);
populateLists(true);
return true; return true;
case ABOUT: case ABOUT:

20
src/org/fdroid/fdroid/Preferences.java
View File

@ -19,7 +19,10 @@
package org.fdroid.fdroid; package org.fdroid.fdroid;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.Preference.OnPreferenceClickListener;
import android.widget.Toast;
public class Preferences extends PreferenceActivity { public class Preferences extends PreferenceActivity {
@ -27,6 +30,23 @@ public class Preferences extends PreferenceActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
Preference r = (Preference) findPreference("reset");
r.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
DB db = new DB(Preferences.this);
db.upgrade(true);
// TODO: Clear cached apks and icons too.
Toast
.makeText(getBaseContext(),
"Local cached data has been cleared",
Toast.LENGTH_LONG).show();
return true;
}
});
} }
} }