mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #21 from misaochan/master

Browse source 
Changed directory to fr/free/nrw/commons
This commit is contained in:
Nicolas Raoul 2015-10-15 15:11:35 +09:00
commit daa9ed9567
56 changed files with 45 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
commons/src/main/java/org/wikimedia/commons/AboutActivity.java → commons/src/main/java/fr/free/nrw/commons/AboutActivity.java
View file

@ -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;

9
commons/src/main/java/org/wikimedia/commons/CommonsApplication.java → commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file

@ -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.*;

1
commons/src/main/java/org/wikimedia/commons/EventLog.java → commons/src/main/java/fr/free/nrw/commons/EventLog.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.*;
import android.preference.PreferenceManager;

0
commons/src/main/java/org/wikimedia/commons/HandlerService.java → commons/src/main/java/fr/free/nrw/commons/HandlerService.java
View file

0
commons/src/main/java/org/wikimedia/commons/License.java → commons/src/main/java/fr/free/nrw/commons/License.java
View file

0
commons/src/main/java/org/wikimedia/commons/LicenseList.java → commons/src/main/java/fr/free/nrw/commons/LicenseList.java
View file

1
commons/src/main/java/org/wikimedia/commons/Media.java → commons/src/main/java/fr/free/nrw/commons/Media.java
View file

@ -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.*;

0
commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java → commons/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java
View file

1
commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java → commons/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
View file

@ -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;

0
commons/src/main/java/org/wikimedia/commons/Prefs.java → commons/src/main/java/fr/free/nrw/commons/Prefs.java
View file

2
commons/src/main/java/org/wikimedia/commons/SettingsActivity.java → commons/src/main/java/fr/free/nrw/commons/SettingsActivity.java
View file

@ -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 {

2
commons/src/main/java/org/wikimedia/commons/Utils.java → commons/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -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 {

0
commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java → commons/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
View file

0
commons/src/main/java/org/wikimedia/commons/api/MWApi.java → commons/src/main/java/fr/free/nrw/commons/api/MWApi.java
View file

3
commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java → commons/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
View file

@ -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 {

6
commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java → commons/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -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 {

2
commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java → commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
View file

@ -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 {

0
commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java → commons/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
View file

0
commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java → commons/src/main/java/fr/free/nrw/commons/campaigns/Campaign.java
View file

3
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignActivity.java
View file

@ -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

0
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignContribution.java
View file

0
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsContentProvider.java
View file

9
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsListAdapter.java
View file

@ -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 {

5
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncAdapter.java
View file

@ -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 {

1
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java → commons/src/main/java/fr/free/nrw/commons/campaigns/CampaignsSyncService.java
View file

@ -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 {

8
commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java → commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -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;

4
commons/src/main/java/org/wikimedia/commons/category/Category.java → commons/src/main/java/fr/free/nrw/commons/category/Category.java
View file

@ -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;

0
commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java → commons/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java
View file

0
commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java → commons/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
View file

2
commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
View file

@ -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;

1
commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
View file

@ -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;

3
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
View file

@ -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;

2
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java
View file

@ -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{

4
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
View file

@ -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 {

5
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -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 {

2
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java
View file

@ -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 {

0
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java → commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java
View file

3
commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java → commons/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java
View file

@ -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;

2
commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java → commons/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java
View file

@ -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{

0
commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java → commons/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java
View file

0
commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java → commons/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

4
commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java → commons/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -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;

0
commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java → commons/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java
View file

5
commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java → commons/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java
View file

@ -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 {

2
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java → commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java
View file

@ -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{

8
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java → commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
View file

@ -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;

0
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java → commons/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java
View file

4
commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java → commons/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java
View file

@ -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;

1
commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java → commons/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons.modifications;
import android.os.Bundle;
import org.json.JSONException;
import org.json.JSONObject;

0
commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java → commons/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java
View file

9
commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java → commons/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
View file

@ -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

0
commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java → commons/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
View file

7
commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java → commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -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;

4
commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java → commons/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -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 {

4
commons/src/main/java/org/wikimedia/commons/upload/UploadController.java → commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java
View file

@ -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;

8
commons/src/main/java/org/wikimedia/commons/upload/UploadService.java → commons/src/main/java/fr/free/nrw/commons/upload/UploadService.java
View file

@ -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<Contribution> {
@ -241,7 +243,7 @@ public class UploadService extends HandlerService<Contribution> {
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())