some tor modifications

possibly fixes #199

2 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
index 0915d3399..f98872b7c 100644
--- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
@@ -209,7 +209,7 @@ public class UpdaterActivity extends XmppActivity {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             if (pm != null) {
                 mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, getClass().getName());
-                WakeLockHelper.acquire(mWakeLock);
+                mWakeLock.acquire();
             }
             mProgressDialog.show();
         }
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index f49331c5b..ef531f5fe 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -35,6 +35,7 @@ import android.os.PowerManager;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.support.annotation.BoolRes;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDelegate;
@@ -401,7 +402,7 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
         mColorWhite = ContextCompat.getColor(this, R.color.white70);
         this.mUsingEnterKey = usingEnterKey();
-        mUseSubject = getPreferences().getBoolean("use_subject", getResources().getBoolean(R.bool.use_subject));
+        mUseSubject = getBooleanPreference("use_subject", R.bool.use_subject);
     }
 
     protected boolean isCameraFeatureAvailable() {
@@ -449,6 +450,10 @@ public abstract class XmppActivity extends ActionBarActivity {
         return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     }
 
+    protected boolean getBooleanPreference(String name, @BoolRes int res) {
+        return getPreferences().getBoolean(name, getResources().getBoolean(res));
+    }
+
     public boolean useSubjectToIdentifyConference() {
         return mUseSubject;
     }