Merge remote-tracking branch 'origin/2.8-release' into 2.8-release

# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

app/build.gradle

@@ -122,7 +122,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-glide.txt'
         }
         debug {
-            applicationIdSuffix ".debug"
             testCoverageEnabled true
             versionNameSuffix "-debug-" + getBranchName() + "~" + getBuildVersion()
         }
@@ -131,6 +130,9 @@ android {
     flavorDimensions 'tier'
     productFlavors {
         prod {
+		
+			applicationId 'fr.free.nrw.commons'
+
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
@@ -144,10 +146,18 @@ android {
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
             buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\""
+
+            buildConfigField "String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons\""
+            buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.contributions.contentprovider\""
+            buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.modifications.contentprovider\""
+            buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.categories.contentprovider\""
+
             dimension 'tier'
         }
 
         beta {
+            applicationId 'fr.free.nrw.commons.beta'
+
             // What values do we need to hit the BETA versions of the site / api ?
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
@@ -162,6 +172,12 @@ android {
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""
             buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\""
+
+            buildConfigField "String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons.beta\""
+            buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.beta.contributions.contentprovider\""
+            buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.beta.modifications.contentprovider\""
+            buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.beta.categories.contentprovider\""
+
             dimension 'tier'
         }
     }

app/src/beta/res/values/adapter.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="account_type">fr.free.nrw.commons.beta</string>
+    <string name="contribution_authority">fr.free.nrw.commons.beta.contributions.contentprovider</string>
+    <string name="modification_authority">fr.free.nrw.commons.beta.modifications.contentprovider</string>
+    <string name="category_authority">fr.free.nrw.commons.beta.categories.contentprovider</string>
+</resources>

app/src/debug/res/values/placeholder_strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="placeholder_place_distance">Overlay</string>
-  <string name="placeholder_place_name">Name</string>
-  <string name="placeholder_place_description">Description</string>
-</resources>

app/src/main/AndroidManifest.xml

@@ -168,21 +168,21 @@
 
         <provider
             android:name=".contributions.ContributionsContentProvider"
-            android:authorities="fr.free.nrw.commons.contributions.contentprovider"
+            android:authorities="${applicationId}.contributions.contentprovider"
             android:exported="false"
             android:label="@string/provider_contributions"
             android:syncable="true" />
 
         <provider
             android:name=".modifications.ModificationsContentProvider"
-            android:authorities="fr.free.nrw.commons.modifications.contentprovider"
+            android:authorities="${applicationId}.modifications.contentprovider"
             android:exported="false"
             android:label="@string/provider_modifications"
             android:syncable="true" />
 
         <provider
             android:name=".category.CategoryContentProvider"
-            android:authorities="fr.free.nrw.commons.categories.contentprovider"
+            android:authorities="${applicationId}.categories.contentprovider"
             android:exported="false"
             android:label="@string/provider_categories"
             android:syncable="false" />

app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java

@@ -1,20 +1,6 @@
 package fr.free.nrw.commons.auth;
 
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.content.ContentResolver;
 import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import timber.log.Timber;
-
-import static android.accounts.AccountManager.ERROR_CODE_REMOTE_EXCEPTION;
-import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
-import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
-import static fr.free.nrw.commons.contributions.ContributionsContentProvider.CONTRIBUTION_AUTHORITY;
-import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MODIFICATIONS_AUTHORITY;
 
 public class AccountUtil {
 
@@ -27,38 +13,4 @@ public class AccountUtil {
         this.context = context;
     }
 
-    public void createAccount(@Nullable AccountAuthenticatorResponse response,
-                              String username, String password) {
-
-        Account account = new Account(username, ACCOUNT_TYPE);
-        boolean created = accountManager().addAccountExplicitly(account, password, null);
-
-        Timber.d("account creation " + (created ? "successful" : "failure"));
-
-        if (created) {
-            if (response != null) {
-                Bundle bundle = new Bundle();
-                bundle.putString(KEY_ACCOUNT_NAME, username);
-                bundle.putString(KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-
-
-                response.onResult(bundle);
-            }
-
-        } else {
-            if (response != null) {
-                response.onError(ERROR_CODE_REMOTE_EXCEPTION, "");
-            }
-            Timber.d("account creation failure");
-        }
-
-        // FIXME: If the user turns it off, it shouldn't be auto turned back on
-        ContentResolver.setSyncAutomatically(account, CONTRIBUTION_AUTHORITY, true); // Enable sync by default!
-        ContentResolver.setSyncAutomatically(account, MODIFICATIONS_AUTHORITY, true); // Enable sync by default!
-    }
-
-    private AccountManager accountManager() {
-        return AccountManager.get(context);
-    }
-
 }

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -63,7 +63,6 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
 
     @Inject MediaWikiApi mwApi;
-    @Inject AccountUtil accountUtil;
     @Inject SessionManager sessionManager;
     @Inject @Named("application_preferences") SharedPreferences prefs;
     @Inject @Named("default_preferences") SharedPreferences defaultPrefs;
@@ -248,7 +247,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
             }
         }
 
-        accountUtil.createAccount(response, username, password);
+        sessionManager.createAccount(response, username, password);
         startMainActivity();
     }
 

app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java

@@ -1,18 +1,24 @@
 package fr.free.nrw.commons.auth;
 
 import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Bundle;
 
 import javax.annotation.Nullable;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import io.reactivex.Completable;
 import io.reactivex.Observable;
 import timber.log.Timber;
 
-import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
+import static android.accounts.AccountManager.ERROR_CODE_REMOTE_EXCEPTION;
+import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
+import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
 
 /**
  * Manage the current logged in user session.
@@ -23,13 +29,57 @@ public class SessionManager {
     private Account currentAccount; // Unlike a savings account...  ;-)
     private SharedPreferences sharedPreferences;
 
-    public SessionManager(Context context, MediaWikiApi mediaWikiApi, SharedPreferences sharedPreferences) {
+
+    public SessionManager(Context context,
+                          MediaWikiApi mediaWikiApi,
+                          SharedPreferences sharedPreferences) {
         this.context = context;
         this.mediaWikiApi = mediaWikiApi;
         this.currentAccount = null;
         this.sharedPreferences = sharedPreferences;
     }
 
+    /**
+     * Creata a new account
+     *
+     * @param response
+     * @param username
+     * @param password
+     */
+    public void createAccount(@Nullable AccountAuthenticatorResponse response,
+                              String username, String password) {
+
+        Account account = new Account(username, BuildConfig.ACCOUNT_TYPE);
+        boolean created = accountManager().addAccountExplicitly(account, password, null);
+
+        Timber.d("account creation " + (created ? "successful" : "failure"));
+
+        if (created) {
+            if (response != null) {
+                Bundle bundle = new Bundle();
+                bundle.putString(KEY_ACCOUNT_NAME, username);
+                bundle.putString(KEY_ACCOUNT_TYPE, BuildConfig.ACCOUNT_TYPE);
+
+
+                response.onResult(bundle);
+            }
+
+        } else {
+            if (response != null) {
+                response.onError(ERROR_CODE_REMOTE_EXCEPTION, "");
+            }
+            Timber.d("account creation failure");
+        }
+
+        // FIXME: If the user turns it off, it shouldn't be auto turned back on
+        ContentResolver.setSyncAutomatically(account, BuildConfig.CONTRIBUTION_AUTHORITY, true); // Enable sync by default!
+        ContentResolver.setSyncAutomatically(account, BuildConfig.MODIFICATION_AUTHORITY, true); // Enable sync by default!
+    }
+
+    private AccountManager accountManager() {
+        return AccountManager.get(context);
+    }
+
     /**
      * @return Account|null
      */
@@ -37,7 +87,7 @@ public class SessionManager {
     public Account getCurrentAccount() {
         if (currentAccount == null) {
             AccountManager accountManager = AccountManager.get(context);
-            Account[] allAccounts = accountManager.getAccountsByType(ACCOUNT_TYPE);
+            Account[] allAccounts = accountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE);
             if (allAccounts.length != 0) {
                 currentAccount = allAccounts[0];
             }
@@ -53,7 +103,7 @@ public class SessionManager {
             return false; // This should never happen
         }
 
-        accountManager.invalidateAuthToken(ACCOUNT_TYPE, mediaWikiApi.getAuthCookie());
+        accountManager.invalidateAuthToken(BuildConfig.ACCOUNT_TYPE, mediaWikiApi.getAuthCookie());
         String authCookie = getAuthCookie();
 
         if (authCookie == null) {
@@ -92,7 +142,7 @@ public class SessionManager {
 
     public Completable clearAllAccounts() {
         AccountManager accountManager = AccountManager.get(context);
-        Account[] allAccounts = accountManager.getAccountsByType(ACCOUNT_TYPE);
+        Account[] allAccounts = accountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE);
         return Completable.fromObservable(Observable.fromArray(allAccounts)
                 .map(a -> accountManager.removeAccount(a, null, null).getResult()))
                 .doOnComplete(() -> currentAccount = null);

app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java

@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
@@ -19,7 +20,7 @@ import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
 import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
-    private static final String[] SYNC_AUTHORITIES = {ContributionsContentProvider.CONTRIBUTION_AUTHORITY, ModificationsContentProvider.MODIFICATIONS_AUTHORITY};
+    private static final String[] SYNC_AUTHORITIES = {BuildConfig.CONTRIBUTION_AUTHORITY, BuildConfig.MODIFICATION_AUTHORITY};
 
     @NonNull
     private final Context context;

app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
@@ -22,19 +23,18 @@ import static fr.free.nrw.commons.category.CategoryDao.Table.TABLE_NAME;
 
 public class CategoryContentProvider extends CommonsDaggerContentProvider {
 
-    public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
     // For URI matcher
     private static final int CATEGORIES = 1;
     private static final int CATEGORIES_ID = 2;
     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://" + BuildConfig.CATEGORY_AUTHORITY + "/" + BASE_PATH);
 
     private static final UriMatcher uriMatcher = new UriMatcher(NO_MATCH);
 
     static {
-        uriMatcher.addURI(AUTHORITY, BASE_PATH, CATEGORIES);
+        uriMatcher.addURI(BuildConfig.CATEGORY_AUTHORITY, BASE_PATH, CATEGORIES);
-        uriMatcher.addURI(AUTHORITY, BASE_PATH + "/#", CATEGORIES_ID);
+        uriMatcher.addURI(BuildConfig.CATEGORY_AUTHORITY, BASE_PATH + "/#", CATEGORIES_ID);
     }
 
     public static Uri uriForId(int id) {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

@@ -110,7 +110,7 @@ public  class       ContributionsActivity
     @Override
     protected void onAuthCookieAcquired(String authCookie) {
         // Do a sync everytime we get here!
-        requestSync(sessionManager.getCurrentAccount(), ContributionsContentProvider.CONTRIBUTION_AUTHORITY, new Bundle());
+        requestSync(sessionManager.getCurrentAccount(), BuildConfig.CONTRIBUTION_AUTHORITY, new Bundle());
         Intent uploadServiceIntent = new Intent(this, UploadService.class);
         uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
         startService(uploadServiceIntent);

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
@@ -25,13 +26,12 @@ public class ContributionsContentProvider extends CommonsDaggerContentProvider {
     private static final int CONTRIBUTIONS_ID = 2;
     private static final String BASE_PATH = "contributions";
     private static final UriMatcher uriMatcher = new UriMatcher(NO_MATCH);
-    public static final String CONTRIBUTION_AUTHORITY = "fr.free.nrw.commons.contributions.contentprovider";
 
-    public static final Uri BASE_URI = Uri.parse("content://" + CONTRIBUTION_AUTHORITY + "/" + BASE_PATH);
+    public static final Uri BASE_URI = Uri.parse("content://" + BuildConfig.CONTRIBUTION_AUTHORITY + "/" + BASE_PATH);
 
     static {
-        uriMatcher.addURI(CONTRIBUTION_AUTHORITY, BASE_PATH, CONTRIBUTIONS);
+        uriMatcher.addURI(BuildConfig.CONTRIBUTION_AUTHORITY, BASE_PATH, CONTRIBUTIONS);
-        uriMatcher.addURI(CONTRIBUTION_AUTHORITY, BASE_PATH + "/#", CONTRIBUTIONS_ID);
+        uriMatcher.addURI(BuildConfig.CONTRIBUTION_AUTHORITY, BASE_PATH + "/#", CONTRIBUTIONS_ID);
     }
 
     public static Uri uriForId(int id) {

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -12,6 +12,7 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.data.DBOpenHelper;
@@ -30,8 +31,6 @@ import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MOD
 @Module
 @SuppressWarnings({"WeakerAccess", "unused"})
 public class CommonsApplicationModule {
-    public static final String CATEGORY_AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
-
     private Context applicationContext;
 
     public CommonsApplicationModule(Context applicationContext) {
@@ -51,7 +50,7 @@ public class CommonsApplicationModule {
     @Provides
     @Named("category")
     public ContentProviderClient provideCategoryContentProviderClient(Context context) {
-        return context.getContentResolver().acquireContentProviderClient(CATEGORY_AUTHORITY);
+        return context.getContentResolver().acquireContentProviderClient(BuildConfig.CATEGORY_AUTHORITY);
     }
 
     /**
@@ -69,13 +68,13 @@ public class CommonsApplicationModule {
     @Provides
     @Named("contribution")
     public ContentProviderClient provideContributionContentProviderClient(Context context) {
-        return context.getContentResolver().acquireContentProviderClient(CONTRIBUTION_AUTHORITY);
+        return context.getContentResolver().acquireContentProviderClient(BuildConfig.CONTRIBUTION_AUTHORITY);
     }
 
     @Provides
     @Named("modification")
     public ContentProviderClient provideModificationContentProviderClient(Context context) {
-        return context.getContentResolver().acquireContentProviderClient(MODIFICATIONS_AUTHORITY);
+        return context.getContentResolver().acquireContentProviderClient(BuildConfig.MODIFICATION_AUTHORITY);
     }
 
     @Provides

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
@@ -22,15 +23,14 @@ public class ModificationsContentProvider extends CommonsDaggerContentProvider {
     private static final int MODIFICATIONS = 1;
     private static final int MODIFICATIONS_ID = 2;
 
-    public static final String MODIFICATIONS_AUTHORITY = "fr.free.nrw.commons.modifications.contentprovider";
     public static final String BASE_PATH = "modifications";
 
-    public static final Uri BASE_URI = Uri.parse("content://" + MODIFICATIONS_AUTHORITY + "/" + BASE_PATH);
+    public static final Uri BASE_URI = Uri.parse("content://" + BuildConfig.MODIFICATION_AUTHORITY + "/" + BASE_PATH);
 
     private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
     static {
-        uriMatcher.addURI(MODIFICATIONS_AUTHORITY, BASE_PATH, MODIFICATIONS);
+        uriMatcher.addURI(BuildConfig.MODIFICATION_AUTHORITY, BASE_PATH, MODIFICATIONS);
-        uriMatcher.addURI(MODIFICATIONS_AUTHORITY, BASE_PATH + "/#", MODIFICATIONS_ID);
+        uriMatcher.addURI(BuildConfig.MODIFICATION_AUTHORITY, BASE_PATH + "/#", MODIFICATIONS_ID);
     }
 
     public static Uri uriForId(int id) {

app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java

@@ -13,6 +13,7 @@ import java.io.IOException;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionDao;
@@ -77,7 +78,7 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
 
         ContentProviderClient contributionsClient = null;
         try {
-            contributionsClient = getContext().getContentResolver().acquireContentProviderClient(ContributionsContentProvider.CONTRIBUTION_AUTHORITY);
+            contributionsClient = getContext().getContentResolver().acquireContentProviderClient(BuildConfig.CONTRIBUTION_AUTHORITY);
 
             while (!allModifications.isAfterLast()) {
                 ModifierSequence sequence = modifierSequenceDao.fromCursor(allModifications);

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -92,6 +92,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
         ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
         params.setParameter(CoreProtocolPNames.USER_AGENT, getUserAgent());
         httpClient = new DefaultHttpClient(cm, params);
+        httpClient.addRequestInterceptor(NetworkInterceptors.getHttpRequestInterceptor());
         api = new MWApi(apiURL, httpClient);
         wikidataApi = new MWApi(wikidatApiURL, httpClient);
         this.defaultPreferences = defaultPreferences;

app/src/main/java/fr/free/nrw/commons/mwapi/NetworkInterceptors.java

@@ -0,0 +1,85 @@
+package fr.free.nrw.commons.mwapi;
+
+import android.support.annotation.NonNull;
+
+import org.apache.http.Header;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.impl.client.ClientParamsStack;
+import org.apache.http.params.HttpParamsNames;
+import org.apache.http.protocol.HttpContext;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import timber.log.Timber;
+
+public class NetworkInterceptors {
+
+    /**
+     * Interceptor to log the HTTP request
+     */
+    @NonNull
+    public static HttpRequestInterceptor getHttpRequestInterceptor() {
+        return (HttpRequest request, HttpContext httpContext) -> {
+            Timber.v("<<<<<<<<<<<<<< START OF REQUEST LOGGING [%s] >>>>>>>>>>>>", request.getRequestLine().getUri());
+
+            Timber.v("Request line:\n %s", request.getRequestLine().toString());
+            logRequestParams(request);
+            logRequestHeaders(request);
+            Timber.v("Protocol version:\n %s", request.getProtocolVersion());
+
+            Timber.v("<<<<<<<<<<<<<< END OF REQUEST LOGGING [%s] >>>>>>>>>>>>", request.getRequestLine().getUri());
+        };
+    }
+
+    /**
+     * Log all request params from a HTTPRequest
+     * @param request
+     */
+    private static void logRequestParams(HttpRequest request) {
+        Set<String> names = new HashSet<>();
+        if (request.getParams() instanceof ClientParamsStack) {
+            ClientParamsStack cps = (ClientParamsStack) request.getParams();
+            if (cps.getApplicationParams() != null
+                    && cps.getRequestParams() instanceof HttpParamsNames) {
+                names.addAll(((HttpParamsNames) cps.getApplicationParams()).getNames());
+            }
+            if (cps.getClientParams() != null
+                    && cps.getClientParams() instanceof HttpParamsNames) {
+                names.addAll(((HttpParamsNames) cps.getClientParams()).getNames());
+            }
+            if (cps.getRequestParams() != null
+                    && cps.getRequestParams() instanceof HttpParamsNames) {
+                names.addAll(((HttpParamsNames) cps.getRequestParams()).getNames());
+            }
+            if (cps.getOverrideParams() != null
+                    && cps.getRequestParams() instanceof HttpParamsNames) {
+                names.addAll(((HttpParamsNames) cps.getOverrideParams()).getNames());
+            }
+        } else {
+            HttpParamsNames params = (HttpParamsNames) request.getParams();
+            names = params.getNames();
+        }
+
+        Timber.v("<<<<<<<<<<<<<< REQUEST PARAMS >>>>>>>>>>>>");
+        for (String name : names) {
+            Timber.v("Param >> %s: %s", name, request.getParams().getParameter(name));
+        }
+        Timber.v("<<<<<<<<<<<<<< REQUEST PARAMS >>>>>>>>>>>>");
+    }
+
+    /**
+     * Log all headers from a HTTPRequest
+     * @param request
+     */
+    private static void logRequestHeaders(HttpRequest request) {
+        Header[] headerFields = request.getAllHeaders();
+
+        Timber.v("<<<<<<<<<<<<<< HEADERS >>>>>>>>>>>>");
+        for (int e = 0; e < request.getAllHeaders().length; e++) {
+            Timber.v("Header >> %s: %s", headerFields[e].getName(), headerFields[e].getValue());
+        }
+        Timber.v("<<<<<<<<<<<<<< HEADERS >>>>>>>>>>>>");
+    }
+}

app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java

@@ -31,6 +31,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import butterknife.ButterKnife;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
@@ -191,7 +192,7 @@ public class MultipleShareActivity extends AuthenticatedActivity
         }
         // FIXME: Make sure that the content provider is up
         // This is the wrong place for it, but bleh - better than not having it turned on by default for people who don't go throughl ogin
-        ContentResolver.setSyncAutomatically(sessionManager.getCurrentAccount(), ModificationsContentProvider.MODIFICATIONS_AUTHORITY, true); // Enable sync by default!
+        ContentResolver.setSyncAutomatically(sessionManager.getCurrentAccount(), BuildConfig.MODIFICATION_AUTHORITY, true); // Enable sync by default!
         finish();
     }
 

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -46,6 +46,7 @@ import javax.inject.Named;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
 import fr.free.nrw.commons.auth.LoginActivity;
@@ -241,7 +242,7 @@ public class ShareActivity
 
         // FIXME: Make sure that the content provider is up
         // This is the wrong place for it, but bleh - better than not having it turned on by default for people who don't go throughl ogin
-        ContentResolver.setSyncAutomatically(sessionManager.getCurrentAccount(), ModificationsContentProvider.MODIFICATIONS_AUTHORITY, true); // Enable sync by default!
+        ContentResolver.setSyncAutomatically(sessionManager.getCurrentAccount(), BuildConfig.MODIFICATION_AUTHORITY, true); // Enable sync by default!
 
         finish();
     }

app/src/main/java/fr/free/nrw/commons/upload/UploadService.java

@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.HandlerService;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
@@ -272,7 +273,7 @@ public class UploadService extends HandlerService<Contribution> {
             toUpload--;
             if (toUpload == 0) {
                 // Sync modifications right after all uplaods are processed
-                ContentResolver.requestSync(sessionManager.getCurrentAccount(), ModificationsContentProvider.MODIFICATIONS_AUTHORITY, new Bundle());
+                ContentResolver.requestSync(sessionManager.getCurrentAccount(), BuildConfig.MODIFICATION_AUTHORITY, new Bundle());
                 stopForeground(true);
             }
         }

app/src/main/res/xml/authenticator.xml

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

app/src/main/res/xml/contributions_sync_adapter.xml

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

app/src/main/res/xml/modifications_sync_adapter.xml

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

app/src/prod/res/values/adapter.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="account_type">fr.free.nrw.commons</string>
+    <string name="contribution_authority">fr.free.nrw.commons.contributions.contentprovider</string>
+    <string name="modification_authority">fr.free.nrw.commons.modifications.contentprovider</string>
+    <string name="category_authority">fr.free.nrw.commons.categories.contentprovider</string>
+</resources>