fixes and code cleans in record overview

res/values-de/arrays.xml

@@ -12,11 +12,5 @@
         <item>Alle</item>
     </string-array>
 
-    <string-array name="Grouping">
-        <item>Datum</item>
-        <item>Protokol</item>
-        <item>BSSID</item>
-        <item>ESSID</item>
-    </string-array>
 
 </resources>

res/values-de/strings.xml

@@ -109,6 +109,7 @@
     <string name="discard">Verwerfen</string>
     <string name="save">Speichern</string>
     <string name="rec_protocol">Protokoll</string>
+    <string name="date">Datum</string>
     <string name="ESSID">ESSID</string>
     <string name="BSSID">BSSID</string>
     <string name="rec_sortby">Sortieren</string>

res/values/arrays.xml

@@ -12,11 +12,4 @@
         <item>All</item>
     </string-array>
 
-    <string-array name="Grouping">
-        <item>Date</item>
-        <item>Protocol</item>
-        <item>BSSID</item>
-        <item>ESSID</item>
-    </string-array>
-
 </resources>

res/values/strings.xml

@@ -110,6 +110,7 @@
     <string name="save">Save</string>
 	<string name="really_want_delete_profiel">Do you really want to delete this profile?</string>
     <string name="rec_protocol">Protocol</string>
+    <string name="date">Date</string>
     <string name="ESSID">ESSID</string>
     <string name="BSSID">BSSID</string>
     <string name="rec_sortby">Sort by</string>

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -410,7 +410,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
         int ESSID_INDEX = 2;
         ArrayList<String> ssids = new ArrayList<String>();
         this.sectionToOpen = SSID;
-        this.groupingKey = this.groupingTitles(context).get(ESSID_INDEX);
+        this.groupingKey = this.groupingTitles().get(ESSID_INDEX);
   	}
 
 
@@ -800,9 +800,9 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
             case 1:
                 return rec.getProtocol();
             case 2:
-                return rec.getBssid();
-            case 3:
                 return rec.getSsid();
+            case 3:
+                return rec.getBssid();
             case 0:
                 return this.getFormattedDate(rec.getTimestamp());
             default:
@@ -818,9 +818,9 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
             case 1:
                 return this.protocolTitles();
             case 2:
-                return this.bssids();
-            case 3:
                 return this.essids();
+            case 3:
+                return this.bssids();
             case 0:
             default:
                 RecordListAdapter adapter = (RecordListAdapter) this.expListView.getExpandableListAdapter();
@@ -911,25 +911,14 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
     	this.filter.clear();
 	}
 
-    /**Returns all grouping titles
-    * @param  context Context
-    * @return ArrayList<String> titles*/
-    public ArrayList<String> groupingTitles(Context context){
-        ArrayList<String> titles = new ArrayList<String>();
-        for (String groupTitle : context.getResources().getStringArray(
-                R.array.Grouping)) {
-            titles.add(groupTitle);
-        }
-        return titles;
-    }
     /**Returns all grouping titles.
     * @return ArrayList<String> tiles*/
     public ArrayList<String> groupingTitles(){
         ArrayList<String> titles = new ArrayList<String>();
-        for (String groupTitle : this.getResources().getStringArray(
-                R.array.Grouping)) {
-            titles.add(groupTitle);
-        }
+        titles.add(MainActivity.getContext().getString(R.string.date));
+        titles.add(MainActivity.getContext().getString(R.string.rec_protocol));
+        titles.add(MainActivity.getContext().getString(R.string.ESSID));
+        titles.add(MainActivity.getContext().getString(R.string.BSSID));
         return titles;
     }
     /**
@@ -982,8 +971,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 		ArrayList<String> titles = new ArrayList<String>();
 		titles.add(MainActivity.getContext().getString(R.string.rec_time));
 		titles.add(MainActivity.getContext().getString(R.string.rec_protocol));
-		titles.add(MainActivity.getContext().getString(R.string.BSSID));
-		titles.add(MainActivity.getContext().getString(R.string.ESSID));
+        titles.add(MainActivity.getContext().getString(R.string.ESSID));
+        titles.add(MainActivity.getContext().getString(R.string.BSSID));
 		return titles;
 	}
     /**
@@ -1134,7 +1123,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 		if(title.equals(FILTER_MENU_TITLE_SORTING)){
 			ArrayList<String> titles = dialog.getSelectedItemTitles();
             if (titles.size() == 0) return;
-			String t = titles.get(DEFAULT_GROUPING_KEY_INDEX);
+            // ALWAYS GET THE FIRST ELEMENT (SHOULD BE ALWAYS ONE)
+            String t = titles.get(0);
 			int sortType = this.sortTypeTiles().indexOf(t);
 			this.filter.setSorttype(SortType.values()[sortType]);
 		}