From ad88bb3929c9feccf3a9250aeb16d480e4332a96 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 15 Oct 2015 18:41:19 +1300 Subject: [PATCH] Changed directory to fr/free/nrw/commons Fixes issue #14 --- .../wikimedia => fr/free/nrw}/commons/AboutActivity.java | 1 - .../free/nrw}/commons/CommonsApplication.java | 9 +-------- .../{org/wikimedia => fr/free/nrw}/commons/EventLog.java | 1 - .../free/nrw}/commons/HandlerService.java | 0 .../{org/wikimedia => fr/free/nrw}/commons/License.java | 0 .../wikimedia => fr/free/nrw}/commons/LicenseList.java | 0 .../{org/wikimedia => fr/free/nrw}/commons/Media.java | 1 - .../free/nrw}/commons/MediaDataExtractor.java | 0 .../free/nrw}/commons/MediaWikiImageView.java | 1 - .../{org/wikimedia => fr/free/nrw}/commons/Prefs.java | 0 .../free/nrw}/commons/SettingsActivity.java | 2 -- .../{org/wikimedia => fr/free/nrw}/commons/Utils.java | 2 -- .../free/nrw}/commons/WelcomeActivity.java | 0 .../wikimedia => fr/free/nrw}/commons/api/MWApi.java | 0 .../free/nrw}/commons/auth/AuthenticatedActivity.java | 3 ++- .../free/nrw}/commons/auth/LoginActivity.java | 6 ++++-- .../free/nrw}/commons/auth/WikiAccountAuthenticator.java | 2 +- .../commons/auth/WikiAccountAuthenticatorService.java | 0 .../free/nrw}/commons/campaigns/Campaign.java | 0 .../free/nrw}/commons/campaigns/CampaignActivity.java | 3 +-- .../nrw}/commons/campaigns/CampaignContribution.java | 0 .../nrw}/commons/campaigns/CampaignsContentProvider.java | 0 .../nrw}/commons/campaigns/CampaignsListAdapter.java | 9 --------- .../nrw}/commons/campaigns/CampaignsSyncAdapter.java | 5 ----- .../nrw}/commons/campaigns/CampaignsSyncService.java | 1 - .../nrw}/commons/category/CategorizationFragment.java | 8 +------- .../free/nrw}/commons/category/Category.java | 4 ---- .../nrw}/commons/category/CategoryContentProvider.java | 0 .../free/nrw}/commons/contributions/Contribution.java | 0 .../commons/contributions/ContributionController.java | 2 +- .../commons/contributions/ContributionViewHolder.java | 1 - .../commons/contributions/ContributionsActivity.java | 3 +++ .../contributions/ContributionsContentProvider.java | 2 +- .../commons/contributions/ContributionsListAdapter.java | 4 +--- .../commons/contributions/ContributionsListFragment.java | 5 +++-- .../commons/contributions/ContributionsSyncAdapter.java | 2 +- .../commons/contributions/ContributionsSyncService.java | 0 .../nrw}/commons/contributions/MediaListAdapter.java | 3 +-- .../free/nrw}/commons/data/DBOpenHelper.java | 2 +- .../free/nrw}/commons/media/CategoryImagesLoader.java | 0 .../free/nrw}/commons/media/MediaDetailFragment.java | 0 .../nrw}/commons/media/MediaDetailPagerFragment.java | 4 +++- .../free/nrw}/commons/media/MediaDetailSpacer.java | 0 .../nrw}/commons/modifications/CategoryModifier.java | 5 ----- .../modifications/ModificationsContentProvider.java | 2 +- .../commons/modifications/ModificationsSyncAdapter.java | 8 +++----- .../commons/modifications/ModificationsSyncService.java | 0 .../nrw}/commons/modifications/ModifierSequence.java | 4 ---- .../free/nrw}/commons/modifications/PageModifier.java | 1 - .../commons/modifications/TemplateRemoveModifier.java | 0 .../free/nrw}/commons/upload/MultipleShareActivity.java | 9 +++++---- .../nrw}/commons/upload/MultipleUploadListFragment.java | 0 .../free/nrw}/commons/upload/ShareActivity.java | 7 ++++--- .../free/nrw}/commons/upload/SingleUploadFragment.java | 4 +--- .../free/nrw}/commons/upload/UploadController.java | 4 +--- .../free/nrw}/commons/upload/UploadService.java | 8 +++++--- 56 files changed, 45 insertions(+), 93 deletions(-) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/AboutActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/CommonsApplication.java (97%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/EventLog.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/HandlerService.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/License.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/LicenseList.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/Media.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/MediaDataExtractor.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/MediaWikiImageView.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/Prefs.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/SettingsActivity.java (96%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/Utils.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/WelcomeActivity.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/api/MWApi.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/auth/AuthenticatedActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/auth/LoginActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/auth/WikiAccountAuthenticator.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/auth/WikiAccountAuthenticatorService.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/Campaign.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignContribution.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignsContentProvider.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignsListAdapter.java (74%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignsSyncAdapter.java (94%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/campaigns/CampaignsSyncService.java (90%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/category/CategorizationFragment.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/category/Category.java (96%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/category/CategoryContentProvider.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/Contribution.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionController.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionViewHolder.java (96%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsContentProvider.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsListAdapter.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsListFragment.java (97%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsSyncAdapter.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/ContributionsSyncService.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/contributions/MediaListAdapter.java (97%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/data/DBOpenHelper.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/media/CategoryImagesLoader.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/media/MediaDetailFragment.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/media/MediaDetailPagerFragment.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/media/MediaDetailSpacer.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/CategoryModifier.java (93%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/ModificationsContentProvider.java (99%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/ModificationsSyncAdapter.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/ModificationsSyncService.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/ModifierSequence.java (96%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/PageModifier.java (97%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/modifications/TemplateRemoveModifier.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/MultipleShareActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/MultipleUploadListFragment.java (100%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/ShareActivity.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/SingleUploadFragment.java (97%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/UploadController.java (98%) rename commons/src/main/java/{org/wikimedia => fr/free/nrw}/commons/upload/UploadService.java (98%) diff --git a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java b/commons/src/main/java/fr/free/nrw/commons/AboutActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/AboutActivity.java rename to commons/src/main/java/fr/free/nrw/commons/AboutActivity.java index bdaf4b12e..19af1a69d 100644 --- a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons; -import android.app.Activity; import android.os.Bundle; import android.text.Html; import android.text.method.LinkMovementMethod; diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java similarity index 97% rename from commons/src/main/java/org/wikimedia/commons/CommonsApplication.java rename to commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java index c593a1166..ea8f0c210 100644 --- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java +++ b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -1,38 +1,31 @@ package fr.free.nrw.commons; import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.net.URI; import android.accounts.*; import android.app.Application; -import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Bitmap; -import android.net.Uri; import android.os.Build; import android.support.v4.util.LruCache; import android.util.Log; import com.android.volley.RequestQueue; import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache; -import com.nostra13.universalimageloader.cache.memory.impl.LimitedAgeMemoryCache; 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.client.HttpClient; import org.apache.http.conn.*; import org.apache.http.conn.scheme.*; import org.apache.http.conn.ssl.*; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.mediawiki.api.*; -import fr.free.nrw.commons.auth.WikiAccountAuthenticator; import org.apache.http.impl.client.*; import org.apache.http.params.CoreProtocolPNames; import fr.free.nrw.commons.data.*; diff --git a/commons/src/main/java/org/wikimedia/commons/EventLog.java b/commons/src/main/java/fr/free/nrw/commons/EventLog.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/EventLog.java rename to commons/src/main/java/fr/free/nrw/commons/EventLog.java index 698171245..a860f4878 100644 --- a/commons/src/main/java/org/wikimedia/commons/EventLog.java +++ b/commons/src/main/java/fr/free/nrw/commons/EventLog.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons; -import android.content.Context; import android.content.SharedPreferences; import android.os.*; import android.preference.PreferenceManager; diff --git a/commons/src/main/java/org/wikimedia/commons/HandlerService.java b/commons/src/main/java/fr/free/nrw/commons/HandlerService.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/HandlerService.java rename to commons/src/main/java/fr/free/nrw/commons/HandlerService.java diff --git a/commons/src/main/java/org/wikimedia/commons/License.java b/commons/src/main/java/fr/free/nrw/commons/License.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/License.java rename to commons/src/main/java/fr/free/nrw/commons/License.java diff --git a/commons/src/main/java/org/wikimedia/commons/LicenseList.java b/commons/src/main/java/fr/free/nrw/commons/LicenseList.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/LicenseList.java rename to commons/src/main/java/fr/free/nrw/commons/LicenseList.java diff --git a/commons/src/main/java/org/wikimedia/commons/Media.java b/commons/src/main/java/fr/free/nrw/commons/Media.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/Media.java rename to commons/src/main/java/fr/free/nrw/commons/Media.java index 85d10d2fa..ba0053442 100644 --- a/commons/src/main/java/org/wikimedia/commons/Media.java +++ b/commons/src/main/java/fr/free/nrw/commons/Media.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons; import android.net.Uri; import android.os.*; -import android.util.Log; import java.util.*; import java.util.regex.*; diff --git a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java b/commons/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java rename to commons/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java rename to commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java index f998c5834..f733edcf3 100644 --- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java +++ b/commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java @@ -20,7 +20,6 @@ import android.content.res.TypedArray; import android.graphics.drawable.BitmapDrawable; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; diff --git a/commons/src/main/java/org/wikimedia/commons/Prefs.java b/commons/src/main/java/fr/free/nrw/commons/Prefs.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/Prefs.java rename to commons/src/main/java/fr/free/nrw/commons/Prefs.java diff --git a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java b/commons/src/main/java/fr/free/nrw/commons/SettingsActivity.java similarity index 96% rename from commons/src/main/java/org/wikimedia/commons/SettingsActivity.java rename to commons/src/main/java/fr/free/nrw/commons/SettingsActivity.java index a33026e48..e8b3146c1 100644 --- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/SettingsActivity.java @@ -5,8 +5,6 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; -import android.preference.PreferenceManager; -import android.util.Log; import com.actionbarsherlock.app.SherlockPreferenceActivity; public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/fr/free/nrw/commons/Utils.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/Utils.java rename to commons/src/main/java/fr/free/nrw/commons/Utils.java index 9a2ba7c9b..c3e3e7d9f 100644 --- a/commons/src/main/java/org/wikimedia/commons/Utils.java +++ b/commons/src/main/java/fr/free/nrw/commons/Utils.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons; import android.net.Uri; import android.os.*; -import android.util.Log; import com.nostra13.universalimageloader.core.*; import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; @@ -19,7 +18,6 @@ import java.io.*; import java.text.*; import java.util.*; import java.util.concurrent.Executor; -import java.util.regex.Pattern; public class Utils { diff --git a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java b/commons/src/main/java/fr/free/nrw/commons/WelcomeActivity.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java rename to commons/src/main/java/fr/free/nrw/commons/WelcomeActivity.java diff --git a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java b/commons/src/main/java/fr/free/nrw/commons/api/MWApi.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/api/MWApi.java rename to commons/src/main/java/fr/free/nrw/commons/api/MWApi.java diff --git a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java b/commons/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java rename to commons/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java index a855b187f..a7579e54e 100644 --- a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java @@ -8,7 +8,8 @@ import com.actionbarsherlock.app.*; import android.accounts.*; import android.os.*; -import fr.free.nrw.commons.*; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.Utils; public class AuthenticatedActivity extends SherlockFragmentActivity { diff --git a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java b/commons/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java rename to commons/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java index 8a3c16b89..29f892eb6 100644 --- a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java @@ -15,10 +15,12 @@ import android.widget.*; import android.support.v4.app.NavUtils; import fr.free.nrw.commons.*; -import fr.free.nrw.commons.EventLog; +import fr.free.nrw.commons.WelcomeActivity; import fr.free.nrw.commons.campaigns.CampaignsContentProvider; -import fr.free.nrw.commons.contributions.*; import fr.free.nrw.commons.modifications.ModificationsContentProvider; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.EventLog; +import fr.free.nrw.commons.contributions.*; public class LoginActivity extends AccountAuthenticatorActivity { diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java b/commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java rename to commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java index d41155619..0cb35cf1b 100644 --- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java +++ b/commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java @@ -7,7 +7,7 @@ import android.content.*; import android.os.*; import org.mediawiki.api.*; -import fr.free.nrw.commons.*; +import fr.free.nrw.commons.CommonsApplication; public class WikiAccountAuthenticator extends AbstractAccountAuthenticator { diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java b/commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java rename to commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/Campaign.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/Campaign.java diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignActivity.java index 3e3a44dbc..d9e525e2b 100644 --- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignActivity.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.campaigns; -import android.app.Activity; import android.content.ContentResolver; import android.content.Intent; import android.database.Cursor; @@ -12,9 +11,9 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ListView; import com.actionbarsherlock.app.SherlockFragmentActivity; +import fr.free.nrw.commons.contributions.ContributionsActivity; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.contributions.ContributionsActivity; public class CampaignActivity extends SherlockFragmentActivity diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignContribution.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignContribution.java diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsContentProvider.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsContentProvider.java diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsListAdapter.java similarity index 74% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsListAdapter.java index ecb40f699..d79ed4ba4 100644 --- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsListAdapter.java @@ -3,21 +3,12 @@ package fr.free.nrw.commons.campaigns; import android.app.Activity; import android.content.Context; import android.database.Cursor; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; import android.support.v4.widget.CursorAdapter; -import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.actionbarsherlock.app.SherlockFragment; import com.nostra13.universalimageloader.core.DisplayImageOptions; -import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; -import fr.free.nrw.commons.CommonsApplication; -import fr.free.nrw.commons.MediaWikiImageView; -import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.campaigns.Campaign; class CampaignsListAdapter extends CursorAdapter { diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncAdapter.java similarity index 94% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncAdapter.java index 1b1096ff2..4dc78d676 100644 --- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncAdapter.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons.campaigns; import android.accounts.Account; import android.content.*; -import android.database.Cursor; import android.os.Bundle; import android.os.RemoteException; import android.text.TextUtils; @@ -10,13 +9,9 @@ import android.util.Log; import org.mediawiki.api.ApiResult; import org.mediawiki.api.MWApi; 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; import java.io.IOException; import java.util.ArrayList; -import java.util.Date; public class CampaignsSyncAdapter extends AbstractThreadedSyncAdapter { diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncService.java similarity index 90% rename from commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java rename to commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncService.java index d8055e761..71129a095 100644 --- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java +++ b/commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncService.java @@ -3,7 +3,6 @@ package fr.free.nrw.commons.campaigns; import android.app.Service; import android.content.Intent; import android.os.IBinder; -import fr.free.nrw.commons.contributions.ContributionsSyncAdapter; public class CampaignsSyncService extends Service { diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java rename to commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index c53d893fc..c5ecdafa8 100644 --- a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -9,23 +9,17 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.*; -import android.view.MenuInflater; import android.widget.*; import com.actionbarsherlock.app.SherlockFragment; -import com.actionbarsherlock.view.*; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; +import fr.free.nrw.commons.Utils; import org.mediawiki.api.ApiResult; import org.mediawiki.api.MWApi; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.category.Category; -import fr.free.nrw.commons.category.CategoryContentProvider; -import fr.free.nrw.commons.contributions.Contribution; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; diff --git a/commons/src/main/java/org/wikimedia/commons/category/Category.java b/commons/src/main/java/fr/free/nrw/commons/category/Category.java similarity index 96% rename from commons/src/main/java/org/wikimedia/commons/category/Category.java rename to commons/src/main/java/fr/free/nrw/commons/category/Category.java index 1dd3e555e..c58b8da2c 100644 --- a/commons/src/main/java/org/wikimedia/commons/category/Category.java +++ b/commons/src/main/java/fr/free/nrw/commons/category/Category.java @@ -5,11 +5,7 @@ import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; import android.os.RemoteException; -import android.text.TextUtils; -import fr.free.nrw.commons.contributions.ContributionsContentProvider; import java.util.Date; diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java b/commons/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java rename to commons/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java b/commons/src/main/java/fr/free/nrw/commons/contributions/Contribution.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/Contribution.java diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 32777cdb6..7929913da 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -8,9 +8,9 @@ import android.os.Environment; import android.provider.MediaStore; import android.util.Log; import com.actionbarsherlock.app.SherlockFragment; -import fr.free.nrw.commons.campaigns.Campaign; import fr.free.nrw.commons.upload.ShareActivity; import fr.free.nrw.commons.upload.UploadService; +import fr.free.nrw.commons.campaigns.Campaign; import java.io.File; import java.io.IOException; diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java similarity index 96% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java index 837a4360e..988538c3a 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons.contributions; import android.view.View; -import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import fr.free.nrw.commons.MediaWikiImageView; diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 81cff5cbe..06fd2d2d5 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -19,6 +19,9 @@ import com.actionbarsherlock.view.MenuItem; import fr.free.nrw.commons.*; import fr.free.nrw.commons.auth.*; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.HandlerService; +import fr.free.nrw.commons.Media; import fr.free.nrw.commons.campaigns.Campaign; import fr.free.nrw.commons.media.*; import fr.free.nrw.commons.upload.UploadService; diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java index b2657b835..0bf8a440e 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java @@ -7,8 +7,8 @@ import android.net.*; import android.text.*; import android.util.*; -import fr.free.nrw.commons.*; import fr.free.nrw.commons.data.*; +import fr.free.nrw.commons.CommonsApplication; public class ContributionsContentProvider extends ContentProvider{ diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java index 6397caab9..e605765bc 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java @@ -7,17 +7,15 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.support.v4.widget.CursorAdapter; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.ViewGroup; -import com.actionbarsherlock.app.SherlockFragment; 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.R; import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.R; class ContributionsListAdapter extends CursorAdapter { diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java similarity index 97% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index cbade3177..140168e18 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -4,7 +4,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.database.Cursor; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -17,8 +16,10 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import fr.free.nrw.commons.*; import fr.free.nrw.commons.R; +import fr.free.nrw.commons.AboutActivity; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.SettingsActivity; import fr.free.nrw.commons.campaigns.Campaign; public class ContributionsListFragment extends SherlockFragment { diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java index 1cf8bf976..80151715e 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java @@ -12,8 +12,8 @@ import java.io.*; import java.util.*; import org.mediawiki.api.*; +import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.*; public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter { diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java b/commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java b/commons/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java similarity index 97% rename from commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java index 7a365a12b..2a84db1f8 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java @@ -4,9 +4,8 @@ import android.app.Activity; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import com.android.volley.toolbox.ImageLoader; -import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.Media; +import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.R; import java.util.ArrayList; diff --git a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java b/commons/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java rename to commons/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java index e3b532f6f..b475a4c72 100644 --- a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java +++ b/commons/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java @@ -3,10 +3,10 @@ package fr.free.nrw.commons.data; import android.content.*; import android.database.sqlite.*; +import fr.free.nrw.commons.modifications.ModifierSequence; import fr.free.nrw.commons.campaigns.Campaign; import fr.free.nrw.commons.category.Category; import fr.free.nrw.commons.contributions.*; -import fr.free.nrw.commons.modifications.ModifierSequence; public class DBOpenHelper extends SQLiteOpenHelper{ diff --git a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java b/commons/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java rename to commons/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java rename to commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java rename to commons/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index c2d0813ef..5b20167d3 100644 --- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -16,9 +16,11 @@ import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.actionbarsherlock.widget.ShareActionProvider; import fr.free.nrw.commons.*; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.EventLog; +import fr.free.nrw.commons.Media; import fr.free.nrw.commons.contributions.Contribution; import fr.free.nrw.commons.contributions.ContributionsActivity; diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java b/commons/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java rename to commons/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java b/commons/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java similarity index 93% rename from commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java index f4c59cf93..1a4b5ffce 100644 --- a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java +++ b/commons/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java @@ -1,14 +1,9 @@ package fr.free.nrw.commons.modifications; -import android.os.Bundle; -import android.os.Parcel; -import android.text.TextUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.*; - public class CategoryModifier extends PageModifier { diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java b/commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java similarity index 99% rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java index 1bf4ae382..32449128d 100644 --- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java +++ b/commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java @@ -7,8 +7,8 @@ import android.net.*; import android.text.*; import android.util.*; -import fr.free.nrw.commons.*; import fr.free.nrw.commons.data.*; +import fr.free.nrw.commons.CommonsApplication; public class ModificationsContentProvider extends ContentProvider{ diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java b/commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java index 72b12ae00..f38a51ef0 100644 --- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java +++ b/commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java @@ -6,18 +6,16 @@ import android.accounts.OperationCanceledException; import android.content.*; import android.database.Cursor; import android.os.RemoteException; -import android.text.TextUtils; import android.util.Log; import android.accounts.Account; import android.os.Bundle; import java.io.*; -import java.util.*; -import org.mediawiki.api.*; -import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.*; 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.ContributionsContentProvider; diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java b/commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java b/commons/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java similarity index 96% rename from commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java index 7c88ee225..789e448be 100644 --- a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java +++ b/commons/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java @@ -6,15 +6,11 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.RemoteException; -import android.text.TextUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import fr.free.nrw.commons.contributions.ContributionsContentProvider; import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; public class ModifierSequence { private Uri mediaUri; diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java b/commons/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java similarity index 97% rename from commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java index d130570ff..f4b3c7359 100644 --- a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java +++ b/commons/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.modifications; -import android.os.Bundle; import org.json.JSONException; import org.json.JSONObject; diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java b/commons/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java rename to commons/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java rename to commons/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 297759896..bd7a0be03 100644 --- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons.upload; import java.util.*; -import java.util.concurrent.*; import android.app.*; import android.content.*; @@ -9,7 +8,6 @@ import android.database.DataSetObserver; import android.net.*; import android.os.*; import android.support.v4.app.FragmentManager; -import android.text.*; import android.view.*; import android.view.inputmethod.InputMethodManager; import android.widget.*; @@ -17,13 +15,16 @@ import com.actionbarsherlock.view.MenuItem; 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.category.CategorizationFragment; -import fr.free.nrw.commons.contributions.*; -import fr.free.nrw.commons.media.*; 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 diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java b/commons/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java similarity index 100% rename from commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java rename to commons/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java diff --git a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java rename to commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 399afaff3..2742b4985 100644 --- a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.upload; -import android.app.*; import android.content.*; import android.os.*; import com.nostra13.universalimageloader.core.ImageLoader; @@ -10,14 +9,16 @@ import com.actionbarsherlock.view.MenuItem; import android.widget.*; import fr.free.nrw.commons.*; +import fr.free.nrw.commons.modifications.CategoryModifier; +import fr.free.nrw.commons.modifications.TemplateRemoveModifier; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.EventLog; import fr.free.nrw.commons.campaigns.Campaign; import fr.free.nrw.commons.category.CategorizationFragment; import fr.free.nrw.commons.contributions.*; import fr.free.nrw.commons.auth.*; -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 java.util.ArrayList; diff --git a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java b/commons/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java similarity index 97% rename from commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java rename to commons/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index eb63ea5d4..70e399d20 100644 --- a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -20,11 +20,9 @@ import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.nostra13.universalimageloader.core.ImageLoader; import fr.free.nrw.commons.Prefs; -import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.contributions.Contribution; +import fr.free.nrw.commons.R; public class SingleUploadFragment extends SherlockFragment { diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/upload/UploadController.java rename to commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java index e218b0cac..fff719615 100644 --- a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -10,18 +10,16 @@ import android.preference.PreferenceManager; import android.provider.MediaStore; import android.text.TextUtils; import android.webkit.MimeTypeMap; +import fr.free.nrw.commons.contributions.Contribution; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.HandlerService; import fr.free.nrw.commons.Prefs; import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.campaigns.Campaign; import fr.free.nrw.commons.campaigns.CampaignContribution; -import fr.free.nrw.commons.contributions.Contribution; import java.io.IOException; import java.util.Date; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; public class UploadController { private UploadService uploadService; diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java b/commons/src/main/java/fr/free/nrw/commons/upload/UploadService.java similarity index 98% rename from commons/src/main/java/org/wikimedia/commons/upload/UploadService.java rename to commons/src/main/java/fr/free/nrw/commons/upload/UploadService.java index 2be1cc65f..36090e390 100644 --- a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/UploadService.java @@ -8,7 +8,8 @@ import java.util.regex.Pattern; import android.graphics.*; import android.os.Bundle; -import android.util.EventLog; +import fr.free.nrw.commons.*; +import fr.free.nrw.commons.EventLog; import org.mediawiki.api.*; import in.yuvi.http.fluent.ProgressListener; @@ -18,8 +19,9 @@ import android.support.v4.app.NotificationCompat; import android.util.*; import android.widget.*; -import fr.free.nrw.commons.*; import fr.free.nrw.commons.contributions.*; +import fr.free.nrw.commons.HandlerService; +import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.modifications.ModificationsContentProvider; public class UploadService extends HandlerService { @@ -241,7 +243,7 @@ public class UploadService extends HandlerService { contribution.setDateUploaded(dateUploaded); contribution.save(); - fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) + EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) .param("username", app.getCurrentAccount().name) .param("source", contribution.getSource()) //FIXME .param("filename", contribution.getFilename())