Merge branch 'develop' into release-0.9.3

1 files changed, 17 insertions, 19 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java
index 49af9274..8ba7fa34 100644
--- a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java
+++ b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2013 LEAP Encryption Access Project and contributers
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -16,33 +16,31 @@
  */
 package se.leap.bitmaskclient;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
+import android.app.*;
 
 public class FragmentManagerEnhanced {
 
     private FragmentManager generic_fragment_manager;
-    
+
     public FragmentManagerEnhanced(FragmentManager generic_fragment_manager) {
-	this.generic_fragment_manager = generic_fragment_manager;
+        this.generic_fragment_manager = generic_fragment_manager;
     }
-    
+
     public FragmentTransaction removePreviousFragment(String tag) {
-	FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
-	Fragment previous_fragment = generic_fragment_manager.findFragmentByTag(tag);
-	if (previous_fragment != null) {
-	    transaction.remove(previous_fragment);
-	}
-	transaction.addToBackStack(null);
-
-	return transaction;
+        FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
+        Fragment previous_fragment = generic_fragment_manager.findFragmentByTag(tag);
+        if (previous_fragment != null) {
+            transaction.remove(previous_fragment);
+        }
+        transaction.addToBackStack(null);
+
+        return transaction;
     }
 
     public void replace(int containerViewId, Fragment fragment, String tag) {
-	FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
-	
-	transaction.replace(containerViewId, fragment, tag).commit();
+        FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
+
+        transaction.replace(containerViewId, fragment, tag).commit();
     }
 
     public FragmentTransaction beginTransaction() {
@@ -50,6 +48,6 @@ public class FragmentManagerEnhanced {
     }
 
     public Fragment findFragmentByTag(String tag) {
-	return generic_fragment_manager.findFragmentByTag(tag);
+        return generic_fragment_manager.findFragmentByTag(tag);
     }
 }