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

Minor fix after conflict resolution.

Browse Source
This commit is contained in:
Peter Serwylo 2014-01-04 21:30:09 +11:00
parent 3731ed8f23
commit 783d6aa4d1
1 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/org/fdroid/fdroid/ManageRepo.java
View File

@ -375,7 +375,7 @@ public class ManageRepo extends ListActivity {
private void createNewRepo(String address, String fingerprint) {
try {
DB db = DB.getDB();
db.addRepo(address, null, null, 10, null, fingerprint, 0, true);
db.addRepo(address, null, null, 0, 10, null, fingerprint, 0, true);
} finally {
DB.releaseDB();
}
@ -419,55 +419,6 @@ public class ManageRepo extends ListActivity {
if (item.getItemId() == ADD_REPO) {
showAddRepo();
return true;
case REM_REPO:
final List<String> rem_lst = new ArrayList<String>();
CharSequence[] b = new CharSequence[repos.size()];
for (int i = 0; i < repos.size(); i++) {
b[i] = repos.get(i).address;
}
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.repo_delete_title));
builder.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
builder.setMultiChoiceItems(b, null,
new DialogInterface.OnMultiChoiceClickListener() {
@Override
public void onClick(DialogInterface dialog,
int whichButton, boolean isChecked) {
if (isChecked) {
rem_lst.add(repos.get(whichButton).address);
} else {
rem_lst.remove(repos.get(whichButton).address);
}
}
});
builder.setPositiveButton(getString(R.string.ok),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
int whichButton) {
try {
DB db = DB.getDB();
removeRepos(rem_lst);
} finally {
DB.releaseDB();
}
changed = true;
redraw();
}
});
builder.setNegativeButton(getString(R.string.cancel),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
int whichButton) {
return;
}
});
AlertDialog alert = builder.create();
alert.show();
return true;
}
return false;