From 3397e2eef403d03841747f178489674016f3a4f5 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sun, 4 Oct 2015 12:56:40 +1300 Subject: [PATCH 1/5] Added imports to SettingsActivity According to IntelliJ suggestion --- .../main/java/org/wikimedia/commons/SettingsActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java index ee71d2f2c..37a4d4bf0 100644 --- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java +++ b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java @@ -1,4 +1,4 @@ -package fr.free.nrw.commons; +package org.wikimedia.commons; import android.content.SharedPreferences; @@ -8,6 +8,10 @@ import android.preference.Preference; import android.preference.PreferenceManager; import android.util.Log; import com.actionbarsherlock.app.SherlockPreferenceActivity; +import fr.free.nrw.commons.*; +import fr.free.nrw.commons.CommonsApplication; +import fr.free.nrw.commons.Prefs; +import fr.free.nrw.commons.Utils; public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { CommonsApplication app; @@ -56,7 +60,7 @@ public class SettingsActivity extends SherlockPreferenceActivity implements Shar public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if(key.equals(Prefs.TRACKING_ENABLED)) { // We force log this, so it is logged even if EL is turned off - EventLog.schema(CommonsApplication.EVENT_EVENTLOGGING_CHANGE) + fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_EVENTLOGGING_CHANGE) .param("username", app.getCurrentAccount().name) .param("state", sharedPreferences.getBoolean(key, true)) .log(true); From c0f4ba49557e262062b02ba109d4bf748b5921e9 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sun, 4 Oct 2015 15:55:48 +1300 Subject: [PATCH 2/5] Revert "Added imports to SettingsActivity" This reverts commit 3397e2eef403d03841747f178489674016f3a4f5. --- .../main/java/org/wikimedia/commons/SettingsActivity.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java index 37a4d4bf0..ee71d2f2c 100644 --- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java +++ b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java @@ -1,4 +1,4 @@ -package org.wikimedia.commons; +package fr.free.nrw.commons; import android.content.SharedPreferences; @@ -8,10 +8,6 @@ import android.preference.Preference; import android.preference.PreferenceManager; import android.util.Log; import com.actionbarsherlock.app.SherlockPreferenceActivity; -import fr.free.nrw.commons.*; -import fr.free.nrw.commons.CommonsApplication; -import fr.free.nrw.commons.Prefs; -import fr.free.nrw.commons.Utils; public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { CommonsApplication app; @@ -60,7 +56,7 @@ public class SettingsActivity extends SherlockPreferenceActivity implements Shar public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if(key.equals(Prefs.TRACKING_ENABLED)) { // We force log this, so it is logged even if EL is turned off - fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_EVENTLOGGING_CHANGE) + EventLog.schema(CommonsApplication.EVENT_EVENTLOGGING_CHANGE) .param("username", app.getCurrentAccount().name) .param("state", sharedPreferences.getBoolean(key, true)) .log(true); From 43a25121043d7d7c03d096bd4d42ff344e0ffe81 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sun, 4 Oct 2015 17:10:46 +1300 Subject: [PATCH 3/5] Fixed namespace issue Packages are now all in org.wikimedia.commons --- commons/AndroidManifest.xml | 44 +++++++++---------- commons/res/layout/activity_contributions.xml | 2 +- commons/res/layout/detail_category_item.xml | 2 +- commons/res/layout/fragment_media_detail.xml | 10 ++--- commons/res/layout/layout_contribution.xml | 4 +- commons/res/xml/authenticator.xml | 2 +- commons/res/xml/campaigns_sync_adapter.xml | 4 +- .../res/xml/contributions_sync_adapter.xml | 4 +- .../res/xml/modifications_sync_adapter.xml | 4 +- .../org/wikimedia/commons/AboutActivity.java | 3 +- .../wikimedia/commons/CommonsApplication.java | 13 ++---- .../java/org/wikimedia/commons/EventLog.java | 3 +- .../org/wikimedia/commons/HandlerService.java | 2 +- .../java/org/wikimedia/commons/License.java | 2 +- .../org/wikimedia/commons/LicenseList.java | 4 +- .../java/org/wikimedia/commons/Media.java | 3 +- .../wikimedia/commons/MediaDataExtractor.java | 2 +- .../wikimedia/commons/MediaWikiImageView.java | 7 ++- .../java/org/wikimedia/commons/Prefs.java | 4 +- .../wikimedia/commons/SettingsActivity.java | 2 +- .../java/org/wikimedia/commons/Utils.java | 4 +- .../wikimedia/commons/WelcomeActivity.java | 2 +- .../java/org/wikimedia/commons/api/MWApi.java | 2 +- .../commons/auth/AuthenticatedActivity.java | 4 +- .../wikimedia/commons/auth/LoginActivity.java | 14 +++--- .../auth/WikiAccountAuthenticator.java | 6 +-- .../auth/WikiAccountAuthenticatorService.java | 2 +- .../wikimedia/commons/campaigns/Campaign.java | 2 +- .../commons/campaigns/CampaignActivity.java | 9 ++-- .../campaigns/CampaignContribution.java | 4 +- .../campaigns/CampaignsContentProvider.java | 8 ++-- .../campaigns/CampaignsListAdapter.java | 13 +----- .../campaigns/CampaignsSyncAdapter.java | 9 +--- .../campaigns/CampaignsSyncService.java | 3 +- .../category/CategorizationFragment.java | 14 ++---- .../wikimedia/commons/category/Category.java | 6 +-- .../category/CategoryContentProvider.java | 8 ++-- .../commons/contributions/Contribution.java | 4 +- .../contributions/ContributionController.java | 8 ++-- .../contributions/ContributionViewHolder.java | 7 ++- .../contributions/ContributionsActivity.java | 12 ++--- .../ContributionsContentProvider.java | 8 ++-- .../ContributionsListAdapter.java | 12 +++-- .../ContributionsListFragment.java | 9 ++-- .../ContributionsSyncAdapter.java | 6 +-- .../ContributionsSyncService.java | 2 +- .../contributions/MediaListAdapter.java | 9 ++-- .../wikimedia/commons/data/DBOpenHelper.java | 10 ++--- .../commons/media/CategoryImagesLoader.java | 8 ++-- .../commons/media/MediaDetailFragment.java | 4 +- .../media/MediaDetailPagerFragment.java | 9 ++-- .../commons/media/MediaDetailSpacer.java | 2 +- .../modifications/CategoryModifier.java | 7 +-- .../ModificationsContentProvider.java | 8 ++-- .../ModificationsSyncAdapter.java | 12 +++-- .../ModificationsSyncService.java | 2 +- .../modifications/ModifierSequence.java | 6 +-- .../commons/modifications/PageModifier.java | 3 +- .../modifications/TemplateRemoveModifier.java | 2 +- .../commons/upload/MultipleShareActivity.java | 22 +++++----- .../upload/MultipleUploadListFragment.java | 10 ++--- .../commons/upload/ShareActivity.java | 21 +++++---- .../commons/upload/SingleUploadFragment.java | 10 ++--- .../commons/upload/UploadController.java | 18 ++++---- .../commons/upload/UploadService.java | 15 +++---- disable-campaigns.patch | 2 +- 66 files changed, 207 insertions(+), 272 deletions(-) diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml index 43d65a51b..fd20f5bee 100644 --- a/commons/AndroidManifest.xml +++ b/commons/AndroidManifest.xml @@ -1,5 +1,5 @@ @@ -31,15 +31,15 @@ android:finishOnTaskLaunch="true" /> @@ -53,7 +53,7 @@ @@ -68,7 +68,7 @@ @@ -78,11 +78,11 @@ - - + @@ -91,10 +91,10 @@ - + @@ -106,7 +106,7 @@ android:resource="@xml/authenticator" /> diff --git a/commons/res/layout/activity_contributions.xml b/commons/res/layout/activity_contributions.xml index 1e407ee9e..e1aba9b0a 100644 --- a/commons/res/layout/activity_contributions.xml +++ b/commons/res/layout/activity_contributions.xml @@ -8,7 +8,7 @@ android:background="#000000" > - diff --git a/commons/res/layout/fragment_media_detail.xml b/commons/res/layout/fragment_media_detail.xml index 06c22151c..0ca84aa2f 100644 --- a/commons/res/layout/fragment_media_detail.xml +++ b/commons/res/layout/fragment_media_detail.xml @@ -22,7 +22,7 @@ android:visibility="gone" /> - - @@ -77,7 +77,7 @@ android:textSize="14sp" android:padding="12dp"/> - - - - diff --git a/commons/res/xml/campaigns_sync_adapter.xml b/commons/res/xml/campaigns_sync_adapter.xml index 1da828c50..778984c07 100644 --- a/commons/res/xml/campaigns_sync_adapter.xml +++ b/commons/res/xml/campaigns_sync_adapter.xml @@ -1,8 +1,8 @@ { - private static final String EXTRA_PREFIX = "fr.free.nrw.commons.upload"; + private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload"; public static final int ACTION_UPLOAD_FILE = 1; @@ -223,7 +222,7 @@ public class UploadService extends HandlerService { if(!resultStatus.equals("Success")) { String errorCode = result.getString("/api/error/@code"); showFailedNotification(contribution); - fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) + org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) .param("username", app.getCurrentAccount().name) .param("source", contribution.getSource()) .param("multiple", contribution.getMultiple()) @@ -241,7 +240,7 @@ public class UploadService extends HandlerService { contribution.setDateUploaded(dateUploaded); contribution.save(); - fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) + org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) .param("username", app.getCurrentAccount().name) .param("source", contribution.getSource()) //FIXME .param("filename", contribution.getFilename()) diff --git a/disable-campaigns.patch b/disable-campaigns.patch index a56ea52f8..1b06132b8 100644 --- a/disable-campaigns.patch +++ b/disable-campaigns.patch @@ -42,7 +42,7 @@ index 5ad1c77..50b16ff 100644 - android:name=".campaigns.CampaignsContentProvider" - android:label="@string/provider_campaigns" - android:syncable="true" -- android:authorities="fr.free.nrw.commons.campaigns.contentprovider" +- android:authorities="org.wikimedia.commons.campaigns.contentprovider" - android:exported="false"> - - Date: Sun, 4 Oct 2015 17:49:52 +1300 Subject: [PATCH 4/5] Changed folder names to be in line with package names Fixes issue #15 --- commons/AndroidManifest.xml | 44 +++++++++---------- commons/res/layout/activity_contributions.xml | 2 +- commons/res/layout/detail_category_item.xml | 2 +- commons/res/layout/fragment_media_detail.xml | 10 ++--- commons/res/layout/layout_contribution.xml | 4 +- commons/res/xml/authenticator.xml | 2 +- commons/res/xml/campaigns_sync_adapter.xml | 4 +- .../res/xml/contributions_sync_adapter.xml | 4 +- .../res/xml/modifications_sync_adapter.xml | 4 +- .../nrw}/commons/AboutActivity.java | 2 +- .../nrw}/commons/CommonsApplication.java | 6 +-- .../nrw}/commons/EventLog.java | 2 +- .../nrw}/commons/HandlerService.java | 2 +- .../nrw}/commons/License.java | 2 +- .../nrw}/commons/LicenseList.java | 4 +- .../wikimedia => free/nrw}/commons/Media.java | 2 +- .../nrw}/commons/MediaDataExtractor.java | 2 +- .../nrw}/commons/MediaWikiImageView.java | 6 +-- .../wikimedia => free/nrw}/commons/Prefs.java | 4 +- .../nrw}/commons/SettingsActivity.java | 4 +- .../wikimedia => free/nrw}/commons/Utils.java | 2 +- .../nrw}/commons/WelcomeActivity.java | 3 +- .../nrw}/commons/api/MWApi.java | 2 +- .../commons/auth/AuthenticatedActivity.java | 5 ++- .../nrw}/commons/auth/LoginActivity.java | 16 ++++--- .../auth/WikiAccountAuthenticator.java | 6 +-- .../auth/WikiAccountAuthenticatorService.java | 2 +- .../nrw}/commons/campaigns/Campaign.java | 2 +- .../commons/campaigns/CampaignActivity.java | 8 ++-- .../campaigns/CampaignContribution.java | 4 +- .../campaigns/CampaignsContentProvider.java | 8 ++-- .../campaigns/CampaignsListAdapter.java | 4 +- .../campaigns/CampaignsSyncAdapter.java | 4 +- .../campaigns/CampaignsSyncService.java | 2 +- .../category/CategorizationFragment.java | 8 ++-- .../nrw}/commons/category/Category.java | 2 +- .../category/CategoryContentProvider.java | 8 ++-- .../commons/contributions/Contribution.java | 4 +- .../contributions/ContributionController.java | 8 ++-- .../contributions/ContributionViewHolder.java | 6 +-- .../contributions/ContributionsActivity.java | 15 ++++--- .../ContributionsContentProvider.java | 8 ++-- .../ContributionsListAdapter.java | 10 ++--- .../ContributionsListFragment.java | 10 +++-- .../ContributionsSyncAdapter.java | 6 +-- .../ContributionsSyncService.java | 2 +- .../contributions/MediaListAdapter.java | 8 ++-- .../nrw}/commons/data/DBOpenHelper.java | 10 ++--- .../commons/media/CategoryImagesLoader.java | 8 ++-- .../commons/media/MediaDetailFragment.java | 4 +- .../media/MediaDetailPagerFragment.java | 11 +++-- .../nrw}/commons/media/MediaDetailSpacer.java | 2 +- .../modifications/CategoryModifier.java | 2 +- .../ModificationsContentProvider.java | 8 ++-- .../ModificationsSyncAdapter.java | 10 ++--- .../ModificationsSyncService.java | 2 +- .../modifications/ModifierSequence.java | 2 +- .../commons/modifications/PageModifier.java | 2 +- .../modifications/TemplateRemoveModifier.java | 2 +- .../commons/upload/MultipleShareActivity.java | 23 +++++----- .../upload/MultipleUploadListFragment.java | 10 ++--- .../nrw}/commons/upload/ShareActivity.java | 22 +++++----- .../commons/upload/SingleUploadFragment.java | 8 ++-- .../nrw}/commons/upload/UploadController.java | 32 +++++++------- .../nrw}/commons/upload/UploadService.java | 15 ++++--- disable-campaigns.patch | 2 +- 66 files changed, 233 insertions(+), 217 deletions(-) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/AboutActivity.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/CommonsApplication.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/EventLog.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/HandlerService.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/License.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/LicenseList.java (95%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Media.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/MediaDataExtractor.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/MediaWikiImageView.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Prefs.java (76%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/SettingsActivity.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/Utils.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/WelcomeActivity.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/api/MWApi.java (73%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/AuthenticatedActivity.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/LoginActivity.java (94%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/WikiAccountAuthenticator.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/auth/WikiAccountAuthenticatorService.java (94%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/Campaign.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignActivity.java (92%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignContribution.java (94%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsContentProvider.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsListAdapter.java (93%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsSyncAdapter.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/campaigns/CampaignsSyncService.java (93%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/CategorizationFragment.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/Category.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/category/CategoryContentProvider.java (95%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/Contribution.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionController.java (95%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionViewHolder.java (85%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsActivity.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsContentProvider.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsListAdapter.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsListFragment.java (95%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsSyncAdapter.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/ContributionsSyncService.java (93%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/contributions/MediaListAdapter.java (91%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/data/DBOpenHelper.java (80%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/CategoryImagesLoader.java (91%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailFragment.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailPagerFragment.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/media/MediaDetailSpacer.java (92%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/CategoryModifier.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsContentProvider.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsSyncAdapter.java (95%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModificationsSyncService.java (93%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/ModifierSequence.java (99%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/PageModifier.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/modifications/TemplateRemoveModifier.java (98%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/MultipleShareActivity.java (94%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/MultipleUploadListFragment.java (97%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/ShareActivity.java (92%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/SingleUploadFragment.java (96%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/UploadController.java (86%) rename commons/src/main/java/{org/wikimedia => free/nrw}/commons/upload/UploadService.java (96%) diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml index fd20f5bee..caf8c2712 100644 --- a/commons/AndroidManifest.xml +++ b/commons/AndroidManifest.xml @@ -1,5 +1,5 @@ @@ -31,15 +31,15 @@ android:finishOnTaskLaunch="true" /> @@ -53,7 +53,7 @@ @@ -68,7 +68,7 @@ @@ -78,11 +78,11 @@ - - + @@ -91,10 +91,10 @@ - + @@ -106,7 +106,7 @@ android:resource="@xml/authenticator" /> diff --git a/commons/res/layout/activity_contributions.xml b/commons/res/layout/activity_contributions.xml index e1aba9b0a..3a999316c 100644 --- a/commons/res/layout/activity_contributions.xml +++ b/commons/res/layout/activity_contributions.xml @@ -8,7 +8,7 @@ android:background="#000000" > - diff --git a/commons/res/layout/fragment_media_detail.xml b/commons/res/layout/fragment_media_detail.xml index 0ca84aa2f..3389aa04b 100644 --- a/commons/res/layout/fragment_media_detail.xml +++ b/commons/res/layout/fragment_media_detail.xml @@ -22,7 +22,7 @@ android:visibility="gone" /> - - @@ -77,7 +77,7 @@ android:textSize="14sp" android:padding="12dp"/> - - - - diff --git a/commons/res/xml/campaigns_sync_adapter.xml b/commons/res/xml/campaigns_sync_adapter.xml index 778984c07..53c4bdaf8 100644 --- a/commons/res/xml/campaigns_sync_adapter.xml +++ b/commons/res/xml/campaigns_sync_adapter.xml @@ -1,8 +1,8 @@ { - private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload"; + private static final String EXTRA_PREFIX = "free.nrw.commons.upload"; public static final int ACTION_UPLOAD_FILE = 1; @@ -222,7 +223,7 @@ public class UploadService extends HandlerService { if(!resultStatus.equals("Success")) { String errorCode = result.getString("/api/error/@code"); showFailedNotification(contribution); - org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) + EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT) .param("username", app.getCurrentAccount().name) .param("source", contribution.getSource()) .param("multiple", contribution.getMultiple()) @@ -240,7 +241,7 @@ public class UploadService extends HandlerService { contribution.setDateUploaded(dateUploaded); contribution.save(); - org.wikimedia.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()) diff --git a/disable-campaigns.patch b/disable-campaigns.patch index 1b06132b8..8f20c96e9 100644 --- a/disable-campaigns.patch +++ b/disable-campaigns.patch @@ -42,7 +42,7 @@ index 5ad1c77..50b16ff 100644 - android:name=".campaigns.CampaignsContentProvider" - android:label="@string/provider_campaigns" - android:syncable="true" -- android:authorities="org.wikimedia.commons.campaigns.contentprovider" +- android:authorities="free.nrw.commons.campaigns.contentprovider" - android:exported="false"> - - Date: Sun, 4 Oct 2015 23:43:08 +1300 Subject: [PATCH 5/5] Removed usage reports in Settings layout file as well as code behind it Fixes issue #11 --- commons/res/xml/preferences.xml | 7 +------ .../src/main/java/free/nrw/commons/CommonsApplication.java | 2 +- .../src/main/java/free/nrw/commons/SettingsActivity.java | 7 ------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/commons/res/xml/preferences.xml b/commons/res/xml/preferences.xml index 00cba51b0..802e60b6d 100644 --- a/commons/res/xml/preferences.xml +++ b/commons/res/xml/preferences.xml @@ -1,12 +1,7 @@ - +