From 0b3b32dab3535b241fcd0002497bd92930ac9563 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 16 Nov 2015 18:00:58 +1100 Subject: [PATCH] CR: Add overloaded `createNewRepo` method which provides default arguments. Instead of passing in `null` each time you don't have a username/password, this change provides those as meaningful default values in an overloaded version of the method. This takes care of Java's lack of default argument support. --- .../org/fdroid/fdroid/views/ManageReposActivity.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java index 96d664c85..c9c6e55b4 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java @@ -553,7 +553,7 @@ public class ManageReposActivity extends ActionBarActivity { } else { // create repo without username/password - createNewRepo(newAddress, fingerprint, null, null); + createNewRepo(newAddress, fingerprint); } } } @@ -570,7 +570,7 @@ public class ManageReposActivity extends ActionBarActivity { // or their internet is playing up, then you'd have to wait for several // connection timeouts before being able to proceed. - createNewRepo(originalAddress, fingerprint, null, null); + createNewRepo(originalAddress, fingerprint); checker.cancel(false); } }); @@ -606,6 +606,13 @@ public class ManageReposActivity extends ActionBarActivity { path, uri.getQuery(), uri.getFragment()).toString(); } + /** + * Create a repository without a username or password. + */ + private void createNewRepo(String address, String fingerprint) { + createNewRepo(address, fingerprint, null, null); + } + private void createNewRepo(String address, String fingerprint, final String username, final String password) { try { address = normalizeUrl(address);