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

Modified namespace so that app can be published on Google Play

Browse source
This commit is contained in:
Nicolas Raoul 2015-09-08 10:08:34 +09:00
parent 2427ee7b6f
commit 97a57be47a
69 changed files with 213 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

10
commons/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.wikimedia.commons"
package="fr.nrw.free.commons"
android:versionCode="15"
android:versionName="1.0" >
@ -144,28 +144,28 @@
android:name=".contributions.ContributionsContentProvider"
android:label="@string/provider_contributions"
android:syncable="true"
android:authorities="org.wikimedia.commons.contributions.contentprovider"
android:authorities="fr.nrw.free.commons.contributions.contentprovider"
android:exported="false">
</provider>
<provider
android:name=".campaigns.CampaignsContentProvider"
android:label="@string/provider_campaigns"
android:syncable="true"
android:authorities="org.wikimedia.commons.campaigns.contentprovider"
android:authorities="fr.nrw.free.commons.campaigns.contentprovider"
android:exported="false">
</provider>
<provider
android:name=".modifications.ModificationsContentProvider"
android:label="@string/provider_modifications"
android:syncable="true"
android:authorities="org.wikimedia.commons.modifications.contentprovider"
android:authorities="fr.nrw.free.commons.modifications.contentprovider"
android:exported="false">
</provider>
<provider
android:name=".category.CategoryContentProvider"
android:label="@string/provider_categories"
android:syncable="false"
android:authorities="org.wikimedia.commons.categories.contentprovider"
android:authorities="fr.nrw.free.commons.categories.contentprovider"
android:exported="false">
</provider>
</application>

4
commons/jni/transcode.c
View file

