|
@@ -1317,6 +1317,7 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
|
|
if (index < this.currentData.size()){
|
|
if (index < this.currentData.size()){
|
|
PlotComparisonItem item = this.currentData.get(index);
|
|
PlotComparisonItem item = this.currentData.get(index);
|
|
ArrayList<String> selectedData;
|
|
ArrayList<String> selectedData;
|
|
|
|
+ String sortKey = null;
|
|
selectedData = new ArrayList<String>();
|
|
selectedData = new ArrayList<String>();
|
|
|
|
|
|
if (item.getOtherData() == null){
|
|
if (item.getOtherData() == null){
|
|
@@ -1334,8 +1335,10 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
|
|
|
|
|
|
if (this.selectedCompareData.equals(COMPARE_TITLE_AttacksPerESSID)){
|
|
if (this.selectedCompareData.equals(COMPARE_TITLE_AttacksPerESSID)){
|
|
filter.setESSIDs(selectedData);
|
|
filter.setESSIDs(selectedData);
|
|
|
|
+ sortKey = "ESSID";
|
|
} else {
|
|
} else {
|
|
filter.setBSSIDs(selectedData);
|
|
filter.setBSSIDs(selectedData);
|
|
|
|
+ sortKey = "BSSID";
|
|
}
|
|
}
|
|
ArrayList<String> currentSelectedProtocol = new ArrayList<String>();
|
|
ArrayList<String> currentSelectedProtocol = new ArrayList<String>();
|
|
currentSelectedProtocol.add(this.getCurrentSelectedProtocol());
|
|
currentSelectedProtocol.add(this.getCurrentSelectedProtocol());
|
|
@@ -1346,6 +1349,7 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
|
|
selectedData.add(item.getTitle());
|
|
selectedData.add(item.getTitle());
|
|
filter.setESSIDs(selectedData);
|
|
filter.setESSIDs(selectedData);
|
|
filter.setProtocols(this.filter.getProtocols());
|
|
filter.setProtocols(this.filter.getProtocols());
|
|
|
|
+ sortKey = "ESSID";
|
|
}
|
|
}
|
|
|
|
|
|
if (this.filter.hasATimestamp()){
|
|
if (this.filter.hasATimestamp()){
|
|
@@ -1353,7 +1357,7 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
|
|
filter.setBelowTimestamp(this.filter.getBelowTimestamp());
|
|
filter.setBelowTimestamp(this.filter.getBelowTimestamp());
|
|
}
|
|
}
|
|
|
|
|
|
- this.pushRecordOverviewForFilter(filter);
|
|
|
|
|
|
+ this.pushRecordOverviewForFilter(filter, sortKey);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1364,13 +1368,16 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
|
|
this.userTappedOnLegendItem(index);
|
|
this.userTappedOnLegendItem(index);
|
|
}
|
|
}
|
|
|
|
|
|
- private void pushRecordOverviewForFilter(LogFilter filter){
|
|
|
|
|
|
+ private void pushRecordOverviewForFilter(LogFilter filter, String sortKey){
|
|
|
|
|
|
FragmentManager fm = this.getActivity().getFragmentManager();
|
|
FragmentManager fm = this.getActivity().getFragmentManager();
|
|
|
|
|
|
if (fm != null){
|
|
if (fm != null){
|
|
RecordOverviewFragment newFragment = new RecordOverviewFragment();
|
|
RecordOverviewFragment newFragment = new RecordOverviewFragment();
|
|
newFragment.setFilter(filter);
|
|
newFragment.setFilter(filter);
|
|
|
|
+
|
|
|
|
+ if (sortKey != null && sortKey.length() != 0) newFragment.setGroupKey(sortKey);
|
|
|
|
+
|
|
FragmentTransaction transaction = fm.beginTransaction();
|
|
FragmentTransaction transaction = fm.beginTransaction();
|
|
transaction.replace(R.id.content_frame, newFragment, newFragment.getTag());
|
|
transaction.replace(R.id.content_frame, newFragment, newFragment.getTag());
|
|
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|