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

Fix checkstyle issues.

Browse Source
This commit is contained in:
Isira Seneviratne 2021-06-15 08:17:21 +05:30 committed by Hans-Christoph Steiner
parent eab5ef59b9
commit c758cb60d9
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java
View File

@ -89,7 +89,8 @@ public class InstalledAppProviderService extends JobIntentService {
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.debounce(3, TimeUnit.SECONDS) .debounce(3, TimeUnit.SECONDS)
.subscribe(packageName -> { .subscribe(packageName -> {
Utils.debugLog(TAG, "Notifying content providers (so they can update the relevant views)."); Utils.debugLog(TAG, "Notifying content providers (so they can update" +
" the relevant views).");
getContentResolver().notifyChange(AppProvider.getContentUri(), null); getContentResolver().notifyChange(AppProvider.getContentUri(), null);
getContentResolver().notifyChange(ApkProvider.getContentUri(), null); getContentResolver().notifyChange(ApkProvider.getContentUri(), null);
}) })

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

@ -597,12 +597,12 @@ public class ManageReposActivity extends AppCompatActivity
final Button skip = addRepoDialog.getButton(AlertDialog.BUTTON_NEGATIVE); final Button skip = addRepoDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
skip.setText(R.string.skip); skip.setText(R.string.skip);
final int REFRESH_DIALOG = Integer.MAX_VALUE; final int refreshDialog = Integer.MAX_VALUE;
final Disposable disposable = Single.fromCallable(() -> { final Disposable disposable = Single.fromCallable(() -> {
int statusCode = -1; int statusCode = -1;
if (fingerprintRepoMap.containsKey(fingerprint)) { if (fingerprintRepoMap.containsKey(fingerprint)) {
statusCode = REFRESH_DIALOG; statusCode = refreshDialog;
return Pair.create(statusCode, originalAddress); return Pair.create(statusCode, originalAddress);
} }
@ -617,10 +617,11 @@ public class ManageReposActivity extends AppCompatActivity
Utils.debugLog(TAG, "Check for repo at " + originalAddress + " with suffix '" + path + "'"); Utils.debugLog(TAG, "Check for repo at " + originalAddress + " with suffix '" + path + "'");
Uri.Builder builder = Uri.parse(originalAddress).buildUpon().appendEncodedPath(path); Uri.Builder builder = Uri.parse(originalAddress).buildUpon().appendEncodedPath(path);
final String addressWithoutIndex = builder.build().toString(); final String addressWithoutIndex = builder.build().toString();
runOnUiThread(() -> textSearching.setText(getString(R.string.repo_searching_address, addressWithoutIndex))); runOnUiThread(() -> textSearching.setText(getString(R.string.repo_searching_address,
addressWithoutIndex)));
if (urlRepoMap.containsKey(addressWithoutIndex)) { if (urlRepoMap.containsKey(addressWithoutIndex)) {
statusCode = REFRESH_DIALOG; statusCode = refreshDialog;
return Pair.create(statusCode, addressWithoutIndex); return Pair.create(statusCode, addressWithoutIndex);
} }
@ -633,7 +634,8 @@ public class ManageReposActivity extends AppCompatActivity
statusCode = connection.getResponseCode(); statusCode = connection.getResponseCode();
if (statusCode == HttpURLConnection.HTTP_UNAUTHORIZED || statusCode == HttpURLConnection.HTTP_OK) { if (statusCode == HttpURLConnection.HTTP_UNAUTHORIZED
|| statusCode == HttpURLConnection.HTTP_OK) {
Utils.debugLog(TAG, "Found F-Droid repo at " + addressWithoutIndex); Utils.debugLog(TAG, "Found F-Droid repo at " + addressWithoutIndex);
return Pair.create(statusCode, addressWithoutIndex); return Pair.create(statusCode, addressWithoutIndex);
} }
@ -646,7 +648,8 @@ public class ManageReposActivity extends AppCompatActivity
}) })
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnDispose(() -> Utils.debugLog(TAG, "Not checking more repo addresses, because process was skipped.")) .doOnDispose(() -> Utils.debugLog(TAG, "Not checking more repo addresses," +
" because process was skipped."))
.subscribe(codeAddressPair -> { .subscribe(codeAddressPair -> {
final int statusCode = codeAddressPair.first; final int statusCode = codeAddressPair.first;
final String newAddress = codeAddressPair.second; final String newAddress = codeAddressPair.second;
@ -681,7 +684,7 @@ public class ManageReposActivity extends AppCompatActivity
passwordInput.getText().toString())); passwordInput.getText().toString()));
credentialsDialog.show(); credentialsDialog.show();
} else if (statusCode == REFRESH_DIALOG) { } else if (statusCode == refreshDialog) {
addRepoForm.setVisibility(View.VISIBLE); addRepoForm.setVisibility(View.VISIBLE);
positiveButton.setVisibility(View.VISIBLE); positiveButton.setVisibility(View.VISIBLE);
textSearching.setText(""); textSearching.setText("");