Optimize imports (#3272)

app/src/main/java/fr/free/nrw/commons/CommonsAppAdapter.java

@@ -1,5 +1,7 @@
 package fr.free.nrw.commons;
 
+import androidx.annotation.NonNull;
+
 import org.wikipedia.AppAdapter;
 import org.wikipedia.dataclient.SharedPreferenceCookieManager;
 import org.wikipedia.dataclient.WikiSite;
@@ -7,7 +9,6 @@ import org.wikipedia.json.GsonMarshaller;
 import org.wikipedia.json.GsonUnmarshaller;
 import org.wikipedia.login.LoginResult;
 
-import androidx.annotation.NonNull;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import okhttp3.OkHttpClient;

app/src/main/java/fr/free/nrw/commons/Utils.java

@@ -9,18 +9,19 @@ import android.net.Uri;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.content.ContextCompat;
+
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.PageTitle;
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.utils.ViewUtil;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import androidx.annotation.NonNull;
+import fr.free.nrw.commons.location.LatLng;
-import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.core.content.ContextCompat;
 import fr.free.nrw.commons.settings.Prefs;
+import fr.free.nrw.commons.utils.ViewUtil;
 import timber.log.Timber;
 
 import static android.widget.Toast.LENGTH_SHORT;

app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java

@@ -5,9 +5,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.viewpager.widget.ViewPager;
+
 import com.viewpagerindicator.CirclePageIndicator;
 
-import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java

@@ -2,14 +2,12 @@ package fr.free.nrw.commons;
 
 import android.net.Uri;
 import android.text.Html;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
 import androidx.viewpager.widget.PagerAdapter;
-import org.wikipedia.util.StringUtil;
 
 public class WelcomePagerAdapter extends PagerAdapter {
     private static final int[] PAGE_LAYOUTS = new int[]{

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

@@ -7,11 +7,6 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.FileProvider;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -24,6 +19,12 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.FileProvider;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+
 import com.dinuscxj.progressbar.CircleProgressBar;
 
 import org.apache.commons.lang3.StringUtils;
@@ -35,7 +36,6 @@ import java.util.Objects;
 
 import javax.inject.Inject;
 
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;

app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.java

@@ -4,7 +4,6 @@ import org.wikipedia.csrf.CsrfTokenClient;
 import org.wikipedia.dataclient.Service;
 
 import io.reactivex.Observable;
-import timber.log.Timber;
 
 public class PageEditClient {
 

app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java

@@ -5,6 +5,7 @@ import android.accounts.AccountManager;
 import android.content.Context;
 
 import androidx.annotation.Nullable;
+
 import fr.free.nrw.commons.BuildConfig;
 import timber.log.Timber;
 

app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java

@@ -3,6 +3,7 @@ package fr.free.nrw.commons.auth;
 import android.accounts.AbstractAccountAuthenticator;
 import android.content.Intent;
 import android.os.IBinder;
+
 import androidx.annotation.Nullable;
 
 import fr.free.nrw.commons.di.CommonsDaggerService;

app/src/main/java/fr/free/nrw/commons/bookmarks/Bookmark.java

@@ -2,8 +2,6 @@ package fr.free.nrw.commons.bookmarks;
 
 import android.net.Uri;
 
-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
-
 public class Bookmark {
     private Uri contentUri;
     private String mediaName;

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java

@@ -2,14 +2,15 @@ package fr.free.nrw.commons.bookmarks;
 
 import android.content.Context;
 import android.content.Intent;
-import android.database.DataSetObserver;
 import android.os.Bundle;
-import com.google.android.material.tabs.TabLayout;
-import androidx.fragment.app.FragmentManager;
-import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.AdapterView;
 
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java

@@ -1,11 +1,12 @@
 package fr.free.nrw.commons.bookmarks;
 
 import android.content.Context;
+import android.widget.ListAdapter;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
-import android.widget.ListAdapter;
 
 import java.util.ArrayList;
 

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsContentProvider.java

@@ -5,9 +5,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Inject;
 
 import fr.free.nrw.commons.BuildConfig;

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java

@@ -5,8 +5,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.RemoteException;
+
 import androidx.annotation.NonNull;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java

@@ -2,10 +2,6 @@ package fr.free.nrw.commons.bookmarks.locations;
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +9,11 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.pedrogomez.renderers.RVRendererAdapter;
 
 import java.util.ArrayList;

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesContentProvider.java

@@ -5,9 +5,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Inject;
 
 import fr.free.nrw.commons.BuildConfig;

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java

@@ -11,7 +11,6 @@ import javax.inject.Singleton;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.bookmarks.Bookmark;
 import fr.free.nrw.commons.media.MediaClient;
-import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.Single;

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java

@@ -5,16 +5,19 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.RemoteException;
+
 import androidx.annotation.NonNull;
-import fr.free.nrw.commons.bookmarks.Bookmark;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import fr.free.nrw.commons.bookmarks.Bookmark;
+
 import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI;
 
 @Singleton

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java

@@ -12,13 +12,14 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import dagger.android.support.DaggerFragment;

app/src/main/java/fr/free/nrw/commons/caching/CacheController.java

@@ -10,7 +10,6 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import fr.free.nrw.commons.upload.GpsCategoryModel;
 import timber.log.Timber;
 
 @Singleton

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.java

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.campaigns;
 
 import com.google.gson.annotations.SerializedName;
+
 import java.util.List;
 
 /**

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java

@@ -6,13 +6,14 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.wikipedia.util.DateUtil;
 
 import java.text.ParseException;
 import java.util.Date;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java

@@ -1,33 +1,28 @@
 package fr.free.nrw.commons.campaigns;
 
-import static fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD;
-import static fr.free.nrw.commons.di.CommonsApplicationModule.MAIN_THREAD;
-
 import android.annotation.SuppressLint;
 
-import io.reactivex.Scheduler;
-import javax.inject.Named;
-import org.wikipedia.util.DateUtil;
-
 import java.text.ParseException;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.inject.Singleton;
 
 import fr.free.nrw.commons.BasePresenter;
-import fr.free.nrw.commons.MvpView;
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
+import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.SingleObserver;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.di.CommonsApplicationModule.IO_THREAD;
+import static fr.free.nrw.commons.di.CommonsApplicationModule.MAIN_THREAD;
+
 /**
  * The presenter for the campaigns view, fetches the campaigns from the api and informs the view on
  * success and error

app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java

@@ -6,9 +6,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Inject;
 
 import fr.free.nrw.commons.BuildConfig;

app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java

@@ -5,6 +5,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.RemoteException;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java

@@ -2,7 +2,6 @@ package fr.free.nrw.commons.category;
 
 import android.content.Context;
 import android.content.Intent;
-import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
@@ -12,14 +11,15 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
 import com.google.android.material.tabs.TabLayout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;

app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java

@@ -13,13 +13,14 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import dagger.android.support.DaggerFragment;

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -4,17 +4,15 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Parcel;
 
-import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.util.DateUtil;
-
-import java.lang.annotation.Retention;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.StringDef;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.annotation.Retention;
+import java.util.Date;
+import java.util.Locale;
+
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.filepicker.UploadableFile;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -4,6 +4,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java

@@ -7,15 +7,19 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.os.RemoteException;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
-import fr.free.nrw.commons.settings.Prefs;
+
+import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.Date;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
+
+import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java

@@ -1,16 +1,23 @@
 package fr.free.nrw.commons.contributions;
 
-import android.net.Uri;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import androidx.collection.LruCache;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+
+import org.apache.commons.lang3.StringUtils;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import com.facebook.drawee.view.SimpleDraweeView;
 import fr.free.nrw.commons.MediaDataExtractor;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionsListAdapter.Callback;
@@ -21,9 +28,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang3.StringUtils;
 import timber.log.Timber;
 
 public class ContributionViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java

@@ -6,9 +6,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Inject;
 
 import fr.free.nrw.commons.BuildConfig;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContract.java

@@ -1,7 +1,9 @@
 package fr.free.nrw.commons.contributions;
 
 import android.database.Cursor;
+
 import androidx.loader.app.LoaderManager;
+
 import fr.free.nrw.commons.BasePresenter;
 import fr.free.nrw.commons.Media;
 

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java

@@ -1,10 +1,11 @@
 package fr.free.nrw.commons.contributions;
 
-import android.database.DataSetObserver;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.model.DisplayableContribution;
 

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java

@@ -1,10 +1,12 @@
 package fr.free.nrw.commons.contributions;
 
 import android.database.Cursor;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import fr.free.nrw.commons.kvstore.JsonKvStore;
+
 /**
  * The LocalDataSource class for Contributions
  */

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java

@@ -1,22 +1,25 @@
 package fr.free.nrw.commons.contributions;
 
-import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS;
-import static fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI;
-import static fr.free.nrw.commons.settings.Prefs.UPLOADS_SHOWING;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DataSetObserver;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
+
+import javax.inject.Inject;
+
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.contributions.ContributionsContract.UserActionListener;
-import javax.inject.Inject;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS;
+import static fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI;
+import static fr.free.nrw.commons.settings.Prefs.UPLOADS_SHOWING;
+
 /**
  * The presenter class for Contributions
  */

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.java

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
 import android.database.Cursor;
+
 import javax.inject.Inject;
 
 /**

app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.contributions;
 
-import static android.content.ContentResolver.requestSync;
-
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.ContentResolver;
@@ -14,6 +12,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import androidx.annotation.Nullable;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -21,9 +20,15 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import com.google.android.material.tabs.TabLayout;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -39,10 +44,10 @@ import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.upload.UploadService;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import java.util.List;
-import javax.inject.Inject;
 import timber.log.Timber;
 
+import static android.content.ContentResolver.requestSync;
+
 public class MainActivity extends NavigationBaseActivity implements FragmentManager.OnBackStackChangedListener {
 
     @BindView(R.id.tab_layout)

app/src/main/java/fr/free/nrw/commons/contributions/UnswipableViewPager.java

@@ -1,11 +1,12 @@
 package fr.free.nrw.commons.contributions;
 
 import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewpager.widget.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
 
 public class UnswipableViewPager extends ViewPager{
     public UnswipableViewPager(@NonNull Context context) {

app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java

@@ -9,10 +9,9 @@ import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.auth.SignupActivity;
 import fr.free.nrw.commons.bookmarks.BookmarksActivity;
 import fr.free.nrw.commons.category.CategoryDetailsActivity;
-import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.category.CategoryImagesActivity;
+import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.explore.SearchActivity;
-
 import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.review.ReviewActivity;

app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java

@@ -5,6 +5,7 @@ import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.ContentProvider;
 import android.content.Context;
+
 import androidx.fragment.app.Fragment;
 
 import javax.inject.Inject;

app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java

@@ -2,9 +2,10 @@ package fr.free.nrw.commons.di;
 
 import android.app.Activity;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
 
 import javax.inject.Inject;
 

app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java

@@ -3,9 +3,10 @@ package fr.free.nrw.commons.di;
 import android.app.Activity;
 import android.content.Context;
 
+import androidx.fragment.app.Fragment;
+
 import javax.inject.Inject;
 
-import androidx.fragment.app.Fragment;
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.support.HasSupportFragmentInjector;

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

@@ -1,21 +1,27 @@
 package fr.free.nrw.commons.explore;
 
-import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.SearchView;
+
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.viewpager.widget.ViewPager;
-import butterknife.BindView;
+
-import butterknife.ButterKnife;
 import com.google.android.material.tabs.TabLayout;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.jakewharton.rxbinding2.widget.RxSearchView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.explore.categories.SearchCategoryFragment;
@@ -26,9 +32,6 @@ import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.utils.FragmentUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Represents search screen of this app

app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java

@@ -2,7 +2,6 @@ package fr.free.nrw.commons.explore.categories;
 
 import android.content.Context;
 import android.content.Intent;
-import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,14 +10,15 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
 import com.google.android.material.tabs.TabLayout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

@@ -9,6 +9,10 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.pedrogomez.renderers.RVRendererAdapter;
 
 import java.util.ArrayList;
@@ -19,9 +23,6 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;

app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java

@@ -6,9 +6,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Inject;
 
 import fr.free.nrw.commons.BuildConfig;

app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.java

@@ -5,6 +5,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.RemoteException;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java

@@ -1,17 +1,17 @@
 package fr.free.nrw.commons.explore.recentsearches;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java

@@ -7,8 +7,8 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import androidx.exifinterface.media.ExifInterface;
 import androidx.annotation.Nullable;
+import androidx.exifinterface.media.ExifInterface;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/fr/free/nrw/commons/kvstore/BasicKvStore.java

@@ -2,6 +2,7 @@ package fr.free.nrw.commons.kvstore;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import androidx.annotation.Nullable;
 
 import java.util.HashMap;

app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java

@@ -6,6 +6,7 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

app/src/main/java/fr/free/nrw/commons/logging/FileLoggingTree.java

@@ -1,8 +1,9 @@
 package fr.free.nrw.commons.logging;
 
-import androidx.annotation.NonNull;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java

@@ -3,6 +3,7 @@ package fr.free.nrw.commons.logging;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;

app/src/main/java/fr/free/nrw/commons/media/MediaClient.java

@@ -2,17 +2,12 @@ package fr.free.nrw.commons.media;
 
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import org.wikipedia.dataclient.mwapi.MwQueryPage;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import org.wikipedia.dataclient.mwapi.MwQueryResult;
-
-import java.util.Date;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,12 +19,7 @@ import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
 import io.reactivex.Observable;
 import io.reactivex.Single;
-import okhttp3.HttpUrl;
-import okhttp3.Request;
-import okhttp3.Response;
 import timber.log.Timber;
-import io.reactivex.Observable;
-import io.reactivex.Single;
 
 /**
  * Media Client to handle custom calls to Commons MediaWiki APIs

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -1,12 +1,8 @@
 package fr.free.nrw.commons.media;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Intent;
-import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
@@ -24,13 +20,25 @@ import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-import butterknife.BindView;
+
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.request.ImageRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.wikipedia.util.DateUtil;
+import org.wikipedia.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.MediaDataExtractor;
 import fr.free.nrw.commons.R;
@@ -48,15 +56,11 @@ import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
-import javax.inject.Inject;
-import org.apache.commons.lang3.StringUtils;
-import org.wikipedia.util.DateUtil;
-import org.wikipedia.util.StringUtil;
 import timber.log.Timber;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 public class MediaDetailFragment extends CommonsDaggerSupportFragment {
 
     private boolean editable;

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -1,9 +1,5 @@
 package fr.free.nrw.commons.media;
 
-import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-import static android.content.Context.DOWNLOAD_SERVICE;
-import static fr.free.nrw.commons.Utils.handleWebUrl;
-
 import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.content.Intent;
@@ -18,10 +14,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;
@@ -41,10 +42,12 @@ import fr.free.nrw.commons.utils.ImageUtils;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
-import javax.inject.Inject;
-import javax.inject.Named;
 import timber.log.Timber;
 
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static android.content.Context.DOWNLOAD_SERVICE;
+import static fr.free.nrw.commons.Utils.handleWebUrl;
+
 public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
 
     @Inject SessionManager sessionManager;

app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java

@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.media;
 
-import org.jetbrains.annotations.NotNull;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 
 import java.util.Map;

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.mwapi;
 
 import android.text.TextUtils;
+
 import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
@@ -17,6 +18,7 @@ import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.wikidata.model.GetWikidataEditCountResponse;
 import io.reactivex.Observable;
 import io.reactivex.Single;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,11 +26,13 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
+
 import org.apache.commons.lang3.StringUtils;
 
 import timber.log.Timber;

app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.java

@@ -1,21 +1,17 @@
 package fr.free.nrw.commons.mwapi;
 
-import java.util.Collections;
-
-import javax.inject.Inject;
-
-import io.reactivex.Observable;
-
 import org.wikipedia.dataclient.mwapi.MwQueryLogEvent;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 import org.wikipedia.dataclient.mwapi.MwQueryResult;
 import org.wikipedia.dataclient.mwapi.UserInfo;
 import org.wikipedia.util.DateUtil;
 
+import java.util.Collections;
 import java.util.Date;
 
 import javax.inject.Inject;
 
+import io.reactivex.Observable;
 import io.reactivex.Single;
 
 public class UserClient {

app/src/main/java/fr/free/nrw/commons/nearby/Label.java

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.nearby;
 
 import android.os.Parcel;
+
 import androidx.annotation.DrawableRes;
 
 import java.util.HashMap;

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

@@ -3,6 +3,7 @@ package fr.free.nrw.commons.nearby;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import com.mapbox.mapboxsdk.annotations.IconFactory;

app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java

@@ -2,7 +2,6 @@ package fr.free.nrw.commons.nearby;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java

@@ -1,8 +1,6 @@
 package fr.free.nrw.commons.nearby;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -11,6 +9,9 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;

app/src/main/java/fr/free/nrw/commons/nearby/Place.java

@@ -4,10 +4,10 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.apache.commons.lang3.StringUtils;
-
 import androidx.annotation.Nullable;
 
+import org.apache.commons.lang3.StringUtils;
+
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.nearby.model.NearbyResultItem;
 import fr.free.nrw.commons.utils.PlaceUtils;

app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java

@@ -10,6 +10,13 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.transition.TransitionManager;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.pedrogomez.renderers.Renderer;
 
@@ -18,12 +25,6 @@ import java.util.ArrayList;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.transition.TransitionManager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;

app/src/main/java/fr/free/nrw/commons/nearby/Sitelinks.java

@@ -3,6 +3,7 @@ package fr.free.nrw.commons.nearby;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+
 import androidx.annotation.Nullable;
 
 /**

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java

@@ -6,6 +6,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.pedrogomez.renderers.RVRendererAdapter;
@@ -16,8 +19,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -86,8 +86,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
-import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
 import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
+import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED;
 import static fr.free.nrw.commons.nearby.Label.TEXT_TO_DESCRIPTION;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;

app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java

@@ -19,7 +19,6 @@ import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.nearby.contract.NearbyMapContract;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
 import fr.free.nrw.commons.utils.LocationUtils;
-
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
 import timber.log.Timber;
 

app/src/main/java/fr/free/nrw/commons/notification/Notification.java

@@ -2,8 +2,6 @@ package fr.free.nrw.commons.notification;
 
 import org.wikipedia.util.DateUtil;
 
-import fr.free.nrw.commons.utils.CommonsDateUtil;
-
 /**
  * Created by root on 18.12.2017.
  */

app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java

@@ -5,10 +5,11 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.core.app.NotificationCompat;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import androidx.core.app.NotificationCompat;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 

app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java

@@ -1,15 +1,11 @@
 package fr.free.nrw.commons.notification;
 
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.google.android.material.animation.ArgbEvaluatorCompat;
 import com.pedrogomez.renderers.Renderer;
 
 import org.wikipedia.util.StringUtil;
@@ -18,7 +14,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import fr.free.nrw.commons.R;
-import timber.log.Timber;
 
 /**
  * Created by root on 19.12.2017.

app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java

@@ -2,6 +2,7 @@ package fr.free.nrw.commons.notification;
 
 import android.app.Fragment;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
 
 import java.util.List;

app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java

@@ -2,12 +2,13 @@ package fr.free.nrw.commons.quiz;
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import android.widget.RadioButton;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
-import android.widget.TextView;
 
 import com.facebook.drawee.drawable.ProgressBarDrawable;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;

app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java

@@ -5,18 +5,6 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.dinuscxj.progressbar.CircleProgressBar;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.MainActivity;
-
-import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -24,9 +12,21 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.dinuscxj.progressbar.CircleProgressBar;
+
 import java.io.File;
 import java.io.FileOutputStream;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.contributions.MainActivity;
+
 
 /**
  *  Displays the final score of quiz and congratulates the user

app/src/main/java/fr/free/nrw/commons/repository/UploadLocalDataSource.java

@@ -1,9 +1,6 @@
 package fr.free.nrw.commons.repository;
 
 import androidx.annotation.Nullable;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.upload.UploadModel;
-import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 
 import java.util.List;
 
@@ -11,6 +8,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.upload.UploadModel;
+import fr.free.nrw.commons.upload.UploadModel.UploadItem;
+
 /**
  * The Local Data Source for UploadRepository, fetches and returns data from local db/shared prefernces
  */

app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java

@@ -1,5 +1,11 @@
 package fr.free.nrw.commons.repository;
 
+import java.util.Comparator;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import fr.free.nrw.commons.category.CategoriesModel;
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.contributions.Contribution;
@@ -12,12 +18,6 @@ import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 
-import java.util.Comparator;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 /**
  * This class would act as the data source for remote operations for UploadActivity
  */

app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java

@@ -1,5 +1,11 @@
 package fr.free.nrw.commons.repository;
 
+import java.util.Comparator;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.filepicker.UploadableFile;
@@ -9,12 +15,6 @@ import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 
-import java.util.Comparator;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 /**
  * The repository class for UploadActivity
  */

app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java

@@ -6,8 +6,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import java.util.List;
-
 public class ReviewPagerAdapter extends FragmentStatePagerAdapter {
     private ReviewImageFragment[] reviewImageFragments;
 

app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java

@@ -1,9 +1,10 @@
 package fr.free.nrw.commons.settings;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java

@@ -1,15 +1,13 @@
 package fr.free.nrw.commons.settings;
 
 import android.Manifest;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.preference.MultiSelectListPreference;
 import android.preference.ListPreference;
+import android.preference.MultiSelectListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
 import android.preference.SwitchPreference;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -18,8 +16,8 @@ import com.karumi.dexter.Dexter;
 import com.karumi.dexter.listener.PermissionGrantedResponse;
 import com.karumi.dexter.listener.single.BasePermissionListener;
 
-import java.util.Collections;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -31,9 +29,9 @@ import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.logging.CommonsLogSender;
+import fr.free.nrw.commons.upload.Language;
 import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
-import fr.free.nrw.commons.upload.Language;
 
 public class SettingsFragment extends PreferenceFragment {
 

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.theme;
 
-import static fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_WIKI_SITE;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.ActivityManager;
@@ -11,13 +9,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import com.google.android.material.navigation.NavigationView;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -25,10 +16,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import fr.free.nrw.commons.auth.LogoutClient;
+import androidx.annotation.NonNull;
-import io.reactivex.android.schedulers.AndroidSchedulers;
+import androidx.appcompat.app.ActionBarDrawerToggle;
-import io.reactivex.disposables.CompositeDisposable;
+import androidx.appcompat.app.AlertDialog;
-import io.reactivex.schedulers.Schedulers;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
+import com.google.android.material.navigation.NavigationView;
+
+import org.wikipedia.dataclient.Service;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -40,6 +38,7 @@ import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.achievements.AchievementsActivity;
 import fr.free.nrw.commons.auth.LoginActivity;
+import fr.free.nrw.commons.auth.LogoutClient;
 import fr.free.nrw.commons.bookmarks.BookmarksActivity;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.explore.categories.ExploreActivity;
@@ -47,8 +46,9 @@ import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.logging.CommonsLogSender;
 import fr.free.nrw.commons.review.ReviewActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
-import org.wikipedia.dataclient.Service;
+import io.reactivex.android.schedulers.AndroidSchedulers;
-import org.wikipedia.dataclient.WikiSite;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
 public abstract class NavigationBaseActivity extends BaseActivity

app/src/main/java/fr/free/nrw/commons/ui/widget/CompatTextView.java

@@ -7,11 +7,12 @@ package fr.free.nrw.commons.ui.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import androidx.appcompat.widget.AppCompatDrawableManager;
 import androidx.appcompat.widget.AppCompatTextView;
-import android.util.AttributeSet;
+import androidx.core.view.ViewCompat;
 
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.utils.UiUtils;

app/src/main/java/fr/free/nrw/commons/ui/widget/HtmlTextView.java

@@ -1,10 +1,11 @@
 package fr.free.nrw.commons.ui.widget;
 
 import android.content.Context;
-import androidx.appcompat.widget.AppCompatTextView;
 import android.text.method.LinkMovementMethod;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatTextView;
+
 import org.wikipedia.util.StringUtil;
 
 /**

app/src/main/java/fr/free/nrw/commons/ui/widget/OverlayDialog.java

@@ -4,13 +4,14 @@ import android.app.Dialog;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
 /**
  * a formatted dialog fragment
  * This class is used by NearbyInfoDialog

app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.java

@@ -2,6 +2,7 @@ package fr.free.nrw.commons.upload;
 
 
 import java.io.IOException;
+
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okio.Buffer;

app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java

@@ -11,14 +11,15 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;

app/src/main/java/fr/free/nrw/commons/upload/FileMetadataUtils.java

@@ -2,7 +2,23 @@ package fr.free.nrw.commons.upload;
 
 import timber.log.Timber;
 
-import static androidx.exifinterface.media.ExifInterface.*;
+import static androidx.exifinterface.media.ExifInterface.TAG_ARTIST;
+import static androidx.exifinterface.media.ExifInterface.TAG_BODY_SERIAL_NUMBER;
+import static androidx.exifinterface.media.ExifInterface.TAG_CAMARA_OWNER_NAME;
+import static androidx.exifinterface.media.ExifInterface.TAG_COPYRIGHT;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_ALTITUDE;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_ALTITUDE_REF;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_LATITUDE;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_LATITUDE_REF;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_LONGITUDE;
+import static androidx.exifinterface.media.ExifInterface.TAG_GPS_LONGITUDE_REF;
+import static androidx.exifinterface.media.ExifInterface.TAG_LENS_MAKE;
+import static androidx.exifinterface.media.ExifInterface.TAG_LENS_MODEL;
+import static androidx.exifinterface.media.ExifInterface.TAG_LENS_SERIAL_NUMBER;
+import static androidx.exifinterface.media.ExifInterface.TAG_LENS_SPECIFICATION;
+import static androidx.exifinterface.media.ExifInterface.TAG_MAKE;
+import static androidx.exifinterface.media.ExifInterface.TAG_MODEL;
+import static androidx.exifinterface.media.ExifInterface.TAG_SOFTWARE;
 
 /**
  * Support utils for EXIF metadata handling

app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java

@@ -4,9 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
-import androidx.annotation.NonNull;
 
-import fr.free.nrw.commons.upload.SimilarImageDialogFragment.Callback;
+import androidx.annotation.NonNull;
+import androidx.exifinterface.media.ExifInterface;
+
+import com.google.gson.reflect.TypeToken;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -19,15 +22,12 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import androidx.exifinterface.media.ExifInterface;
-
-import com.google.gson.reflect.TypeToken;
-
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.caching.CacheController;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.mwapi.CategoryApi;
 import fr.free.nrw.commons.settings.Prefs;
+import fr.free.nrw.commons.upload.SimilarImageDialogFragment.Callback;
 import io.reactivex.Observable;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;

app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java

@@ -4,7 +4,9 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
+
 import androidx.exifinterface.media.ExifInterface;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,6 +17,7 @@ import java.io.InputStreamReader;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+
 import timber.log.Timber;
 
 public class FileUtils {

app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java

@@ -2,11 +2,11 @@ package fr.free.nrw.commons.upload;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.exifinterface.media.ExifInterface;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import androidx.exifinterface.media.ExifInterface;
 import timber.log.Timber;
 
 /**

app/src/main/java/fr/free/nrw/commons/upload/SimilarImageDialogFragment.java

@@ -4,15 +4,16 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
-import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
 

app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java

@@ -1,9 +1,7 @@
 package fr.free.nrw.commons.upload;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,20 +9,19 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.utils.BiMap;
 import fr.free.nrw.commons.utils.LangCodeUtils;
 

app/src/main/java/fr/free/nrw/commons/upload/ThumbnailsAdapter.java

@@ -12,15 +12,17 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 import com.facebook.drawee.view.SimpleDraweeView;
-import fr.free.nrw.commons.R;
+
-import fr.free.nrw.commons.filepicker.UploadableFile;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.filepicker.UploadableFile;
+
 /**
  * The adapter class for image thumbnails to be shown while uploading.
  */

app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java

@@ -1,33 +1,28 @@
 package fr.free.nrw.commons.upload;
 
-import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS;
-import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES;
-import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
-
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.cardview.widget.CardView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -56,12 +51,13 @@ import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-
-import java.util.Collections;
-
 import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS;
+import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES;
+import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
+
 public class UploadActivity extends BaseActivity implements UploadContract.View, UploadBaseFragment.Callback {
     @Inject
     ContributionController contributionController;

app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.java

@@ -3,11 +3,8 @@ package fr.free.nrw.commons.upload;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 
-import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment;
 
 /**
  * The base fragment of the fragments in upload

app/src/main/java/fr/free/nrw/commons/upload/UploadCategoriesRenderer.java

@@ -2,7 +2,6 @@ package fr.free.nrw.commons.upload;
 
 import android.annotation.SuppressLint;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/fr/free/nrw/commons/upload/UploadClient.java

@@ -1,20 +1,24 @@
 package fr.free.nrw.commons.upload;
 
-import static fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF;
-
 import android.content.Context;
 import android.net.Uri;
-import fr.free.nrw.commons.contributions.Contribution;
+
-import fr.free.nrw.commons.upload.UploadService.NotificationUpdateProgressListener;
+import org.wikipedia.csrf.CsrfTokenClient;
-import io.reactivex.Observable;
+
 import java.io.File;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.upload.UploadService.NotificationUpdateProgressListener;
+import io.reactivex.Observable;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
-import org.wikipedia.csrf.CsrfTokenClient;
+
+import static fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF;
 
 @Singleton
 public class UploadClient {

app/src/main/java/fr/free/nrw/commons/upload/UploadContract.java

@@ -1,10 +1,10 @@
 package fr.free.nrw.commons.upload;
 
+import java.util.List;
+
 import fr.free.nrw.commons.BasePresenter;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 
-import java.util.List;
-
 /**
  * The contract using which the UplaodActivity would communicate with its presenter
  */

app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java

@@ -3,7 +3,6 @@ package fr.free.nrw.commons.upload;
 import android.annotation.SuppressLint;
 
 import java.lang.reflect.Proxy;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -19,8 +18,6 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
-import static fr.free.nrw.commons.upload.UploadModel.UploadItem;
-
 /**
  * The MVP pattern presenter of Upload GUI
  */