|
@@ -410,7 +410,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
int ESSID_INDEX = 2;
|
|
int ESSID_INDEX = 2;
|
|
ArrayList<String> ssids = new ArrayList<String>();
|
|
ArrayList<String> ssids = new ArrayList<String>();
|
|
this.sectionToOpen = SSID;
|
|
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:
|
|
case 1:
|
|
return rec.getProtocol();
|
|
return rec.getProtocol();
|
|
case 2:
|
|
case 2:
|
|
- return rec.getBssid();
|
|
|
|
- case 3:
|
|
|
|
return rec.getSsid();
|
|
return rec.getSsid();
|
|
|
|
+ case 3:
|
|
|
|
+ return rec.getBssid();
|
|
case 0:
|
|
case 0:
|
|
return this.getFormattedDate(rec.getTimestamp());
|
|
return this.getFormattedDate(rec.getTimestamp());
|
|
default:
|
|
default:
|
|
@@ -818,9 +818,9 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
case 1:
|
|
case 1:
|
|
return this.protocolTitles();
|
|
return this.protocolTitles();
|
|
case 2:
|
|
case 2:
|
|
- return this.bssids();
|
|
|
|
- case 3:
|
|
|
|
return this.essids();
|
|
return this.essids();
|
|
|
|
+ case 3:
|
|
|
|
+ return this.bssids();
|
|
case 0:
|
|
case 0:
|
|
default:
|
|
default:
|
|
RecordListAdapter adapter = (RecordListAdapter) this.expListView.getExpandableListAdapter();
|
|
RecordListAdapter adapter = (RecordListAdapter) this.expListView.getExpandableListAdapter();
|
|
@@ -911,25 +911,14 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
this.filter.clear();
|
|
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.
|
|
/**Returns all grouping titles.
|
|
* @return ArrayList<String> tiles*/
|
|
* @return ArrayList<String> tiles*/
|
|
public ArrayList<String> groupingTitles(){
|
|
public ArrayList<String> groupingTitles(){
|
|
ArrayList<String> titles = new ArrayList<String>();
|
|
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;
|
|
return titles;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -982,8 +971,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
ArrayList<String> titles = new ArrayList<String>();
|
|
ArrayList<String> titles = new ArrayList<String>();
|
|
titles.add(MainActivity.getContext().getString(R.string.rec_time));
|
|
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.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;
|
|
return titles;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
@@ -1134,7 +1123,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
|
|
if(title.equals(FILTER_MENU_TITLE_SORTING)){
|
|
if(title.equals(FILTER_MENU_TITLE_SORTING)){
|
|
ArrayList<String> titles = dialog.getSelectedItemTitles();
|
|
ArrayList<String> titles = dialog.getSelectedItemTitles();
|
|
if (titles.size() == 0) return;
|
|
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);
|
|
int sortType = this.sortTypeTiles().indexOf(t);
|
|
this.filter.setSorttype(SortType.values()[sortType]);
|
|
this.filter.setSorttype(SortType.values()[sortType]);
|
|
}
|
|
}
|