@ -44,7 +44,7 @@ static int transcode(const char *infile, const char *outfile,
gst_structure_get_int(s, "percent", &percent);
cb_class = (*env)->FindClass(env, "org/wikimedia/commons/Transcoder$TranscoderProgressCallback");
cb_class = (*env)->FindClass(env, "fr/free/nrw/commons/Transcoder$TranscoderProgressCallback");
if ((*env)->ExceptionCheck(env)) {
__android_log_print(ANDROID_LOG_ERROR, "GStreamer", "Class not found");
break;
@ -100,7 +100,7 @@ done:
return ret;
}
jint Java_org_wikimedia_commons_Transcoder_transcode(JNIEnv* env,
jint Java_fr_free_nrw_commons_Transcoder_transcode(JNIEnv* env,
jclass *klass, jstring infile, jstring outfile, jstring profile,
jobject cb_obj)
{

2
commons/res/layout/activity_contributions.xml
View file

@ -8,7 +8,7 @@
android:background="#000000"
>
<fragment
android:name="org.wikimedia.commons.contributions.ContributionsListFragment"
android:name="fr.nrw.free.commons.contributions.ContributionsListFragment"
android:id="@+id/contributionsListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
commons/res/layout/detail_category_item.xml
View file

@ -16,7 +16,7 @@
android:textColor="@android:color/white"
android:background="#20ffffff"
/>
<org.wikimedia.commons.media.MediaDetailSpacer
<fr.nrw.free.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
</LinearLayout>

10
commons/res/layout/fragment_media_detail.xml
View file

@ -22,7 +22,7 @@
android:visibility="gone"
/>
<org.wikimedia.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
<fr.nrw.free.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter"
@ -42,7 +42,7 @@
<!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
the detail info offscreen until it's placed properly. May be a better way to do this. -->
<org.wikimedia.commons.media.MediaDetailSpacer
<fr.nrw.free.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="16dp"
android:id="@+id/mediaDetailSpacer"/>
@ -77,7 +77,7 @@
android:textSize="14sp"
android:padding="12dp"/>
</LinearLayout>
<org.wikimedia.commons.media.MediaDetailSpacer
<fr.nrw.free.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
<LinearLayout
@ -105,7 +105,7 @@
android:textSize="14sp"
android:padding="12dp"/>
</LinearLayout>
<org.wikimedia.commons.media.MediaDetailSpacer
<fr.nrw.free.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
<LinearLayout
@ -133,7 +133,7 @@
android:textSize="14sp"
android:padding="12dp"/>
</LinearLayout>
<org.wikimedia.commons.media.MediaDetailSpacer
<fr.nrw.free.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
<LinearLayout

4
commons/res/layout/layout_contribution.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res/org.wikimedia.commons"
xmlns:custom="http://schemas.android.com/apk/res/fr.nrw.free.commons"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -17,7 +17,7 @@
android:typeface="serif"
android:layout_gravity="end|bottom"
/>
<org.wikimedia.commons.MediaWikiImageView android:id="@+id/contributionImage"
<fr.nrw.free.commons.MediaWikiImageView android:id="@+id/contributionImage"
android:layout_width="fill_parent"
android:layout_height="240dp"
android:scaleType="centerCrop"

2
commons/res/xml/authenticator.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="org.wikimedia.commons"
android:accountType="fr.nrw.free.commons"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:smallIcon="@drawable/ic_launcher" />

4
commons/res/xml/campaigns_sync_adapter.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="org.wikimedia.commons.campaigns.contentprovider"
android:accountType="org.wikimedia.commons"
android:contentAuthority="fr.nrw.free.commons.campaigns.contentprovider"
android:accountType="fr.nrw.free.commons"
android:supportsUploading="false"
android:userVisible="true"
android:isAlwaysSyncable="true"

4
commons/res/xml/contributions_sync_adapter.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="org.wikimedia.commons.contributions.contentprovider"
android:accountType="org.wikimedia.commons"
android:contentAuthority="fr.nrw.free.commons.contributions.contentprovider"
android:accountType="fr.nrw.free.commons"
android:supportsUploading="false"
android:userVisible="true"
android:isAlwaysSyncable="true"

4
commons/res/xml/modifications_sync_adapter.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="org.wikimedia.commons.modifications.contentprovider"
android:accountType="org.wikimedia.commons"
android:contentAuthority="fr.nrw.free.commons.modifications.contentprovider"
android:accountType="fr.nrw.free.commons"
android:supportsUploading="true"
android:userVisible="true"
android:isAlwaysSyncable="true"

2
commons/src/main/java/org/wikimedia/commons/AboutActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.app.Activity;
import android.os.Bundle;

10
commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import java.io.IOException;
import java.io.InputStream;
@ -32,16 +32,16 @@ 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 org.wikimedia.commons.auth.WikiAccountAuthenticator;
import fr.nrw.free.commons.auth.WikiAccountAuthenticator;
import org.apache.http.impl.client.*;
import org.apache.http.params.CoreProtocolPNames;
import org.wikimedia.commons.data.*;
import fr.nrw.free.commons.data.*;
import com.android.volley.toolbox.*;
// TODO: Use ProGuard to rip out reporting when publishing
@ReportsCrashes(formKey = "",
mailTo = "mobile-feedback-l@lists.wikimedia.org",
mailTo = "commons-app-android@googlegroups.com",
mode = ReportingInteractionMode.DIALOG,
resDialogText = R.string.crash_dialog_text,
resDialogTitle = R.string.crash_dialog_title,
@ -69,7 +69,7 @@ public class CommonsApplication extends Application {
public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app";
public static final String FEEDBACK_EMAIL = "mobile-feedback-l@lists.wikimedia.org";
public static final String FEEDBACK_EMAIL = "commons-app-android@googlegroups.com";
public static final String FEEDBACK_EMAIL_SUBJECT = "Commons Android App (%s) Feedback";
public RequestQueue volleyQueue;

2
commons/src/main/java/org/wikimedia/commons/EventLog.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.content.Context;
import android.content.SharedPreferences;

2
commons/src/main/java/org/wikimedia/commons/HandlerService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.app.*;
import android.content.*;

2
commons/src/main/java/org/wikimedia/commons/License.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
public class License {
String key;

4
commons/src/main/java/org/wikimedia/commons/LicenseList.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.app.Activity;
import android.content.res.Resources;
@ -59,7 +59,7 @@ public class LicenseList {
}
private int stringIdByName(String stringId) {
return res.getIdentifier("org.wikimedia.commons:string/" + stringId, null, null);
return res.getIdentifier("fr.nrw.free.commons:string/" + stringId, null, null);
}
public String nameForTemplate(String template) {

2
commons/src/main/java/org/wikimedia/commons/Media.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.net.Uri;
import android.os.*;

2
commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.util.Log;
import org.mediawiki.api.ApiResult;

6
commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.content.Context;
import android.content.res.TypedArray;
@ -28,8 +28,8 @@ import com.android.volley.VolleyError;
import com.android.volley.toolbox.ImageLoader;
import com.android.volley.toolbox.ImageLoader.ImageContainer;
import com.android.volley.toolbox.ImageLoader.ImageListener;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import fr.nrw.free.commons.contributions.Contribution;
import fr.nrw.free.commons.contributions.ContributionsContentProvider;
public class MediaWikiImageView extends ImageView {

4
commons/src/main/java/org/wikimedia/commons/Prefs.java
View file

@ -1,7 +1,7 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
public class Prefs {
public static String GLOBAL_PREFS = "org.wikimedia.commons.preferences";
public static String GLOBAL_PREFS = "fr.nrw.free.commons.preferences";
public static String TRACKING_ENABLED = "eventLogging";
public static final String DEFAULT_LICENSE = "defaultLicense";

2
commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.content.SharedPreferences;

2
commons/src/main/java/org/wikimedia/commons/Utils.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.net.Uri;
import android.os.*;

2
commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package fr.nrw.free.commons;
import android.app.Activity;
import android.os.Bundle;

2
commons/src/main/java/org/wikimedia/commons/api/MWApi.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.api;
package fr.nrw.free.commons.api;
import com.android.volley.RequestQueue;

4
commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.auth;
package fr.nrw.free.commons.auth;
import java.io.IOException;
@ -8,7 +8,7 @@ import com.actionbarsherlock.app.*;
import android.accounts.*;
import android.os.*;
import org.wikimedia.commons.*;
import fr.nrw.free.commons.*;
public class AuthenticatedActivity extends SherlockFragmentActivity {

14
commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.auth;
package fr.nrw.free.commons.auth;
import java.io.IOException;
@ -14,16 +14,16 @@ import android.view.*;
import android.widget.*;
import android.support.v4.app.NavUtils;
import org.wikimedia.commons.*;
import org.wikimedia.commons.EventLog;
import org.wikimedia.commons.campaigns.CampaignsContentProvider;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.modifications.ModificationsContentProvider;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.EventLog;
import fr.nrw.free.commons.campaigns.CampaignsContentProvider;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.modifications.ModificationsContentProvider;
public class LoginActivity extends AccountAuthenticatorActivity {
public static final String PARAM_USERNAME = "org.wikimedia.commons.login.username";
public static final String PARAM_USERNAME = "fr.nrw.free.commons.login.username";
private CommonsApplication app;

6
commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.auth;
package fr.nrw.free.commons.auth;
import java.io.IOException;
@ -7,11 +7,11 @@ import android.content.*;
import android.os.*;
import org.mediawiki.api.*;
import org.wikimedia.commons.*;
import fr.nrw.free.commons.*;
public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
public static final String COMMONS_ACCOUNT_TYPE = "org.wikimedia.commons";
public static final String COMMONS_ACCOUNT_TYPE = "fr.nrw.free.commons";
private Context context;
public WikiAccountAuthenticator(Context context) {
super(context);

2
commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.auth;
package fr.nrw.free.commons.auth;
import android.app.*;
import android.content.*;

2
commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.content.ContentValues;
import android.database.Cursor;

8
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.app.Activity;
import android.content.ContentResolver;
@ -12,9 +12,9 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.R;
import org.wikimedia.commons.contributions.ContributionsActivity;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.contributions.ContributionsActivity;
public class CampaignActivity
extends SherlockFragmentActivity

4
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
View file

@ -1,7 +1,7 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.net.Uri;
import org.wikimedia.commons.contributions.Contribution;
import fr.nrw.free.commons.contributions.Contribution;
import java.util.ArrayList;
import java.util.Date;

8
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.content.ContentProvider;
import android.content.ContentValues;
@ -9,15 +9,15 @@ import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.data.DBOpenHelper;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.data.DBOpenHelper;
public class CampaignsContentProvider extends ContentProvider{
private static final int CAMPAIGNS = 1;
private static final int CAMPAIGNS_ID = 2;
public static final String AUTHORITY = "org.wikimedia.commons.campaigns.contentprovider";
public static final String AUTHORITY = "fr.nrw.free.commons.campaigns.contentprovider";
private static final String BASE_PATH = "campiagns";
public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);

12
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.app.Activity;
import android.content.Context;
@ -13,11 +13,11 @@ import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.MediaWikiImageView;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.campaigns.Campaign;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.MediaWikiImageView;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.campaigns.Campaign;
class CampaignsListAdapter extends CursorAdapter {

10
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.accounts.Account;
import android.content.*;
@ -9,10 +9,10 @@ import android.text.TextUtils;
import android.util.Log;
import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.contributions.Contribution;
import fr.nrw.free.commons.contributions.ContributionsContentProvider;
import java.io.IOException;
import java.util.ArrayList;

4
commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
View file

@ -1,9 +1,9 @@
package org.wikimedia.commons.campaigns;
package fr.nrw.free.commons.campaigns;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import org.wikimedia.commons.contributions.ContributionsSyncAdapter;
import fr.nrw.free.commons.contributions.ContributionsSyncAdapter;
public class CampaignsSyncService extends Service {

14
commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.category;
package fr.nrw.free.commons.category;
import android.app.Activity;
import android.content.ContentProviderClient;
@ -17,12 +17,12 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.category.Category;
import org.wikimedia.commons.category.CategoryContentProvider;
import org.wikimedia.commons.contributions.Contribution;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.category.Category;
import fr.nrw.free.commons.category.CategoryContentProvider;
import fr.nrw.free.commons.contributions.Contribution;
import java.io.IOException;
import java.io.Serializable;

4
commons/src/main/java/org/wikimedia/commons/category/Category.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.category;
package fr.nrw.free.commons.category;
import android.content.ContentProviderClient;
import android.content.ContentValues;
@ -9,7 +9,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
import android.text.TextUtils;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import fr.nrw.free.commons.contributions.ContributionsContentProvider;
import java.util.Date;

8
commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.category;
package fr.nrw.free.commons.category;
import android.content.ContentProvider;
import android.content.ContentValues;
@ -9,8 +9,8 @@ import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.data.DBOpenHelper;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.data.DBOpenHelper;
public class CategoryContentProvider extends ContentProvider {
@ -18,7 +18,7 @@ public class CategoryContentProvider extends ContentProvider {
private static final int CATEGORIES = 1;
private static final int CATEGORIES_ID = 2;
public static final String AUTHORITY = "org.wikimedia.commons.categories.contentprovider";
public static final String AUTHORITY = "fr.nrw.free.commons.categories.contentprovider";
private static final String BASE_PATH = "categories";
public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);

4
commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import java.text.*;
import java.util.*;
@ -10,7 +10,7 @@ import android.net.*;
import android.os.*;
import android.text.*;
import org.wikimedia.commons.*;
import fr.nrw.free.commons.*;
public class Contribution extends Media {

8
commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.app.*;
import android.content.Intent;
@ -8,9 +8,9 @@ import android.os.Environment;
import android.provider.MediaStore;
import android.util.Log;
import com.actionbarsherlock.app.SherlockFragment;
import org.wikimedia.commons.campaigns.Campaign;
import org.wikimedia.commons.upload.ShareActivity;
import org.wikimedia.commons.upload.UploadService;
import fr.nrw.free.commons.campaigns.Campaign;
import fr.nrw.free.commons.upload.ShareActivity;
import fr.nrw.free.commons.upload.UploadService;
import java.io.File;
import java.io.IOException;

6
commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
View file

@ -1,11 +1,11 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import org.wikimedia.commons.MediaWikiImageView;
import org.wikimedia.commons.R;
import fr.nrw.free.commons.MediaWikiImageView;
import fr.nrw.free.commons.R;
class ContributionViewHolder {
final MediaWikiImageView imageView;

12
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.database.DataSetObserver;
import android.os.IBinder;
@ -17,11 +17,11 @@ import android.widget.Adapter;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.campaigns.Campaign;
import org.wikimedia.commons.media.*;
import org.wikimedia.commons.upload.UploadService;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.auth.*;
import fr.nrw.free.commons.campaigns.Campaign;
import fr.nrw.free.commons.media.*;
import fr.nrw.free.commons.upload.UploadService;
import java.util.ArrayList;

8
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.content.*;
import android.database.*;
@ -7,15 +7,15 @@ import android.net.*;
import android.text.*;
import android.util.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.data.*;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.data.*;
public class ContributionsContentProvider extends ContentProvider{
private static final int CONTRIBUTIONS = 1;
private static final int CONTRIBUTIONS_ID = 2;
public static final String AUTHORITY = "org.wikimedia.commons.contributions.contentprovider";
public static final String AUTHORITY = "fr.nrw.free.commons.contributions.contentprovider";
private static final String BASE_PATH = "contributions";
public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);

10
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.app.Activity;
import android.content.Context;
@ -14,10 +14,10 @@ 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 org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.MediaWikiImageView;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.MediaWikiImageView;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.Utils;
class ContributionsListAdapter extends CursorAdapter {

8
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.app.Activity;
import android.content.Context;
@ -17,9 +17,9 @@ import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*;
import org.wikimedia.commons.R;
import org.wikimedia.commons.campaigns.Campaign;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.campaigns.Campaign;
public class ContributionsListFragment extends SherlockFragment {

6
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.content.*;
import android.database.Cursor;
@ -12,8 +12,8 @@ import java.io.*;
import java.util.*;
import org.mediawiki.api.*;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.*;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.*;
public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {

2
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.app.*;
import android.content.*;

8
commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
View file

@ -1,13 +1,13 @@
package org.wikimedia.commons.contributions;
package fr.nrw.free.commons.contributions;
import android.app.Activity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import com.android.volley.toolbox.ImageLoader;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.Media;
import org.wikimedia.commons.R;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.Media;
import fr.nrw.free.commons.R;
import java.util.ArrayList;

10
commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
View file

@ -1,12 +1,12 @@
package org.wikimedia.commons.data;
package fr.nrw.free.commons.data;
import android.content.*;
import android.database.sqlite.*;
import org.wikimedia.commons.campaigns.Campaign;
import org.wikimedia.commons.category.Category;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.modifications.ModifierSequence;
import fr.nrw.free.commons.campaigns.Campaign;
import fr.nrw.free.commons.category.Category;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.modifications.ModifierSequence;
public class DBOpenHelper extends SQLiteOpenHelper{

8
commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
View file

@ -1,12 +1,12 @@
package org.wikimedia.commons.media;
package fr.nrw.free.commons.media;
import android.content.Context;
import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;
import org.mediawiki.api.ApiResult;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.Media;
import org.wikimedia.commons.Utils;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.Media;
import fr.nrw.free.commons.Utils;
import java.io.IOException;
import java.util.ArrayList;

4
commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.media;
package fr.nrw.free.commons.media;
import android.content.Intent;
import android.database.DataSetObserver;
@ -16,7 +16,7 @@ import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
import com.android.volley.toolbox.*;
import org.wikimedia.commons.*;
import fr.nrw.free.commons.*;
import java.io.IOException;
import java.util.ArrayList;

8
commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.media;
package fr.nrw.free.commons.media;
import android.app.DownloadManager;
import android.content.*;
@ -18,9 +18,9 @@ import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.ShareActionProvider;
import org.wikimedia.commons.*;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsActivity;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.contributions.Contribution;
import fr.nrw.free.commons.contributions.ContributionsActivity;
public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
private ViewPager pager;

2
commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.media;
package fr.nrw.free.commons.media;
import android.content.Context;
import android.util.AttributeSet;

2
commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import android.os.Bundle;
import android.os.Parcel;

8
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import android.content.*;
import android.database.*;
@ -7,15 +7,15 @@ import android.net.*;
import android.text.*;
import android.util.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.data.*;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.data.*;
public class ModificationsContentProvider extends ContentProvider{
private static final int MODIFICATIONS = 1;
private static final int MODIFICATIONS_ID = 2;
public static final String AUTHORITY = "org.wikimedia.commons.modifications.contentprovider";
public static final String AUTHORITY = "fr.nrw.free.commons.modifications.contentprovider";
private static final String BASE_PATH = "modifications";
public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);

10
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorException;
@ -15,10 +15,10 @@ import java.io.*;
import java.util.*;
import org.mediawiki.api.*;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.*;
import org.wikimedia.commons.contributions.Contribution;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.contributions.Contribution;
import fr.nrw.free.commons.contributions.ContributionsContentProvider;
public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {

2
commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import android.app.*;
import android.content.*;

4
commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import android.content.ContentProviderClient;
import android.content.ContentValues;
@ -10,7 +10,7 @@ import android.text.TextUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.wikimedia.commons.contributions.ContributionsContentProvider;
import fr.nrw.free.commons.contributions.ContributionsContentProvider;
import java.util.ArrayList;
import java.util.Date;

2
commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
View file

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

2
commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.modifications;
package fr.nrw.free.commons.modifications;
import org.json.JSONException;
import org.json.JSONObject;

20
commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import java.util.*;
import java.util.concurrent.*;
@ -15,15 +15,15 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.*;
import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.category.CategorizationFragment;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.media.*;
import org.wikimedia.commons.modifications.CategoryModifier;
import org.wikimedia.commons.modifications.ModificationsContentProvider;
import org.wikimedia.commons.modifications.ModifierSequence;
import org.wikimedia.commons.modifications.TemplateRemoveModifier;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.auth.*;
import fr.nrw.free.commons.category.CategorizationFragment;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.media.*;
import fr.nrw.free.commons.modifications.CategoryModifier;
import fr.nrw.free.commons.modifications.ModificationsContentProvider;
import fr.nrw.free.commons.modifications.ModifierSequence;
import fr.nrw.free.commons.modifications.TemplateRemoveModifier;
public class MultipleShareActivity
extends AuthenticatedActivity

10
commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import android.content.*;
import android.graphics.*;
@ -14,10 +14,10 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.*;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.media.*;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.media.*;
public class MultipleUploadListFragment extends SherlockFragment {

20
commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import android.app.*;
import android.content.*;
@ -9,15 +9,15 @@ import android.support.v4.app.NavUtils;
import com.actionbarsherlock.view.MenuItem;
import android.widget.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.campaigns.Campaign;
import org.wikimedia.commons.category.CategorizationFragment;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.modifications.CategoryModifier;
import org.wikimedia.commons.modifications.ModificationsContentProvider;
import org.wikimedia.commons.modifications.ModifierSequence;
import org.wikimedia.commons.modifications.TemplateRemoveModifier;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.campaigns.Campaign;
import fr.nrw.free.commons.category.CategorizationFragment;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.auth.*;
import fr.nrw.free.commons.modifications.CategoryModifier;
import fr.nrw.free.commons.modifications.ModificationsContentProvider;
import fr.nrw.free.commons.modifications.ModifierSequence;
import fr.nrw.free.commons.modifications.TemplateRemoveModifier;
import java.util.ArrayList;

10
commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import android.app.Activity;
import android.content.Context;
@ -21,10 +21,10 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.wikimedia.commons.Prefs;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.Contribution;
import fr.nrw.free.commons.Prefs;
import fr.nrw.free.commons.R;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.contributions.Contribution;
public class SingleUploadFragment extends SherlockFragment {

16
commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import android.app.Activity;
import android.content.*;
@ -10,13 +10,13 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.HandlerService;
import org.wikimedia.commons.Prefs;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.campaigns.Campaign;
import org.wikimedia.commons.campaigns.CampaignContribution;
import org.wikimedia.commons.contributions.Contribution;
import fr.nrw.free.commons.CommonsApplication;
import fr.nrw.free.commons.HandlerService;
import fr.nrw.free.commons.Prefs;
import fr.nrw.free.commons.Utils;
import fr.nrw.free.commons.campaigns.Campaign;
import fr.nrw.free.commons.campaigns.CampaignContribution;
import fr.nrw.free.commons.contributions.Contribution;
import java.io.IOException;
import java.util.Date;

14
commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons.upload;
package fr.nrw.free.commons.upload;
import java.io.*;
import java.util.ArrayList;
@ -18,13 +18,13 @@ import android.support.v4.app.NotificationCompat;
import android.util.*;
import android.widget.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.modifications.ModificationsContentProvider;
import fr.nrw.free.commons.*;
import fr.nrw.free.commons.contributions.*;
import fr.nrw.free.commons.modifications.ModificationsContentProvider;
public class UploadService extends HandlerService<Contribution> {
private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload";
private static final String EXTRA_PREFIX = "fr.nrw.free.commons.upload";
public static final int ACTION_UPLOAD_FILE = 1;
@ -223,7 +223,7 @@ public class UploadService extends HandlerService<Contribution> {
if(!resultStatus.equals("Success")) {
String errorCode = result.getString("/api/error/@code");
showFailedNotification(contribution);
org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
fr.nrw.free.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
.param("username", app.getCurrentAccount().name)
.param("source", contribution.getSource())
.param("multiple", contribution.getMultiple())
@ -241,7 +241,7 @@ public class UploadService extends HandlerService<Contribution> {
contribution.setDateUploaded(dateUploaded);
contribution.save();
org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
fr.nrw.free.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
.param("username", app.getCurrentAccount().name)
.param("source", contribution.getSource()) //FIXME
.param("filename", contribution.getFilename())

4
commons/src/main/native/transcode.c
View file

@ -58,7 +58,7 @@ static int transcode(const char *infile, const char *outfile,
gst_structure_get_int(s, "percent", &percent);
cb_class = (*env)->FindClass(env, "org/wikimedia/commons/Transcoder$TranscoderProgressCallback");
cb_class = (*env)->FindClass(env, "fr/free/nrw/commons/Transcoder$TranscoderProgressCallback");
if ((*env)->ExceptionCheck(env)) {
__android_log_print(ANDROID_LOG_ERROR, "GStreamer", "Class not found");
break;
@ -114,7 +114,7 @@ done:
return ret;
}
jint Java_org_wikimedia_commons_Transcoder_transcode(JNIEnv* env,
jint Java_fr_free_nrw_commons_Transcoder_transcode(JNIEnv* env,
jclass *klass, jstring infile, jstring outfile, jstring profile,
jobject cb_obj)
{

2
disable-campaigns.patch
View file

@ -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="fr.free.nrw.commons.campaigns.contentprovider"
- android:exported="false">
- </provider>
- <provider

6
upload-to-commons.patch
View file

@ -1,7 +1,7 @@
diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
diff --git a/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 3fe594d..8306000 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
--- a/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -45,11 +45,12 @@ public class CommonsApplication extends Application {
private MWApi api;