Skip to content

Changed directory to fr/free/nrw/commons #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2015
Merged

Changed directory to fr/free/nrw/commons #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad88bb3
Changed directory to fr/free/nrw/commons
misaochan Oct 15, 2015
401132f
Merge pull request #3 from misaochan/folder-task
misaochan Oct 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .../org/wikimedia/commons/AboutActivity.java → ...va/fr/free/nrw/commons/AboutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 1 addition & 8 deletions ...wikimedia/commons/CommonsApplication.java → .../free/nrw/commons/CommonsApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
1 change: 0 additions & 1 deletion .../java/org/wikimedia/commons/EventLog.java → ...in/java/fr/free/nrw/commons/EventLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package fr.free.nrw.commons;

import android.content.Context;
import android.content.SharedPreferences;
import android.os.*;
import android.preference.PreferenceManager;
Expand Down
0 ...org/wikimedia/commons/HandlerService.java → ...a/fr/free/nrw/commons/HandlerService.java
View file
Open in desktop
File renamed without changes.
0 ...n/java/org/wikimedia/commons/License.java → ...ain/java/fr/free/nrw/commons/License.java
View file
Open in desktop
File renamed without changes.
0 ...va/org/wikimedia/commons/LicenseList.java → ...java/fr/free/nrw/commons/LicenseList.java
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...ain/java/org/wikimedia/commons/Media.java → .../main/java/fr/free/nrw/commons/Media.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.net.Uri;
import android.os.*;
import android.util.Log;

import java.util.*;
import java.util.regex.*;
Expand Down
0 ...wikimedia/commons/MediaDataExtractor.java → .../free/nrw/commons/MediaDataExtractor.java
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ...wikimedia/commons/MediaWikiImageView.java → .../free/nrw/commons/MediaWikiImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
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;

Expand Down
0 ...ain/java/org/wikimedia/commons/Prefs.java → .../main/java/fr/free/nrw/commons/Prefs.java
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...g/wikimedia/commons/SettingsActivity.java → ...fr/free/nrw/commons/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
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 {
Expand Down
2 changes: 0 additions & 2 deletions ...ain/java/org/wikimedia/commons/Utils.java → .../main/java/fr/free/nrw/commons/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

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;
Expand All @@ -19,7 +18,6 @@
import java.text.*;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.regex.Pattern;

public class Utils {

Expand Down
0 ...rg/wikimedia/commons/WelcomeActivity.java → .../fr/free/nrw/commons/WelcomeActivity.java
View file
Open in desktop
File renamed without changes.
0 ...java/org/wikimedia/commons/api/MWApi.java → ...n/java/fr/free/nrw/commons/api/MWApi.java
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...a/commons/auth/AuthenticatedActivity.java → ...w/commons/auth/AuthenticatedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
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 {

Expand Down
6 changes: 4 additions & 2 deletions ...wikimedia/commons/auth/LoginActivity.java → .../free/nrw/commons/auth/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ommons/auth/WikiAccountAuthenticator.java → ...ommons/auth/WikiAccountAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.os.*;

import org.mediawiki.api.*;
import fr.free.nrw.commons.*;
import fr.free.nrw.commons.CommonsApplication;

public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {

Expand Down
0 ...auth/WikiAccountAuthenticatorService.java → ...auth/WikiAccountAuthenticatorService.java
View file
Open in desktop
File renamed without changes.
0 ...wikimedia/commons/campaigns/Campaign.java → .../free/nrw/commons/campaigns/Campaign.java
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...a/commons/campaigns/CampaignActivity.java → ...w/commons/campaigns/CampaignActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,9 +11,9 @@
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
Expand Down
0 ...mmons/campaigns/CampaignContribution.java → ...mmons/campaigns/CampaignContribution.java
View file
Open in desktop
File renamed without changes.
0 ...s/campaigns/CampaignsContentProvider.java → ...s/campaigns/CampaignsContentProvider.java
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions ...mmons/campaigns/CampaignsListAdapter.java → ...mmons/campaigns/CampaignsListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,12 @@
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 {

Expand Down
5 changes: 0 additions & 5 deletions ...mmons/campaigns/CampaignsSyncAdapter.java → ...mmons/campaigns/CampaignsSyncAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@

import android.accounts.Account;
import android.content.*;
import android.database.Cursor;
import android.os.Bundle;
import android.os.RemoteException;
import android.text.TextUtils;
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 {
Expand Down
1 change: 0 additions & 1 deletion ...mmons/campaigns/CampaignsSyncService.java → ...mmons/campaigns/CampaignsSyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;

public class CampaignsSyncService extends Service {

Expand Down
8 changes: 1 addition & 7 deletions ...mons/category/CategorizationFragment.java → ...mons/category/CategorizationFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,17 @@
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;
Expand Down
4 changes: 0 additions & 4 deletions .../wikimedia/commons/category/Category.java → ...r/free/nrw/commons/category/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
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;

Expand Down
0 ...ons/category/CategoryContentProvider.java → ...ons/category/CategoryContentProvider.java
View file
Open in desktop
File renamed without changes.
0 ...a/commons/contributions/Contribution.java → ...w/commons/contributions/Contribution.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...contributions/ContributionController.java → ...contributions/ContributionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
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;
Expand Down
1 change: 0 additions & 1 deletion ...contributions/ContributionViewHolder.java → ...contributions/ContributionViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions .../contributions/ContributionsActivity.java → .../contributions/ContributionsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion ...butions/ContributionsContentProvider.java → ...butions/ContributionsContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
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{

Expand Down
4 changes: 1 addition & 3 deletions ...ntributions/ContributionsListAdapter.java → ...ntributions/ContributionsListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@
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 {

Expand Down
5 changes: 3 additions & 2 deletions ...tributions/ContributionsListFragment.java → ...tributions/ContributionsListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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;
Expand All @@ -17,8 +16,10 @@
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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ntributions/ContributionsSyncAdapter.java → ...ntributions/ContributionsSyncAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
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 {
Expand Down
0 ...ntributions/ContributionsSyncService.java → ...ntributions/ContributionsSyncService.java
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...mmons/contributions/MediaListAdapter.java → ...mmons/contributions/MediaListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion .../wikimedia/commons/data/DBOpenHelper.java → ...r/free/nrw/commons/data/DBOpenHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
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{

Expand Down
0 ...a/commons/media/CategoryImagesLoader.java → ...w/commons/media/CategoryImagesLoader.java
View file
Open in desktop
File renamed without changes.
0 ...ia/commons/media/MediaDetailFragment.java → ...rw/commons/media/MediaDetailFragment.java
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...mmons/media/MediaDetailPagerFragment.java → ...mmons/media/MediaDetailPagerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
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;

Expand Down
0 ...edia/commons/media/MediaDetailSpacer.java → .../nrw/commons/media/MediaDetailSpacer.java
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions ...mmons/modifications/CategoryModifier.java → ...mmons/modifications/CategoryModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {


Expand Down
2 changes: 1 addition & 1 deletion ...cations/ModificationsContentProvider.java → ...cations/ModificationsContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
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{

Expand Down
Loading