Merge pull request #315 from anirudh24seven/optimize-imports

Reorganize imports across the project

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

@@ -1,38 +1,45 @@
 package fr.free.nrw.commons;
 
-import java.io.IOException;
+import android.accounts.Account;
-
+import android.accounts.AccountManager;
-import android.accounts.*;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
 import android.app.Application;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.os.Build;
-
 import android.support.v4.util.LruCache;
 import android.util.Log;
+
 import com.android.volley.RequestQueue;
+import com.android.volley.toolbox.BasicNetwork;
+import com.android.volley.toolbox.DiskBasedCache;
+import com.android.volley.toolbox.HurlStack;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.utils.StorageUtils;
-import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
+
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
-import org.apache.http.conn.*;
+import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.*;
+import org.apache.http.conn.scheme.PlainSocketFactory;
-import org.apache.http.conn.ssl.*;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.impl.client.AbstractHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
-import org.mediawiki.api.*;
-import org.apache.http.impl.client.*;
 import org.apache.http.params.CoreProtocolPNames;
+import org.mediawiki.api.MWApi;
 
+import java.io.IOException;
+
+import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
 import fr.free.nrw.commons.caching.CacheController;
-import fr.free.nrw.commons.data.*;
-
-import com.android.volley.toolbox.*;
 
 // TODO: Use ProGuard to rip out reporting when publishing
 @ReportsCrashes(

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

@@ -1,14 +1,21 @@
 package fr.free.nrw.commons;
 
 import android.content.SharedPreferences;
-import android.os.*;
+import android.os.AsyncTask;
+import android.os.Build;
 import android.preference.PreferenceManager;
-import android.util.*;
+import android.util.Log;
-import in.yuvi.http.fluent.Http;
+
 import org.apache.http.HttpResponse;
-import org.json.*;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import in.yuvi.http.fluent.Http;
 
 public class EventLog {
 

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

@@ -1,8 +1,13 @@
 package fr.free.nrw.commons;
 
-import android.app.*;
+import android.app.Service;
-import android.content.*;
+import android.content.Intent;
-import android.os.*;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
 
 public abstract class HandlerService<T> extends Service {
     private volatile Looper threadLooper;

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

@@ -2,7 +2,6 @@ package fr.free.nrw.commons;
 
 import android.app.Activity;
 import android.content.res.Resources;
-import android.util.Log;
 
 import org.xmlpull.v1.XmlPullParser;
 

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

@@ -1,10 +1,16 @@
 package fr.free.nrw.commons;
 
 import android.net.Uri;
-import android.os.*;
+import android.os.Parcel;
+import android.os.Parcelable;
 
-import java.util.*;
+import java.util.ArrayList;
-import java.util.regex.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class Media implements Parcelable {
 

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

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons;
 
 import android.util.Log;
+
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
 import org.w3c.dom.Document;
@@ -9,14 +10,18 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Fetch additional media data from the network that we don't store locally.

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

@@ -27,6 +27,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.ImageLoader.ImageContainer;
 import com.android.volley.toolbox.ImageLoader.ImageListener;
+
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 

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

@@ -7,10 +7,7 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -1,13 +1,16 @@
 package fr.free.nrw.commons.auth;
 
-import java.io.IOException;
+import android.accounts.Account;
-
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
-
+import android.os.AsyncTask;
-import android.accounts.*;
+import android.os.Bundle;
-import android.os.*;
 import android.support.v7.app.AppCompatActivity;
 
+import java.io.IOException;
+
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 

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

@@ -9,10 +9,8 @@ import android.app.ProgressDialog;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.NavUtils;
 import android.text.Editable;
 import android.text.TextWatcher;

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

@@ -1,20 +1,14 @@
 package fr.free.nrw.commons.auth;
 
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
 import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
-import fr.free.nrw.commons.R;
-
 public class SignupActivity extends Activity {
 
     private WebView webView;

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

@@ -1,12 +1,18 @@
 package fr.free.nrw.commons.auth;
 
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.mediawiki.api.MWApi;
+
 import java.io.IOException;
 
-import android.accounts.*;
-import android.content.*;
-import android.os.*;
-
-import org.mediawiki.api.*;
 import fr.free.nrw.commons.CommonsApplication;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {

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

@@ -1,8 +1,8 @@
 package fr.free.nrw.commons.auth;
 
-import android.app.*;
+import android.app.Service;
-import android.content.*;
+import android.content.Intent;
-import android.os.*;
+import android.os.IBinder;
 
 public class WikiAccountAuthenticatorService extends Service{
 

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

@@ -31,26 +31,18 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import org.mediawiki.api.ApiResult;
-import org.mediawiki.api.MWApi;
-
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.upload.MwVolleyApi;

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

@@ -9,7 +9,7 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import fr.free.nrw.commons.CommonsApplication;
+
 import fr.free.nrw.commons.data.DBOpenHelper;
 
 public class CategoryContentProvider extends ContentProvider {

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

@@ -12,14 +12,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Iterator;
-import java.util.List;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
 
 import fr.free.nrw.commons.CommonsApplication;
 
-import static android.R.id.list;
-
 /**
  * Sends asynchronous queries to the Commons MediaWiki API to retrieve categories that share the
  * same prefix as the keyword typed in by the user. The 'acprefix' action-specific parameter is used

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

@@ -1,9 +1,7 @@
 package fr.free.nrw.commons.category;
 
 import android.os.AsyncTask;
-import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;

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

@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.text.TextUtils;
-import android.util.Log;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -3,6 +3,7 @@ package fr.free.nrw.commons.contributions;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.R;
 

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

@@ -27,8 +27,9 @@ import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.HandlerService;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.auth.*;
+import fr.free.nrw.commons.auth.AuthenticatedActivity;
-import fr.free.nrw.commons.media.*;
+import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
+import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 import fr.free.nrw.commons.upload.UploadService;
 
 public  class       ContributionsActivity

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

@@ -1,14 +1,16 @@
 package fr.free.nrw.commons.contributions;
 
-import android.content.*;
+import android.content.ContentProvider;
-import android.database.*;
+import android.content.ContentValues;
-import android.database.sqlite.*;
+import android.content.UriMatcher;
-import android.net.*;
+import android.database.Cursor;
-import android.text.*;
+import android.database.sqlite.SQLiteDatabase;
-import android.util.*;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
 
-import fr.free.nrw.commons.data.*;
+import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.CommonsApplication;
 
 public class ContributionsContentProvider extends ContentProvider{
 

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

@@ -9,13 +9,15 @@ import android.support.v4.widget.CursorAdapter;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
+
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.MediaWikiImageView;
-import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
 
 class ContributionsListAdapter extends CursorAdapter {
 

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

@@ -1,29 +1,26 @@
 package fr.free.nrw.commons.contributions;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
-import android.support.v4.app.Fragment;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.widget.Toast;
 
 import fr.free.nrw.commons.AboutActivity;
@@ -31,7 +28,6 @@ import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.SettingsActivity;
 import fr.free.nrw.commons.nearby.NearbyActivity;
-import fr.free.nrw.commons.upload.UploadService;
 
 import static android.app.Activity.RESULT_OK;
 

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

@@ -1,17 +1,25 @@
 package fr.free.nrw.commons.contributions;
 
-import android.content.*;
+import android.accounts.Account;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SyncResult;
 import android.database.Cursor;
+import android.os.Bundle;
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
-import android.accounts.Account;
-import android.os.Bundle;
 
-import java.io.*;
+import org.mediawiki.api.ApiResult;
-import java.util.*;
+import org.mediawiki.api.MWApi;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
 
-import org.mediawiki.api.*;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 

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

@@ -1,8 +1,8 @@
 package fr.free.nrw.commons.contributions;
 
-import android.app.*;
+import android.app.Service;
-import android.content.*;
+import android.content.Intent;
-import android.os.*;
+import android.os.IBinder;
 
 public class ContributionsSyncService extends Service {
 

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

@@ -4,12 +4,13 @@ import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.R;
 
 import java.util.ArrayList;
 
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
+
 public class MediaListAdapter extends BaseAdapter {
     private ArrayList<Media> mediaList;
     private Activity activity;

app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java

@@ -1,11 +1,12 @@
 package fr.free.nrw.commons.data;
 
-import android.content.*;
+import android.content.Context;
-import android.database.sqlite.*;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
 
-import fr.free.nrw.commons.modifications.ModifierSequence;
 import fr.free.nrw.commons.category.Category;
-import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.modifications.ModifierSequence;
 
 public class DBOpenHelper  extends SQLiteOpenHelper{
 

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

@@ -3,15 +3,17 @@ package fr.free.nrw.commons.media;
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 import android.util.Log;
+
 import org.mediawiki.api.ApiResult;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.Utils;
+
 public class CategoryImagesLoader extends AsyncTaskLoader<List<Media>>{
     private final CommonsApplication app;
     private final String category;

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

@@ -6,7 +6,6 @@ import android.graphics.Bitmap;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java

@@ -1,14 +1,16 @@
 package fr.free.nrw.commons.modifications;
 
-import android.content.*;
+import android.content.ContentProvider;
-import android.database.*;
+import android.content.ContentValues;
-import android.database.sqlite.*;
+import android.content.UriMatcher;
-import android.net.*;
+import android.database.Cursor;
-import android.text.*;
+import android.database.sqlite.SQLiteDatabase;
-import android.util.*;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
 
-import fr.free.nrw.commons.data.*;
+import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.CommonsApplication;
 
 public class ModificationsContentProvider extends ContentProvider{
 

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java

@@ -1,21 +1,26 @@
 package fr.free.nrw.commons.modifications;
 
+import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
-import android.content.*;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.SyncResult;
 import android.database.Cursor;
+import android.os.Bundle;
 import android.os.RemoteException;
 import android.util.Log;
-import android.accounts.Account;
-import android.os.Bundle;
 
-import java.io.*;
+import org.mediawiki.api.ApiResult;
+import org.mediawiki.api.MWApi;
+
+import java.io.IOException;
 
-import fr.free.nrw.commons.contributions.Contribution;
-import org.mediawiki.api.*;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java

@@ -1,8 +1,8 @@
 package fr.free.nrw.commons.modifications;
 
-import android.app.*;
+import android.app.Service;
-import android.content.*;
+import android.content.Intent;
-import android.os.*;
+import android.os.IBinder;
 
 public class ModificationsSyncService extends Service {
 

app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java

@@ -6,6 +6,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.RemoteException;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

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

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.nearby;
 
-import android.os.Parcel;
-
 public class LatLng {
 
     public final double latitude;

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

@@ -6,7 +6,6 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;

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

@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.nearby;
 
-import android.net.Uri;
 import android.os.StrictMode;
 import android.util.Log;
 

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

@@ -6,8 +6,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.provider.DocumentsContract;
+import android.provider.MediaStore;
 
 public class FileUtils {
 

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

@@ -10,8 +10,8 @@ import android.media.ExifInterface;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
 import android.util.Log;
+
 import java.io.IOException;
 
 /**

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

@@ -1,35 +1,41 @@
 package fr.free.nrw.commons.upload;
 
-import java.util.*;
-
 import android.Manifest;
-import android.app.*;
+import android.app.ProgressDialog;
-import android.content.*;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.DataSetObserver;
-import android.net.*;
+import android.net.Uri;
-import android.os.*;
+import android.os.Build;
+import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.*;
+import android.view.MenuItem;
+import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.AdapterView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.auth.*;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.EventLog;
 import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.auth.AuthenticatedActivity;
+import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
 import fr.free.nrw.commons.category.CategorizationFragment;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 import fr.free.nrw.commons.modifications.CategoryModifier;
 import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 import fr.free.nrw.commons.modifications.ModifierSequence;
 import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.media.*;
 
 public  class       MultipleShareActivity
         extends     AuthenticatedActivity

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

@@ -1,21 +1,36 @@
 package fr.free.nrw.commons.upload;
 
-import android.content.*;
+import android.content.Context;
-import android.graphics.*;
+import android.graphics.Point;
-import android.net.*;
+import android.net.Uri;
-import android.os.*;
+import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.text.*;
+import android.text.Editable;
-import android.util.*;
+import android.text.TextUtils;
-import android.view.*;
+import android.text.TextWatcher;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.AdapterView;
-import com.nostra13.universalimageloader.core.*;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.contributions.Contribution;
-import fr.free.nrw.commons.media.*;
+import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 
 
 public class MultipleUploadListFragment extends Fragment {

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

@@ -13,7 +13,6 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.HttpHeaderParser;
 import com.android.volley.toolbox.JsonRequest;
 import com.android.volley.toolbox.Volley;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 

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

@@ -12,7 +12,6 @@ import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;

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

@@ -1,30 +1,41 @@
 package fr.free.nrw.commons.upload;
 
-import java.io.*;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+import android.widget.Toast;
+
+import org.mediawiki.api.ApiResult;
+import org.mediawiki.api.MWApi;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.graphics.*;
+import fr.free.nrw.commons.CommonsApplication;
-import android.os.Bundle;
-import fr.free.nrw.commons.*;
 import fr.free.nrw.commons.EventLog;
-import org.mediawiki.api.*;
-import in.yuvi.http.fluent.ProgressListener;
-
-import android.app.*;
-import android.content.*;
-import android.support.v4.app.NotificationCompat;
-import android.util.*;
-import android.webkit.MimeTypeMap;
-import android.widget.*;
-
-import fr.free.nrw.commons.contributions.*;
 import fr.free.nrw.commons.HandlerService;
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.ContributionsActivity;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import in.yuvi.http.fluent.ProgressListener;
 
 public class UploadService extends HandlerService<Contribution> {