From ec086b61c4d29de72229e559a1cb951d4760ed6d Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 15 Feb 2019 11:09:32 +0100
Subject: [PATCH] Fix crashing bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/activities/BaseActivity.java  | 8 --------
 .../nextcloud/talk/controllers/SettingsController.java    | 1 -
 2 files changed, 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java
index 6f40fd0a9..5739f82b0 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java
@@ -219,12 +219,4 @@ public class BaseActivity extends AppCompatActivity {
         super.onStop();
         eventBus.unregister(this);
     }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (!disposable.isDisposed()) {
-            disposable.dispose();
-        }
-    }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index 4330c65ab..9fc9172dd 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -392,7 +392,6 @@ public class SettingsController extends BaseController {
                 screenLockTimeoutChoicePreference.setEnabled(false);
                 appPreferences.removeScreenLock();
                 appPreferences.removeScreenLockTimeout();
-                screenLockTimeoutChoicePreference.setValue("0");
                 ((Checkable) screenLockSwitchPreference.findViewById(R.id.mp_checkable)).setChecked(false);
                 screenLockSwitchPreference.setAlpha(0.38f);
                 screenLockTimeoutChoicePreference.setAlpha(0.38f);