1 files changed, 21 insertions, 100 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
index bd80f6cfc65f..ff061e655b36 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -76,10 +76,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onCreate(Bundle aSavedInstanceState) {
         super.onCreate(aSavedInstanceState);
 
-        setUpActionBar();
-    }
-
-    private void setUpActionBar() {
         setHasOptionsMenu(true);
     }
 
@@ -92,21 +88,8 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onViewStateRestored(Bundle aSavedInstanceState) {
         super.onViewStateRestored(aSavedInstanceState);
 
-        if (!isSavedInstanceValid(aSavedInstanceState)) {
-            return;
-        }
-
-        loadProgressMessage(aSavedInstanceState);
-    }
-
-    private boolean isSavedInstanceValid(Bundle aSavedInstanceState) {
-        return aSavedInstanceState != null;
-    }
-
-    private void loadProgressMessage(Bundle aSavedInstanceState) {
-        boolean aProgressMessageDisplayed = aSavedInstanceState.getBoolean(SavedStates.Keys.PROGRESS_MESSAGE);
-
-        if (aProgressMessageDisplayed) {
+        if (aSavedInstanceState != null
+                && aSavedInstanceState.getBoolean(SavedStates.Keys.PROGRESS_MESSAGE)) {
             showProgressMessage();
             showLearnMoreMessage();
         }
@@ -127,7 +110,7 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     }
 
     private void showLearnMoreMessage() {
-        TextView learnMoreView = getLearnMoreView();
+        TextView learnMoreView = (TextView) getView().findViewById(R.id.text_learn_more);
         Animation aFadeInAnimation = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in);
 
         learnMoreView.setMovementMethod(LinkMovementMethod.getInstance());
@@ -136,10 +119,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         learnMoreView.setVisibility(View.VISIBLE);
     }
 
-    private TextView getLearnMoreView() {
-        return (TextView) getView().findViewById(R.id.text_learn_more);
-    }
-
     private String getProgressMessage() {
         switch (getType()) {
             case WIFI:
@@ -161,10 +140,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onActivityCreated(Bundle aSavedInstanceState) {
         super.onActivityCreated(aSavedInstanceState);
 
-        bindService();
-    }
-
-    private void bindService() {
         Intent aServiceIntent = Intents.buildCommunicationServiceIntent(getActivity());
         getActivity().bindService(aServiceIntent, this, Context.BIND_AUTO_CREATE);
     }
@@ -187,15 +162,22 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
             return;
         }
 
-        if (getComputers().isEmpty()) {
-            hideComputersList();
+        List<Server> computerList = getComputers();
+        if (computerList.isEmpty()) {
+            setCurrentView(R.id.layout_progress);
+
             setUpProgressMessage();
-            tearDownComputersAdapter();
-        }
-        else {
-            setUpComputersAdapter();
-            fillComputersAdapter();
-            showComputersList();
+
+            setListAdapter(null);
+        } else {
+            if (getComputersAdapter() == null) {
+                setListAdapter(new ComputersAdapter(getActivity()));
+            }
+
+            getComputersAdapter().clear();
+            getComputersAdapter().add(computerList);
+
+            setCurrentView(android.R.id.list);
         }
     }
 
@@ -224,10 +206,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         }
     }
 
-    private void hideComputersList() {
-        setCurrentView(R.id.layout_progress);
-    }
-
     private void setCurrentView(int aViewId) {
         ViewAnimator aViewAnimator = (ViewAnimator) getView().findViewById(R.id.view_animator);
         View aView = getView().findViewById(aViewId);
@@ -261,35 +239,10 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         return getProgressMessageView().getVisibility() == View.INVISIBLE;
     }
 
-    private void tearDownComputersAdapter() {
-        setListAdapter(null);
-    }
-
-    private void setUpComputersAdapter() {
-        if (isComputersAdapterExist()) {
-            return;
-        }
-
-        setListAdapter(new ComputersAdapter(getActivity()));
-    }
-
-    private boolean isComputersAdapterExist() {
-        return getComputersAdapter() != null;
-    }
-
     private ComputersAdapter getComputersAdapter() {
         return (ComputersAdapter) getListAdapter();
     }
 
-    private void fillComputersAdapter() {
-        getComputersAdapter().clear();
-        getComputersAdapter().add(getComputers());
-    }
-
-    private void showComputersList() {
-        setCurrentView(android.R.id.list);
-    }
-
     @Override
     public void onServiceDisconnected(ComponentName aComponentName) {
         mCommunicationService = null;
@@ -302,7 +255,7 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         registerIntentsReceiver();
         setUpContextMenu();
 
-        if (!isServiceBound()) {
+        if (mCommunicationService == null) {
             return;
         }
 
@@ -312,7 +265,8 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
 
     private void registerIntentsReceiver() {
         mIntentsReceiver = new IntentsReceiver(this);
-        IntentFilter aIntentFilter = buildIntentsReceiverFilter();
+        IntentFilter aIntentFilter = new IntentFilter();
+        aIntentFilter.addAction(Intents.Actions.SERVERS_LIST_CHANGED);
 
         getBroadcastManager().registerReceiver(mIntentsReceiver, aIntentFilter);
     }
@@ -332,13 +286,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         }
     }
 
-    private IntentFilter buildIntentsReceiverFilter() {
-        IntentFilter aIntentFilter = new IntentFilter();
-        aIntentFilter.addAction(Intents.Actions.SERVERS_LIST_CHANGED);
-
-        return aIntentFilter;
-    }
-
     private LocalBroadcastManager getBroadcastManager() {
         Context aContext = getActivity().getApplicationContext();
 
@@ -390,10 +337,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
         LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(aIntent);
     }
 
-    private boolean isServiceBound() {
-        return mCommunicationService != null;
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
         switch (aMenuItem.getItemId()) {
@@ -451,20 +394,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onStop() {
         super.onStop();
 
-        stopComputersSearch();
-
-        unregisterIntentsReceiver();
-    }
-
-    private void stopComputersSearch() {
-        if (!isServiceBound()) {
-            return;
-        }
-
-        mCommunicationService.stopServersSearch();
-    }
-
-    private void unregisterIntentsReceiver() {
         try {
             getBroadcastManager().unregisterReceiver(mIntentsReceiver);
         } catch (IllegalArgumentException e) {
@@ -477,10 +406,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onSaveInstanceState(Bundle aOutState) {
         super.onSaveInstanceState(aOutState);
 
-        saveProgressMessage(aOutState);
-    }
-
-    private void saveProgressMessage(Bundle aOutState) {
         boolean aProgressMessageDisplayed = !TextUtils.isEmpty(getProgressMessageView().getText().toString());
 
         aOutState.putBoolean(SavedStates.Keys.PROGRESS_MESSAGE, aProgressMessageDisplayed);
@@ -490,10 +415,6 @@ public class ComputersFragment extends ListFragment implements ServiceConnection
     public void onDestroy() {
         super.onDestroy();
 
-        unbindService();
-    }
-
-    private void unbindService() {
         getActivity().unbindService(this);
     }
 }