summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-04-11 21:10:03 +0200
committerFup Duck <fupduck@sacknagel.com>2018-04-11 21:10:03 +0200
commitf4b72eefce0b3cdc6cf4ffe0b9ecad64e865d277 (patch)
treee524c72f1e21d9727f2a239ef7880f36447eea9c /app/src
parent0e77f2c8d772b07f7b16d35c67cdb254ad648e48 (diff)
Revert "8876 - move broadcastreceiver to onResume"
This reverts commit 0e77f2c
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/MainActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index e40d329c..33ecf85a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -86,6 +86,7 @@ public class MainActivity extends AppCompatActivity {
setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
mainActivityBroadcastReceiver = new MainActivityBroadcastReceiver();
+ setUpBroadcastReceiver();
navigationDrawerFragment = (NavigationDrawerFragment)
getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);
@@ -103,7 +104,6 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onResume() {
- setUpBroadcastReceiver();
super.onResume();
}
@@ -205,12 +205,12 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onPause() {
- LocalBroadcastManager.getInstance(this).unregisterReceiver(mainActivityBroadcastReceiver);
super.onPause();
}
@Override
protected void onDestroy() {
+ LocalBroadcastManager.getInstance(this).unregisterReceiver(mainActivityBroadcastReceiver);
mainActivityBroadcastReceiver = null;
super.onDestroy();
}