From 55ca0841f6ac9be91fa185442a5c11cebc016441 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Fri, 6 Jun 2014 17:39:11 +0200
Subject: Fixing TAG and string resource

---
 .../keychain/service/ContactSyncAdapterService.java                  | 5 +++--
 OpenKeychain/src/main/res/values/strings.xml                         | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
index a52dbfa27..8db9294df 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -24,6 +24,7 @@ import android.content.ContentProviderClient;
 import android.content.Intent;
 import android.content.SyncResult;
 import android.os.*;
+import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.KeychainApplication;
 import org.sufficientlysecure.keychain.helper.ContactHelper;
 import org.sufficientlysecure.keychain.helper.EmailKeyHelper;
@@ -51,13 +52,13 @@ public class ContactSyncAdapterService extends Service {
                                 case KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS:
                                     if (data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS) &&
                                             data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS_MAX)) {
-                                        Log.d("Keychain/ContactSync/DownloadKeys", "Progress: " +
+                                        Log.d(Constants.TAG, "Progress: " +
                                                 data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS) + "/" +
                                                 data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX));
                                         return false;
                                     }
                                 default:
-                                    Log.d("Keychain/ContactSync/DownloadKeys", "Syncing... " + msg.toString());
+                                    Log.d(Constants.TAG, "Syncing... " + msg.toString());
                                     return false;
                             }
                         }
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ec6b389ed..9545c1ed4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -519,8 +519,7 @@
     <string name="can_sign_not">cannot sign</string>
     <string name="error_encoding">Encoding error</string>
     <string name="error_no_encrypt_subkey">No encryption subkey available!</string>
-    <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.
-        For more information, see Help.</string>
+    <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
     <string name="contact_show_key">Show key (%s)</string>
 
 </resources>
-- 
cgit v1.2.3