From 51840c3a2237271f82b0e07f6a7ec544fb098cde Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Sun, 2 Apr 2017 19:19:38 +0200
Subject: [PATCH] Fix some inconsistencies

---
 app/src/main/AndroidManifest.xml                          | 4 ++--
 app/src/main/java/com/etesync/syncadapter/App.java        | 8 ++++----
 .../com/etesync/syncadapter/ui/AppSettingsActivity.java   | 5 ++++-
 app/src/main/res/xml/account_authenticator.xml            | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 130c25e0..d0d5b632 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,11 +55,11 @@
         tools:ignore="UnusedAttribute">
 
         <receiver
-            android:name=".App$ReinitLoggingReceiver"
+            android:name=".App$ReinitSettingsReceiver"
             android:exported="false"
             android:process=":sync">
             <intent-filter>
-                <action android:name="com.etesync.syncadapter.REINIT_LOGGER"/>
+                <action android:name="at.bitfire.davdroid.REINIT_SETTINGS"/>
             </intent-filter>
         </receiver>
         <receiver
diff --git a/app/src/main/java/com/etesync/syncadapter/App.java b/app/src/main/java/com/etesync/syncadapter/App.java
index 1fa4e0fd..1a018e24 100644
--- a/app/src/main/java/com/etesync/syncadapter/App.java
+++ b/app/src/main/java/com/etesync/syncadapter/App.java
@@ -78,8 +78,6 @@ import okhttp3.internal.tls.OkHostnameVerifier;
 
 
 public class App extends Application {
-    public static final String FLAVOR_GOOGLE_PLAY = "gplay";
-
     public static final String
             DISTRUST_SYSTEM_CERTIFICATES = "distrustSystemCerts",
             LOG_TO_EXTERNAL_STORAGE = "logToExternalStorage",
@@ -216,11 +214,13 @@ public class App extends Application {
     }
 
 
-    public static class ReinitLoggingReceiver extends BroadcastReceiver {
+    public static class ReinitSettingsReceiver extends BroadcastReceiver {
+
+        public static final String ACTION_REINIT_SETTINGS = BuildConfig.APPLICATION_ID + ".REINIT_SETTINGS";
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            log.info("Received broadcast: re-initializing logger");
+            log.info("Received broadcast: re-initializing settings (logger/cert manager)");
 
             App app = (App)context.getApplicationContext();
             app.reinitLogger();
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java
index 8e89dd4c..c388ed4d 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.java
@@ -161,6 +161,9 @@ public class AppSettingsActivity extends AppCompatActivity {
             // re-initialize certificate manager
             App app = (App)getContext().getApplicationContext();
             app.reinitCertManager();
+
+            // reinitialize certificate manager of :sync process
+            getContext().sendBroadcast(new Intent(App.ReinitSettingsReceiver.ACTION_REINIT_SETTINGS));
         }
 
         private void resetCertificates() {
@@ -176,7 +179,7 @@ public class AppSettingsActivity extends AppCompatActivity {
             app.reinitLogger();
 
             // reinitialize logger of :sync process
-            getContext().sendBroadcast(new Intent("com.etesync.syncadapter.REINIT_LOGGER"));
+            getContext().sendBroadcast(new Intent(App.ReinitSettingsReceiver.ACTION_REINIT_SETTINGS));
         }
     }
 
diff --git a/app/src/main/res/xml/account_authenticator.xml b/app/src/main/res/xml/account_authenticator.xml
index b0560f1d..fc71fa90 100644
--- a/app/src/main/res/xml/account_authenticator.xml
+++ b/app/src/main/res/xml/account_authenticator.xml
@@ -7,7 +7,7 @@
   -->
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="com.etesync.syncadapter"
+    android:accountType="@string/account_type"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:smallIcon="@mipmap/ic_launcher"