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

Merge bd0dfdc961 into 8434cd78de

Browse source
This commit is contained in:
Josephine Lim 2015-10-04 10:44:45 +00:00
commit 2ce381b644
67 changed files with 218 additions and 279 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" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.free.nrw.commons" package="free.nrw.commons"
android:versionCode="17" android:versionCode="17"
android:versionName="1.2" > android:versionName="1.2" >
@ -144,28 +144,28 @@
android:name=".contributions.ContributionsContentProvider" android:name=".contributions.ContributionsContentProvider"
android:label="@string/provider_contributions" android:label="@string/provider_contributions"
android:syncable="true" android:syncable="true"
android:authorities="fr.free.nrw.commons.contributions.contentprovider" android:authorities="free.nrw.commons.contributions.contentprovider"
android:exported="false"> android:exported="false">
</provider> </provider>
<provider <provider
android:name=".campaigns.CampaignsContentProvider" android:name=".campaigns.CampaignsContentProvider"
android:label="@string/provider_campaigns" android:label="@string/provider_campaigns"
android:syncable="true" android:syncable="true"
android:authorities="fr.free.nrw.commons.campaigns.contentprovider" android:authorities="free.nrw.commons.campaigns.contentprovider"
android:exported="false"> android:exported="false">
</provider> </provider>
<provider <provider
android:name=".modifications.ModificationsContentProvider" android:name=".modifications.ModificationsContentProvider"
android:label="@string/provider_modifications" android:label="@string/provider_modifications"
android:syncable="true" android:syncable="true"
android:authorities="fr.free.nrw.commons.modifications.contentprovider" android:authorities="free.nrw.commons.modifications.contentprovider"
android:exported="false"> android:exported="false">
</provider> </provider>
<provider <provider
android:name=".category.CategoryContentProvider" android:name=".category.CategoryContentProvider"
android:label="@string/provider_categories" android:label="@string/provider_categories"
android:syncable="false" android:syncable="false"
android:authorities="fr.free.nrw.commons.categories.contentprovider" android:authorities="free.nrw.commons.categories.contentprovider"
android:exported="false"> android:exported="false">
</provider> </provider>
</application> </application>

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

@ -8,7 +8,7 @@
android:background="#000000" android:background="#000000"
> >
<fragment <fragment
android:name="fr.free.nrw.commons.contributions.ContributionsListFragment" android:name="free.nrw.commons.contributions.ContributionsListFragment"
android:id="@+id/contributionsListFragment" android:id="@+id/contributionsListFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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:textColor="@android:color/white"
android:background="#20ffffff" android:background="#20ffffff"
/> />
<fr.free.nrw.commons.media.MediaDetailSpacer <free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="8dp"/> android:layout_height="8dp"/>
</LinearLayout> </LinearLayout>

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

@ -22,7 +22,7 @@
android:visibility="gone" android:visibility="gone"
/> />
<fr.free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage" <free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:scaleType="fitCenter" 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 <!-- 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. --> the detail info offscreen until it's placed properly. May be a better way to do this. -->
<fr.free.nrw.commons.media.MediaDetailSpacer <free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="16dp" android:layout_height="16dp"
android:id="@+id/mediaDetailSpacer"/> android:id="@+id/mediaDetailSpacer"/>
@ -77,7 +77,7 @@
android:textSize="14sp" android:textSize="14sp"
android:padding="12dp"/> android:padding="12dp"/>
</LinearLayout> </LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer <free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="8dp"/> android:layout_height="8dp"/>
<LinearLayout <LinearLayout
@ -105,7 +105,7 @@
android:textSize="14sp" android:textSize="14sp"
android:padding="12dp"/> android:padding="12dp"/>
</LinearLayout> </LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer <free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="8dp"/> android:layout_height="8dp"/>
<LinearLayout <LinearLayout
@ -133,7 +133,7 @@
android:textSize="14sp" android:textSize="14sp"
android:padding="12dp"/> android:padding="12dp"/>
</LinearLayout> </LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer <free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="8dp"/> android:layout_height="8dp"/>
<LinearLayout <LinearLayout

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

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

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="fr.free.nrw.commons" android:accountType="free.nrw.commons"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:smallIcon="@drawable/ic_launcher" /> 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"?> <?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="fr.free.nrw.commons.campaigns.contentprovider" android:contentAuthority="free.nrw.commons.campaigns.contentprovider"
android:accountType="fr.free.nrw.commons" android:accountType="free.nrw.commons"
android:supportsUploading="false" android:supportsUploading="false"
android:userVisible="true" android:userVisible="true"
android:isAlwaysSyncable="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"?> <?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="fr.free.nrw.commons.contributions.contentprovider" android:contentAuthority="free.nrw.commons.contributions.contentprovider"
android:accountType="fr.free.nrw.commons" android:accountType="free.nrw.commons"
android:supportsUploading="false" android:supportsUploading="false"
android:userVisible="true" android:userVisible="true"
android:isAlwaysSyncable="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"?> <?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="fr.free.nrw.commons.modifications.contentprovider" android:contentAuthority="free.nrw.commons.modifications.contentprovider"
android:accountType="fr.free.nrw.commons" android:accountType="free.nrw.commons"
android:supportsUploading="true" android:supportsUploading="true"
android:userVisible="true" android:userVisible="true"
android:isAlwaysSyncable="true" android:isAlwaysSyncable="true"

