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

when validating added repo URLs, check whether they're already included

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-03-29 16:12:32 +02:00
parent 70c9121995
commit a88b9c924e
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -19,6 +19,7 @@
package org.fdroid.fdroid.views; package org.fdroid.fdroid.views;
import android.annotation.SuppressLint;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -500,23 +501,37 @@ public class ManageReposActivity extends AppCompatActivity
/** /**
* Adds a new repo to the database. * Adds a new repo to the database.
*/ */
@SuppressLint("StaticFieldLeak")
private void prepareToCreateNewRepo(final String originalAddress, final String fingerprint, private void prepareToCreateNewRepo(final String originalAddress, final String fingerprint,
final String username, final String password) { final String username, final String password) {
addRepoDialog.findViewById(R.id.add_repo_form).setVisibility(View.GONE); final View addRepoForm = addRepoDialog.findViewById(R.id.add_repo_form);
addRepoDialog.getButton(AlertDialog.BUTTON_POSITIVE).setVisibility(View.GONE); addRepoForm.setVisibility(View.GONE);
final View positiveButton = addRepoDialog.getButton(AlertDialog.BUTTON_POSITIVE);
positiveButton.setVisibility(View.GONE);
final TextView textSearching = (TextView) addRepoDialog.findViewById(R.id.text_searching_for_repo); final TextView textSearching = (TextView) addRepoDialog.findViewById(R.id.text_searching_for_repo);
textSearching.setText(getString(R.string.repo_searching_address, originalAddress)); textSearching.setText(getString(R.string.repo_searching_address, originalAddress));
final Button skip = addRepoDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
skip.setText(R.string.skip);
final AsyncTask<String, String, String> checker = new AsyncTask<String, String, String>() { final AsyncTask<String, String, String> checker = new AsyncTask<String, String, String>() {
private int statusCode = -1; private int statusCode = -1;
private final static int REFRESH_DIALOG = Integer.MAX_VALUE;
private final static int HTTP_UNAUTHORIZED = 401;
private final static int HTTP_OK = 200;
@Override @Override
protected String doInBackground(String... params) { protected String doInBackground(String... params) {
final String originalAddress = params[0]; final String originalAddress = params[0];
if (fingerprintRepoMap.containsKey(fingerprint)) {
statusCode = REFRESH_DIALOG;
return originalAddress;
}
final String[] pathsToCheck = {"", "fdroid/repo", "repo"}; final String[] pathsToCheck = {"", "fdroid/repo", "repo"};
for (final String path : pathsToCheck) { for (final String path : pathsToCheck) {
@ -525,6 +540,11 @@ public class ManageReposActivity extends AppCompatActivity
final String addressWithoutIndex = builder.build().toString(); final String addressWithoutIndex = builder.build().toString();
publishProgress(addressWithoutIndex); publishProgress(addressWithoutIndex);
if (urlRepoMap.containsKey(addressWithoutIndex)) {
statusCode = REFRESH_DIALOG;
return addressWithoutIndex;
}
final Uri uri = builder.appendPath("index.jar").build(); final Uri uri = builder.appendPath("index.jar").build();
try { try {
@ -547,14 +567,13 @@ public class ManageReposActivity extends AppCompatActivity
} }
private boolean checkForRepository(Uri indexUri) throws IOException { private boolean checkForRepository(Uri indexUri) throws IOException {
final URL url = new URL(indexUri.toString()); final URL url = new URL(indexUri.toString());
final HttpURLConnection connection = (HttpURLConnection) url.openConnection(); final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("HEAD"); connection.setRequestMethod("HEAD");
statusCode = connection.getResponseCode(); statusCode = connection.getResponseCode();
return statusCode == 401 || statusCode == 200; return statusCode == HTTP_UNAUTHORIZED || statusCode == HTTP_OK;
} }
@Override @Override
@ -568,7 +587,7 @@ public class ManageReposActivity extends AppCompatActivity
if (addRepoDialog.isShowing()) { if (addRepoDialog.isShowing()) {
if (statusCode == 401) { if (statusCode == HTTP_UNAUTHORIZED) {
final View view = getLayoutInflater().inflate(R.layout.login, null); final View view = getLayoutInflater().inflate(R.layout.login, null);
final AlertDialog credentialsDialog = new AlertDialog.Builder(context) final AlertDialog credentialsDialog = new AlertDialog.Builder(context)
@ -608,6 +627,13 @@ public class ManageReposActivity extends AppCompatActivity
credentialsDialog.show(); credentialsDialog.show();
} else if (statusCode == REFRESH_DIALOG) {
addRepoForm.setVisibility(View.VISIBLE);
positiveButton.setVisibility(View.VISIBLE);
textSearching.setText("");
skip.setText(R.string.cancel);
skip.setOnClickListener(null);
validateRepoDetails(newAddress, fingerprint);
} else { } else {
// create repo without username/password // create repo without username/password
@ -617,8 +643,6 @@ public class ManageReposActivity extends AppCompatActivity
} }
}; };
Button skip = addRepoDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
skip.setText(R.string.skip);
skip.setOnClickListener(new View.OnClickListener() { skip.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -758,7 +782,6 @@ public class ManageReposActivity extends AppCompatActivity
finish(); finish();
} }
} }
} }
private void addRepoFromIntent(Intent intent) { private void addRepoFromIntent(Intent intent) {