Fix broadcast manager usage.

Change-Id: Ifa4b461b537e40a65753c49f848dd8e4357e82f7

2 files changed, 16 insertions, 6 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java
index 2ed0fabc1fcc..186e20ec7c76 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java
@@ -96,7 +96,7 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
         mIntentsReceiver = new IntentsReceiver(this);
         IntentFilter aIntentFilter = buildIntentsReceiverFilter();
 
-        LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mIntentsReceiver, aIntentFilter);
+        getBroadcastManager().registerReceiver(mIntentsReceiver, aIntentFilter);
     }
 
     private static class IntentsReceiver extends BroadcastReceiver {
@@ -137,6 +137,12 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
         return aIntentFilter;
     }
 
+    private LocalBroadcastManager getBroadcastManager() {
+        Context aContext = getActivity().getApplicationContext();
+
+        return LocalBroadcastManager.getInstance(aContext);
+    }
+
     public void setUpPinValidationInstructions(String aPin) {
         TextView aPinTextView = (TextView) getView().findViewById(R.id.text_pin);
         aPinTextView.setText(aPin);
@@ -152,8 +158,6 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
     }
 
     public void setUpPresentation() {
-        // TODO: implement
-
         getActivity().finish();
     }
 
@@ -193,7 +197,7 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
 
     private void unregisterIntentsReceiver() {
         try {
-            getActivity().unregisterReceiver(mIntentsReceiver);
+            getBroadcastManager().unregisterReceiver(mIntentsReceiver);
         } catch (IllegalArgumentException e) {
             // Receiver not registered.
             // Fixed in Honeycomb: Android’s issue #6191.
diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java
index 80cf4c0fe7fc..1652e8a768b6 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java
@@ -117,7 +117,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo
         mIntentsReceiver = new IntentsReceiver(this);
         IntentFilter aIntentFilter = buildIntentsReceiverFilter();
 
-        LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mIntentsReceiver, aIntentFilter);
+        getBroadcastManager().registerReceiver(mIntentsReceiver, aIntentFilter);
     }
 
     private static final class IntentsReceiver extends BroadcastReceiver {
@@ -142,6 +142,12 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo
         return aIntentFilter;
     }
 
+    private LocalBroadcastManager getBroadcastManager() {
+        Context aContext = getActivity().getApplicationContext();
+
+        return LocalBroadcastManager.getInstance(aContext);
+    }
+
     public void loadComputers() {
         if (!isServiceBound()) {
             return;
@@ -205,7 +211,7 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo
 
     private void unregisterIntentsReceiver() {
         try {
-            getActivity().unregisterReceiver(mIntentsReceiver);
+            getBroadcastManager().unregisterReceiver(mIntentsReceiver);
         } catch (IllegalArgumentException e) {
             // Receiver not registered.
             // Fixed in Honeycomb: Android’s issue #6191.