7
commons/res/xml/preferences.xml
View file

@ -1,12 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
android:key="eventLogging"
android:title="@string/preference_tracking"
android:summary="@string/preference_tracking_summary"
android:defaultValue="false"
/>
<ListPreference <ListPreference
android:key="defaultLicense" android:key="defaultLicense"
android:title="@string/preference_license" android:title="@string/preference_license"

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

@ -1,6 +1,5 @@
package fr.free.nrw.commons; package free.nrw.commons;
import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;

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

@ -1,41 +1,34 @@
package fr.free.nrw.commons; package free.nrw.commons;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.net.URI;
import android.accounts.*; import android.accounts.*;
import android.app.Application; import android.app.Application;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.support.v4.util.LruCache; import android.support.v4.util.LruCache;
import android.util.Log; import android.util.Log;
import com.android.volley.RequestQueue; import com.android.volley.RequestQueue;
import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache; 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.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.utils.StorageUtils; import com.nostra13.universalimageloader.utils.StorageUtils;
import org.acra.ACRA; import org.acra.ACRA;
import org.acra.ReportingInteractionMode; import org.acra.ReportingInteractionMode;
import org.acra.annotation.ReportsCrashes; import org.acra.annotation.ReportsCrashes;
import org.apache.http.client.HttpClient;
import org.apache.http.conn.*; import org.apache.http.conn.*;
import org.apache.http.conn.scheme.*; import org.apache.http.conn.scheme.*;
import org.apache.http.conn.ssl.*; import org.apache.http.conn.ssl.*;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.BasicHttpParams; import org.apache.http.params.BasicHttpParams;
import org.mediawiki.api.*; import org.mediawiki.api.*;
import fr.free.nrw.commons.auth.WikiAccountAuthenticator; import free.nrw.commons.auth.WikiAccountAuthenticator;
import org.apache.http.impl.client.*; import org.apache.http.impl.client.*;
import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.CoreProtocolPNames;
import fr.free.nrw.commons.data.*; import free.nrw.commons.data.*;
import com.android.volley.toolbox.*; import com.android.volley.toolbox.*;
@ -65,7 +58,7 @@ public class CommonsApplication extends Application {
public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L}; public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L};
public static final Object[] EVENT_SHARE_ATTEMPT = {"MobileAppShareAttempts", 5346170L}; public static final Object[] EVENT_SHARE_ATTEMPT = {"MobileAppShareAttempts", 5346170L};
public static final Object[] EVENT_CATEGORIZATION_ATTEMPT = {"MobileAppCategorizationAttempts", 5359208L}; public static final Object[] EVENT_CATEGORIZATION_ATTEMPT = {"MobileAppCategorizationAttempts", 5359208L};
public static final Object[] EVENT_EVENTLOGGING_CHANGE = {"MobileAppTrackingChange", 5369400L};
public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app"; public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app";

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

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

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

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

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

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

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

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

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

@ -1,8 +1,7 @@
package fr.free.nrw.commons; package free.nrw.commons;
import android.net.Uri; import android.net.Uri;
import android.os.*; import android.os.*;
import android.util.Log;
import java.util.*; import java.util.*;
import java.util.regex.*; import java.util.regex.*;

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

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

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

