diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index b6295f897..0646f8309 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -704,7 +704,7 @@ public class ContributionsFragment uploadsErrorTextView.setVisibility(View.VISIBLE); uploadsErrorTextView.setText(String.valueOf(errorCount)); }else { - uploadsErrorTextView.setVisibility(View.INVISIBLE); + uploadsErrorTextView.setVisibility(View.GONE); } } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index ba792c332..a16d79d70 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -399,22 +399,6 @@ public class MainActivity extends BaseActivity } } - public void toggleLimitedConnectionMode() { - defaultKvStore.putBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, - !defaultKvStore - .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false)); - if (defaultKvStore - .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false)) { - viewUtilWrapper - .showShortToast(getBaseContext(), getString(R.string.limited_connection_enabled)); - } else { - WorkRequestHelper.Companion.makeOneTimeWorkRequest(getApplicationContext(), - ExistingWorkPolicy.APPEND_OR_REPLACE); - viewUtilWrapper - .showShortToast(getBaseContext(), getString(R.string.limited_connection_disabled)); - } - } - public void centerMapToPlace(Place place) { setSelectedItemId(NavTab.NEARBY.code()); nearbyParentFragment.setNearbyParentFragmentInstanceReadyCallback(new NearbyParentFragmentInstanceReadyCallback() { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt index a44b619ef..04f2408c2 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt @@ -179,6 +179,7 @@ class UploadProgressActivity : BaseActivity() { */ @SuppressLint("CheckResult") private fun retryAllFailedUploads() { + pendingUploadsFragment!!.resetProgressBar() contributionDao.getContribution(listOf(Contribution.STATE_FAILED)) .subscribeOn(Schedulers.io()) .subscribe { failedUploads: List -> diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt index b522b53de..44330fabb 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt @@ -195,25 +195,6 @@ class MainActivityUnitTests { MainActivity.startYourself(mockContext) } - @Test - @Throws(Exception::class) - fun testToggleLimitedConnectionModeCaseDefault() { - activity.toggleLimitedConnectionMode() - } - - @Test - @Throws(Exception::class) - fun testToggleLimitedConnectionMode() { - Shadows.shadowOf(Looper.getMainLooper()).idle() - `when`( - defaultKvStore.getBoolean( - CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false - ) - ) - .thenReturn(false) - activity.toggleLimitedConnectionMode() - } - @Test @Throws(Exception::class) fun testSetUpPager() {