From 3574b1d1d1c0e59f49936c12ae910de1af5c552f Mon Sep 17 00:00:00 2001 From: maskara Date: Tue, 1 Jan 2019 12:56:35 +0530 Subject: [PATCH] Fix build --- .../nrw/commons/di/FragmentBuilderModule.java | 1 - .../commons/media/MediaDetailFragment.java | 8 ++-- .../mwapi/ApacheHttpClientMediaWikiApi.java | 37 +++++++++---------- .../nrw/commons/review/ReviewActivity.java | 4 +- app/src/main/res/values/strings.xml | 1 - 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java index 3af8cdf50..97263d128 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java +++ b/app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java @@ -16,7 +16,6 @@ import fr.free.nrw.commons.media.MediaDetailPagerFragment; import fr.free.nrw.commons.nearby.NearbyFragment; import fr.free.nrw.commons.nearby.NearbyListFragment; import fr.free.nrw.commons.nearby.NearbyMapFragment; -import fr.free.nrw.commons.nearby.NoPermissionsFragment; import fr.free.nrw.commons.review.ReviewImageFragment; import fr.free.nrw.commons.settings.SettingsFragment; diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index c143f791d..2c3450a50 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -10,8 +10,10 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; +import android.text.Editable; import android.text.Html; import android.text.TextUtils; +import android.text.TextWatcher; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -19,6 +21,7 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.Spinner; @@ -51,12 +54,7 @@ import fr.free.nrw.commons.delete.ReasonBuilder; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.mwapi.MediaWikiApi; -import fr.free.nrw.commons.review.CheckCategoryTask; -import fr.free.nrw.commons.review.SendThankTask; import fr.free.nrw.commons.ui.widget.CompatTextView; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; import timber.log.Timber; import static android.content.Context.CLIPBOARD_SERVICE; diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java index 793fbfc5d..41e96b554 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java @@ -8,11 +8,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; -import android.util.Log; import com.google.gson.Gson; -import fr.free.nrw.commons.campaigns.CampaignResponseDTO; import org.apache.http.HttpResponse; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.PlainSocketFactory; @@ -39,9 +37,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Random; import java.util.TimeZone; import java.util.concurrent.Callable; -import java.util.Random; import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.Media; @@ -49,6 +47,7 @@ import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.R; import fr.free.nrw.commons.achievements.FeedbackResponse; import fr.free.nrw.commons.auth.AccountUtil; +import fr.free.nrw.commons.campaigns.CampaignResponseDTO; import fr.free.nrw.commons.category.CategoryImageUtils; import fr.free.nrw.commons.category.QueryContinue; import fr.free.nrw.commons.media.RecentChangesImageUtils; @@ -296,7 +295,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { @Override public boolean thank(String editToken, String revision) throws IOException { - ApiResult res = api.action("thank") + CustomApiResult res = api.action("thank") .param("rev", revision) .param("token", editToken) .param("source", getUserAgent()) @@ -392,7 +391,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { .get() .getNodes("/api/query/search/p/@title"); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (categoryNodes == null) { @@ -424,7 +423,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { .get() .getNodes("/api/query/allcategories/c"); } catch (IOException e) { - Timber.e("Failed to obtain allCategories", e); + Timber.e(e, "Failed to obtain allCategories"); } if (categoryNodes == null) { @@ -538,7 +537,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { .get() .getNodes("/api/query/search/p/@title"); } catch (IOException e) { - Timber.e("Failed to obtain searchTitles", e); + Timber.e(e, "Failed to obtain searchTitles"); return Collections.emptyList(); } @@ -609,7 +608,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { @Nullable public Single firstRevisionOfFile(String filename) { return Single.fromCallable(() -> { - ApiResult res = api.action("query") + CustomApiResult res = api.action("query") .param("prop", "revisions") .param("rvprop", "timestamp|ids|user") .param("titles", filename) @@ -637,7 +636,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { .get() .getNode("/api/query/notifications/list"); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (notificationNode == null @@ -674,7 +673,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { apiResult = requestBuilder.get(); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (apiResult == null) { @@ -714,7 +713,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { apiResult = requestBuilder.get(); } catch (IOException e) { - Timber.e("Failed to obtain parent Categories", e); + Timber.e(e, "Failed to obtain parent Categories"); } if (apiResult == null) { @@ -764,7 +763,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { } apiResult = requestBuilder.get(); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (apiResult == null) { @@ -816,7 +815,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { imageNodes= customApiResult.getNodes("/api/query/pages/page/@title"); authorNodes= customApiResult.getNodes("/api/query/pages/page/imageinfo/ii/@user"); } catch (IOException e) { - Timber.e("Failed to obtain searchImages", e); + Timber.e(e, "Failed to obtain searchImages"); } if (imageNodes == null) { @@ -856,7 +855,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { .get() .getNodes("/api/query/search/p/@title"); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (categoryNodes == null) { @@ -1071,7 +1070,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { apiResult = requestBuilder.get(); } catch (IOException e) { - Timber.e("Failed to obtain searchCategories", e); + Timber.e(e, "Failed to obtain searchCategories"); } if (apiResult == null) { @@ -1136,9 +1135,9 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { while (media == null && tries < MAX_RANDOM_TRIES) { Date now = new Date(); Date startDate = new Date(now.getTime() - r.nextInt(RANDOM_SECONDS) * 1000L); - ApiResult apiResult = null; + CustomApiResult apiResult = null; try { - MWApi.RequestBuilder requestBuilder = api.action("query") + CustomMwApi.RequestBuilder requestBuilder = api.action("query") .param("list", "recentchanges") .param("rcstart", formatMWDate(startDate)) .param("rcnamespace", FILE_NAMESPACE) @@ -1148,10 +1147,10 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { apiResult = requestBuilder.get(); } catch (IOException e) { - Timber.e("Failed to obtain recent random", e); + Timber.e(e, "Failed to obtain recent random"); } if (apiResult != null) { - ApiResult recentChangesNode = apiResult.getNode("/api/query/recentchanges"); + CustomApiResult recentChangesNode = apiResult.getNode("/api/query/recentchanges"); if (recentChangesNode != null && recentChangesNode.getDocument() != null && recentChangesNode.getDocument().getChildNodes() != null diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java index 2235696af..bad1aacb8 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java @@ -130,7 +130,7 @@ public class ReviewActivity extends AuthenticatedActivity { private void updateImage(String fileName) { if (fileName.length() == 0) { - ViewUtil.showSnackbar(drawerLayout, R.string.error_review); + ViewUtil.showShortSnackbar(drawerLayout, R.string.error_review); return; } reviewController.onImageRefreshed(fileName); //file name is updated @@ -155,7 +155,7 @@ public class ReviewActivity extends AuthenticatedActivity { private void categoryFetchError(Throwable throwable) { Timber.e(throwable, "Error fetching categories"); - ViewUtil.showSnackbar(drawerLayout, R.string.error_review_categories); + ViewUtil.showShortSnackbar(drawerLayout, R.string.error_review_categories); } private void updateCategories(ArrayList categories) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d32ef9d76..5a0881543 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -261,7 +261,6 @@ See webpage for details]]> Nominating %1$s for deletion. Nominating file for deletion: %1$s - See webpage for details View in Browser Skip Log in