@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package fr.free.nrw.commons; package free.nrw.commons;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
@ -28,8 +27,8 @@ import com.android.volley.VolleyError;
import com.android.volley.toolbox.ImageLoader; import com.android.volley.toolbox.ImageLoader;
import com.android.volley.toolbox.ImageLoader.ImageContainer; import com.android.volley.toolbox.ImageLoader.ImageContainer;
import com.android.volley.toolbox.ImageLoader.ImageListener; import com.android.volley.toolbox.ImageLoader.ImageListener;
import fr.free.nrw.commons.contributions.Contribution; import free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.contributions.ContributionsContentProvider; import free.nrw.commons.contributions.ContributionsContentProvider;
public class MediaWikiImageView extends ImageView { public class MediaWikiImageView extends ImageView {

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

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

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

@ -1,12 +1,10 @@
package fr.free.nrw.commons; package free.nrw.commons;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceManager;
import android.util.Log;
import com.actionbarsherlock.app.SherlockPreferenceActivity; import com.actionbarsherlock.app.SherlockPreferenceActivity;
public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
@ -54,13 +52,6 @@ public class SettingsActivity extends SherlockPreferenceActivity implements Shar
} }
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if(key.equals(Prefs.TRACKING_ENABLED)) {
// We force log this, so it is logged even if EL is turned off
EventLog.schema(CommonsApplication.EVENT_EVENTLOGGING_CHANGE)
.param("username", app.getCurrentAccount().name)
.param("state", sharedPreferences.getBoolean(key, true))
.log(true);
}
} }
} }

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

