Add debug applicationIdSuffix

app/build.gradle

@@ -46,6 +46,7 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
             resValue 'string', 'mapbox_key', project.hasProperty('tasks_mapbox_key_debug') ? tasks_mapbox_key_debug : ''
             resValue 'string', 'google_key', project.hasProperty('tasks_google_key_debug') ? tasks_google_key_debug : ''
             testCoverageEnabled true
@@ -57,6 +58,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
             signingConfig signingConfigs.release
         }
+        applicationVariants.all { variant ->
+            variant.resValue "string", "app_package", variant.applicationId
+        }
     }
 
     flavorDimensions 'store'

app/src/debug/google-services.json

@@ -1,39 +1,37 @@
 {
   "project_info": {
-    "project_number": "363426363175",
-    "firebase_url": "https://tasks-98543.firebaseio.com",
-    "project_id": "tasks-98543",
-    "storage_bucket": "tasks-98543.appspot.com"
+    "project_number": "448612483090",
+    "firebase_url": "https://tasks-debug.firebaseio.com",
+    "project_id": "tasks-debug",
+    "storage_bucket": "tasks-debug.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:363426363175:android:9bc4739db40ecb39",
+        "mobilesdk_app_id": "1:448612483090:android:c31434c55745e54c",
         "android_client_info": {
-          "package_name": "org.tasks"
+          "package_name": "org.tasks.debug"
         }
       },
       "oauth_client": [
         {
-          "client_id": "363426363175-n0862rti6ect01fr3t4m229hqvvu1s8a.apps.googleusercontent.com",
+          "client_id": "448612483090-ns27d5rn3nm5nh4fjrkc22ag9qslkuho.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyACOYpQZEIkpF2EykbufMOZXn9QVrP_5lI"
+          "current_key": "AIzaSyBLqXwszuCxCXdYRz7FCgpJa9Kufo4cs8E"
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
+          "other_platform_oauth_client": [
+            {
+              "client_id": "448612483090-ns27d5rn3nm5nh4fjrkc22ag9qslkuho.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         }
       }
     }

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="app_name" tools:ignore="PrivateResource">Tasks Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -238,7 +238,7 @@
     <!-- ======================================================= Providers = -->
 
     <provider
-      android:authorities="org.tasks;org.tasks.tasksprovider"
+      android:authorities="${applicationId};${applicationId}.tasksprovider"
       android:exported="true"
       android:grantUriPermissions="true"
       android:multiprocess="true"

app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java

@@ -23,6 +23,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import javax.inject.Inject;
+import org.tasks.BuildConfig;
 import org.tasks.data.TagDao;
 import org.tasks.data.TagData;
 import org.tasks.injection.ContentProviderComponent;
@@ -40,9 +41,9 @@ import timber.log.Timber;
  */
 public class Astrid2TaskProvider extends InjectingContentProvider {
 
-  private static final String AUTHORITY = "org.tasks.tasksprovider";
+  private static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".tasksprovider";
 
-  private static final Uri CONTENT_URI = Uri.parse("content://org.tasks.tasksprovider");
+  private static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
 
   private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
 

app/src/main/res/values/keys.xml

@@ -5,7 +5,6 @@
 -->
 <resources>
 
-  <string name="app_name">Tasks</string>
   <string name="FSA_label">Tasks Shortcut</string>
 
   <string name="p_date_shortcut_morning">date_shortcut_morning</string>

app/src/main/res/xml/preferences.xml

@@ -37,13 +37,13 @@
     <Preference android:title="@string/task_defaults">
       <intent
         android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
-        android:targetPackage="org.tasks"/>
+        android:targetPackage="@string/app_package"/>
     </Preference>
 
     <Preference android:title="@string/date_and_time">
       <intent
         android:targetClass="org.tasks.preferences.DateTimePreferences"
-        android:targetPackage="org.tasks"/>
+        android:targetPackage="@string/app_package"/>
     </Preference>
 
     <Preference
@@ -51,7 +51,7 @@
       android:title="@string/synchronization">
       <intent
         android:targetClass="org.tasks.sync.SynchronizationPreferences"
-        android:targetPackage="org.tasks"/>
+        android:targetPackage="@string/app_package"/>
     </Preference>
 
     <Preference
@@ -61,7 +61,7 @@
     <Preference android:title="@string/miscellaneous">
       <intent
         android:targetClass="org.tasks.preferences.MiscellaneousPreferences"
-        android:targetPackage="org.tasks"/>
+        android:targetPackage="@string/app_package"/>
     </Preference>
 
   </PreferenceCategory>

app/src/release/res/values/keys.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="app_name" tools:ignore="PrivateResource">Tasks</string>
+</resources>