Merge trz/rename into trz/rebase

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/de/tzur/conversations/Settings.java b/src/main/java/de/tzur/conversations/Settings.java
index c919d60c..23eb3ee4 100644
--- a/src/main/java/de/tzur/conversations/Settings.java
+++ b/src/main/java/de/tzur/conversations/Settings.java
@@ -3,11 +3,13 @@ package de.tzur.conversations;
 import android.content.SharedPreferences;
 import android.util.Log;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
 /**
  * This class is used to provide access to settings which have to be accessed frequently.
  * Every setting in this class has to be updated using @see SettingsActivity#onSharedPreferenceChanged.
  */
-public final class Settings {
+public abstract class Settings {
 
     /**
      * Initializes the settings provided via this static class.
@@ -56,6 +58,7 @@ public final class Settings {
                 break;
         }
     }
+
     /**
      * Boolean if emoticons should be parsed to emoticons or not.
      */
@@ -85,10 +88,4 @@ public final class Settings {
      */
     public static boolean CONFIRM_MESSAGE_READ = true;
 
-    /**
-     * This is a utility class - private constructor avoids any instantiation.
-     */
-    private Settings() {
-        // Private constructor to avoid instantiation
-    }
 }