From 9dd0025660213756d6476bdad00ee109788ae7e3 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 18 Sep 2017 17:50:39 +0200
Subject: [PATCH] #96 - fixed: filter active icon not showing if filtered by
tags
---
.../budgetmaster/logic/FilterSettings.java | 53 ++++++++++---------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java b/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
index c016f5a2c..82818e4c9 100644
--- a/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
+++ b/src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
@@ -164,7 +164,7 @@ public class FilterSettings
}
else
{
- return true;
+ return isEqualTagIDs(otherSettings);
}
}
else
@@ -177,38 +177,43 @@ public class FilterSettings
{
if(allowedCategoryIDs.equals(otherSettings.getAllowedCategoryIDs()))
{
- return true;
+ return isEqualTagIDs(otherSettings);
}
}
- }
+ }
+ }
- if(allowedTagIDs == null)
+ return false;
+ }
+
+ private boolean isEqualTagIDs(FilterSettings otherSettings)
+ {
+ if(allowedTagIDs == null)
+ {
+ if(otherSettings.getAllowedTagIDs() != null)
{
- if(otherSettings.getAllowedTagIDs() != null)
- {
- return false;
- }
- else
- {
- return true;
- }
+ return false;
}
- else
+ else
+ {
+ return true;
+ }
+ }
+ else
+ {
+ if(otherSettings.getAllowedTagIDs() == null)
{
- if(otherSettings.getAllowedTagIDs() == null)
+ return false;
+ }
+ else
+ {
+ if(allowedTagIDs.equals(otherSettings.getAllowedTagIDs()))
{
- return false;
- }
- else
- {
- if(allowedTagIDs.equals(otherSettings.getAllowedTagIDs()))
- {
- return true;
- }
+ return true;
}
}
- }
-
+ }
+
return false;
}
}
\ No newline at end of file
--
GitLab