@ -1,8 +1,7 @@
package fr.free.nrw.commons; package free.nrw.commons;
import android.net.Uri; import android.net.Uri;
import android.os.*; import android.os.*;
import android.util.Log;
import com.nostra13.universalimageloader.core.*; import com.nostra13.universalimageloader.core.*;
import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
@ -19,7 +18,6 @@ import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.regex.Pattern;
public class Utils { public class Utils {

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons; package free.nrw.commons;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
@ -9,6 +9,7 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import com.viewpagerindicator.CirclePageIndicator; import com.viewpagerindicator.CirclePageIndicator;
import free.nrw.commons.R;
public class WelcomeActivity extends Activity { public class WelcomeActivity extends Activity {
static final int PAGE_WIKIPEDIA = 0, static final int PAGE_WIKIPEDIA = 0,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,23 +1,14 @@
package fr.free.nrw.commons.campaigns; package free.nrw.commons.campaigns;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.support.v4.widget.CursorAdapter; import android.support.v4.widget.CursorAdapter;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; import free.nrw.commons.Utils;
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 { class CampaignsListAdapter extends CursorAdapter {

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

@ -1,22 +1,17 @@
package fr.free.nrw.commons.campaigns; package free.nrw.commons.campaigns;
import android.accounts.Account; import android.accounts.Account;
import android.content.*; import android.content.*;
import android.database.Cursor;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import free.nrw.commons.CommonsApplication;
import org.mediawiki.api.ApiResult; import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi; 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.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
public class CampaignsSyncAdapter extends AbstractThreadedSyncAdapter { public class CampaignsSyncAdapter extends AbstractThreadedSyncAdapter {

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.category; package free.nrw.commons.category;
import android.app.Activity; import android.app.Activity;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
@ -9,23 +9,17 @@ import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.*; import android.view.*;
import android.view.MenuInflater;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.*;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import free.nrw.commons.CommonsApplication;
import free.nrw.commons.Utils;
import org.mediawiki.api.ApiResult; import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi; import org.mediawiki.api.MWApi;
import fr.free.nrw.commons.CommonsApplication; import free.nrw.commons.R;
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.IOException;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;

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

@ -1,15 +1,11 @@
package fr.free.nrw.commons.category; package free.nrw.commons.category;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.net.Uri; import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils;
import fr.free.nrw.commons.contributions.ContributionsContentProvider;
import java.util.Date; import java.util.Date;

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.contributions; package free.nrw.commons.contributions;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -7,17 +7,15 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.support.v4.widget.CursorAdapter; import android.support.v4.widget.CursorAdapter;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import fr.free.nrw.commons.CommonsApplication; import free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.MediaWikiImageView; import free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.R; import free.nrw.commons.Utils;
import fr.free.nrw.commons.Utils; import free.nrw.commons.R;
class ContributionsListAdapter extends CursorAdapter { class ContributionsListAdapter extends CursorAdapter {

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

@ -1,10 +1,9 @@
package fr.free.nrw.commons.contributions; package free.nrw.commons.contributions;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -17,9 +16,11 @@ import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import fr.free.nrw.commons.*; import free.nrw.commons.AboutActivity;
import fr.free.nrw.commons.R; import free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.campaigns.Campaign; import free.nrw.commons.R;
import free.nrw.commons.SettingsActivity;
import free.nrw.commons.campaigns.Campaign;
public class ContributionsListFragment extends SherlockFragment { public class ContributionsListFragment extends SherlockFragment {

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.media; package free.nrw.commons.media;
import android.app.DownloadManager; import android.app.DownloadManager;
import android.content.*; import android.content.*;
@ -16,11 +16,13 @@ import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.ShareActionProvider;
import fr.free.nrw.commons.*; import free.nrw.commons.*;
import fr.free.nrw.commons.contributions.Contribution; import free.nrw.commons.contributions.ContributionsActivity;
import fr.free.nrw.commons.contributions.ContributionsActivity; import free.nrw.commons.EventLog;
import free.nrw.commons.contributions.Contribution;
import free.nrw.commons.CommonsApplication;
import free.nrw.commons.Media;
public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener { public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
private ViewPager pager; private ViewPager pager;

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

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

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

@ -1,14 +1,9 @@
package fr.free.nrw.commons.modifications; package free.nrw.commons.modifications;
import android.os.Bundle;
import android.os.Parcel;
import android.text.TextUtils;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.*;
public class CategoryModifier extends PageModifier { public class CategoryModifier extends PageModifier {

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.modifications; package free.nrw.commons.modifications;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.AuthenticatorException; import android.accounts.AuthenticatorException;
@ -6,19 +6,17 @@ import android.accounts.OperationCanceledException;
import android.content.*; import android.content.*;
import android.database.Cursor; import android.database.Cursor;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.accounts.Account; import android.accounts.Account;
import android.os.Bundle; import android.os.Bundle;
import java.io.*; import java.io.*;
import java.util.*;
import free.nrw.commons.CommonsApplication;
import free.nrw.commons.Utils;
import free.nrw.commons.contributions.ContributionsContentProvider;
import org.mediawiki.api.*; import org.mediawiki.api.*;
import fr.free.nrw.commons.Utils; import free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.*;
import fr.free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.contributions.ContributionsContentProvider;
public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter { public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.modifications; package free.nrw.commons.modifications;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentValues; import android.content.ContentValues;
@ -6,15 +6,11 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.net.Uri; import android.net.Uri;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import fr.free.nrw.commons.contributions.ContributionsContentProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
public class ModifierSequence { public class ModifierSequence {
private Uri mediaUri; private Uri mediaUri;

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

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

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

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

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

@ -1,7 +1,6 @@
package fr.free.nrw.commons.upload; package free.nrw.commons.upload;
import java.util.*; import java.util.*;
import java.util.concurrent.*;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
@ -9,21 +8,23 @@ import android.database.DataSetObserver;
import android.net.*; import android.net.*;
import android.os.*; import android.os.*;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.text.*;
import android.view.*; import android.view.*;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.*; import android.widget.*;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import fr.free.nrw.commons.*; import free.nrw.commons.*;
import fr.free.nrw.commons.auth.*; import free.nrw.commons.auth.*;
import fr.free.nrw.commons.category.CategorizationFragment; import free.nrw.commons.EventLog;
import fr.free.nrw.commons.contributions.*; import free.nrw.commons.category.CategorizationFragment;
import fr.free.nrw.commons.media.*; import free.nrw.commons.contributions.*;
import fr.free.nrw.commons.modifications.CategoryModifier; import free.nrw.commons.media.*;
import fr.free.nrw.commons.modifications.ModificationsContentProvider; import free.nrw.commons.modifications.CategoryModifier;
import fr.free.nrw.commons.modifications.ModifierSequence; import free.nrw.commons.modifications.ModificationsContentProvider;
import fr.free.nrw.commons.modifications.TemplateRemoveModifier; import free.nrw.commons.modifications.ModifierSequence;
import free.nrw.commons.modifications.TemplateRemoveModifier;
import free.nrw.commons.CommonsApplication;
import free.nrw.commons.Media;
public class MultipleShareActivity public class MultipleShareActivity
extends AuthenticatedActivity extends AuthenticatedActivity

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

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

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

@ -1,6 +1,5 @@
package fr.free.nrw.commons.upload; package free.nrw.commons.upload;
import android.app.*;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
@ -9,15 +8,17 @@ import android.support.v4.app.NavUtils;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import android.widget.*; import android.widget.*;
import fr.free.nrw.commons.*; import free.nrw.commons.*;
import fr.free.nrw.commons.campaigns.Campaign; import free.nrw.commons.campaigns.Campaign;
import fr.free.nrw.commons.category.CategorizationFragment; import free.nrw.commons.modifications.ModifierSequence;
import fr.free.nrw.commons.contributions.*; import free.nrw.commons.category.CategorizationFragment;
import fr.free.nrw.commons.auth.*; import free.nrw.commons.contributions.*;
import fr.free.nrw.commons.modifications.CategoryModifier; import free.nrw.commons.auth.*;
import fr.free.nrw.commons.modifications.ModificationsContentProvider; import free.nrw.commons.modifications.CategoryModifier;
import fr.free.nrw.commons.modifications.ModifierSequence; import free.nrw.commons.modifications.ModificationsContentProvider;
import fr.free.nrw.commons.modifications.TemplateRemoveModifier; import free.nrw.commons.modifications.TemplateRemoveModifier;
import free.nrw.commons.CommonsApplication;
import free.nrw.commons.EventLog;
import java.util.ArrayList; import java.util.ArrayList;

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

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

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

@ -1,4 +1,4 @@
package fr.free.nrw.commons.upload; package free.nrw.commons.upload;
import android.app.Activity; import android.app.Activity;
import android.content.*; import android.content.*;
@ -10,18 +10,16 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.text.TextUtils; import android.text.TextUtils;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import fr.free.nrw.commons.CommonsApplication; import free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.HandlerService; import free.nrw.commons.HandlerService;
import fr.free.nrw.commons.Prefs; import free.nrw.commons.Prefs;
import fr.free.nrw.commons.Utils; import free.nrw.commons.Utils;
import fr.free.nrw.commons.campaigns.Campaign; import free.nrw.commons.campaigns.Campaign;
import fr.free.nrw.commons.campaigns.CampaignContribution; import free.nrw.commons.campaigns.CampaignContribution;
import fr.free.nrw.commons.contributions.Contribution; import free.nrw.commons.contributions.Contribution;
import java.io.IOException; import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
public class UploadController { public class UploadController {
private UploadService uploadService; private UploadService uploadService;
@ -117,30 +115,30 @@ public class UploadController {
protected Contribution doInBackground(Void... voids /* stare into you */) { protected Contribution doInBackground(Void... voids /* stare into you */) {
long length; long length;
try { try {
if(contribution.getDataLength() <= 0) { if (contribution.getDataLength() <= 0) {
length = activity.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength(); length = activity.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
if(length == -1) { if (length == -1) {
// Let us find out the long way! // Let us find out the long way!
length = Utils.countBytes(activity.getContentResolver().openInputStream(contribution.getLocalUri())); length = Utils.countBytes(activity.getContentResolver().openInputStream(contribution.getLocalUri()));
} }
contribution.setDataLength(length); contribution.setDataLength(length);
} }
} catch(IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
String mimeType = (String)contribution.getTag("mimeType"); String mimeType = (String) contribution.getTag("mimeType");
if(mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) { if (mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) {
mimeType = activity.getContentResolver().getType(contribution.getLocalUri()); mimeType = activity.getContentResolver().getType(contribution.getLocalUri());
if(mimeType != null) { if (mimeType != null) {
contribution.setTag("mimeType", mimeType); contribution.setTag("mimeType", mimeType);
} }
} }
if(mimeType.startsWith("image/") && contribution.getDateCreated() == null) { if (mimeType.startsWith("image/") && contribution.getDateCreated() == null) {
Cursor cursor = activity.getContentResolver().query(contribution.getLocalUri(), Cursor cursor = activity.getContentResolver().query(contribution.getLocalUri(),
new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null); new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
if(cursor != null && cursor.getCount() != 0) { if (cursor != null && cursor.getCount() != 0) {
cursor.moveToFirst(); cursor.moveToFirst();
contribution.setDateCreated(new Date(cursor.getLong(0))); contribution.setDateCreated(new Date(cursor.getLong(0)));
} // FIXME: Alternate way of setting dateCreated if this data is not found } // FIXME: Alternate way of setting dateCreated if this data is not found

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

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

2
disable-campaigns.patch
View file

@ -42,7 +42,7 @@ index 5ad1c77..50b16ff 100644
- android:name=".campaigns.CampaignsContentProvider" - android:name=".campaigns.CampaignsContentProvider"
- android:label="@string/provider_campaigns" - android:label="@string/provider_campaigns"
- android:syncable="true" - android:syncable="true"
- android:authorities="fr.free.nrw.commons.campaigns.contentprovider" - android:authorities="free.nrw.commons.campaigns.contentprovider"
- android:exported="false"> - android:exported="false">
- </provider> - </provider>
- <provider - <provider