Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/de/tzur/conversations/Settings.java b/src/main/java/de/tzur/conversations/Settings.java
index ffdce86d..b8922f0a 100644
--- a/src/main/java/de/tzur/conversations/Settings.java
+++ b/src/main/java/de/tzur/conversations/Settings.java
@@ -1,7 +1,7 @@
 package de.tzur.conversations;
 
 import android.content.SharedPreferences;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 
@@ -16,7 +16,7 @@ public abstract class Settings {
      * @param preferences the shared preferences of the app.
      */
     public static void initSettingsClassWithPreferences(SharedPreferences preferences) {
-        Log.d("SETTING", "Initializing settings");
+        Logging.d("SETTING", "Initializing settings");
         String[] preferenceNames = { "parse_emoticons", "send_button_status", "led_notification_color", "auto_download_file_wlan", "auto_download_file_link", "confirm_messages_list" };
         for (String name : preferenceNames) {
             Settings.synchronizeSettingsClassWithPreferences(preferences, name);
@@ -29,7 +29,7 @@ public abstract class Settings {
      * @param name the name of the setting to synchronize.
      */
     public static void synchronizeSettingsClassWithPreferences(SharedPreferences preferences, String name) {
-        Log.d("SETTING", "Synchronizing settings");
+        Logging.d("SETTING", "Synchronizing settings");
         switch (name) {
             case "parse_emoticons":
                 Settings.PARSE_EMOTICONS = preferences.getBoolean(name, Settings.PARSE_EMOTICONS);