From 859065f2d96988112cea865438662360a4ce76fe Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 6 Feb 2013 03:21:43 +0530
Subject: [PATCH] Enable contributions sync provider by default!

---
 commons/AndroidManifest.xml                                | 1 +
 .../java/org/wikimedia/commons/auth/LoginActivity.java     | 4 ++++
 .../commons/contributions/ContributionsActivity.java       | 7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 28e0295d1..9dc7d1f7f 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
index 40aaed2e0..0b845ed59 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
@@ -2,6 +2,7 @@ package org.wikimedia.commons.auth;
 
 import java.io.IOException;
 
+import android.content.ContentResolver;
 import org.wikimedia.commons.CommonsApplication;
 import org.wikimedia.commons.R;
 import org.wikimedia.commons.R.id;
@@ -23,6 +24,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 import android.support.v4.app.NavUtils;
+import org.wikimedia.commons.contributions.ContributionsContentProvider;
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
@@ -62,6 +64,8 @@ public class LoginActivity extends AccountAuthenticatorActivity {
                         response.onResult(authResult);
                     }
                 }
+                // FIXME: If the user turns it off, it shouldn't be auto turned back on
+                ContentResolver.setSyncAutomatically(account, ContributionsContentProvider.AUTHORITY, true); // Enable sync by default!
                 context.finish();
             } else {
                 Toast failureToast = Toast.makeText(context, R.string.login_failed, Toast.LENGTH_LONG);
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
index 014f540a4..3ed5d1547 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
@@ -32,10 +32,7 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
-import org.wikimedia.commons.ImageLoaderTask;
-import org.wikimedia.commons.R;
-import org.wikimedia.commons.ShareActivity;
-import org.wikimedia.commons.UploadService;
+import org.wikimedia.commons.*;
 import org.wikimedia.commons.auth.AuthenticatedActivity;
 import org.wikimedia.commons.auth.WikiAccountAuthenticator;
 
@@ -165,6 +162,8 @@ public class ContributionsActivity extends AuthenticatedActivity implements Load
 
     @Override
     protected void onAuthCookieAcquired(String authCookie) {
+        // Do a sync everytime we get here!
+        ContentResolver.requestSync(((CommonsApplication)getApplicationContext()).getCurrentAccount(), ContributionsContentProvider.AUTHORITY, new Bundle());
         contributionDisplayOptions = new DisplayImageOptions.Builder().cacheInMemory()
                 .imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2)
                 .displayer(new FadeInBitmapDisplayer(300))