|
@@ -126,11 +126,34 @@ public class ServicesListAdapter extends ArrayAdapter<ServicesListItem> {
|
|
|
private void updateStatus(ServicesListItem item, ViewHolder holder){
|
|
|
if(MainActivity.getInstance().getHoneyService().isRunning(item.protocol)){
|
|
|
holder.activated.setChecked(true);
|
|
|
- if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
- holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_green));
|
|
|
+ if(!MainActivity.getInstance().hasProtocolAttacks(item.protocol)){
|
|
|
+ if(Integer.valueOf(item.attacks) > 0) {
|
|
|
+ if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
+ holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_yellow));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_yellow));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
+ holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_green));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_green));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
else {
|
|
|
- holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_green));
|
|
|
+ if(MainActivity.getInstance().hasProtocolAttacks(item.protocol)){
|
|
|
+ if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
+ holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_red));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_red));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
@@ -139,24 +162,8 @@ public class ServicesListAdapter extends ArrayAdapter<ServicesListItem> {
|
|
|
holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle));
|
|
|
}
|
|
|
else {
|
|
|
- holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle));
|
|
|
- }
|
|
|
- }
|
|
|
- if((Integer.valueOf(item.attacks) > 0) && (Integer.valueOf(item.attacks) == item.initialValue) && MainActivity.getInstance().getHoneyService().isRunning(item.protocol)) {
|
|
|
- if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
- holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_yellow));
|
|
|
- }
|
|
|
- else {
|
|
|
- holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_yellow));
|
|
|
- }
|
|
|
- }
|
|
|
- else if( (item.initialValue < Integer.valueOf(item.attacks)) && MainActivity.getInstance().getHoneyService().isRunning(item.protocol)) {
|
|
|
- System.out.println(item.initialValue);
|
|
|
- if(sdk < Build.VERSION_CODES.JELLY_BEAN){
|
|
|
- holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_red));
|
|
|
- }
|
|
|
- else {
|
|
|
- holder.circle.setBackground(MainActivity.getInstance().getResources().getDrawable(R.drawable.services_circle_red));
|
|
|
+ holder.circle.setBackground(MainActivity.getInstance().getResources()
|
|
|
+ .getDrawable(R.drawable.services_circle));
|
|
|
}
|
|
|
}
|
|
|
holder.recordedAttacks.setText(item.attacks);
|