diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
index b9009e616f..e11de0e58f 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
@@ -203,8 +203,8 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
             int nightModeFlag = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
 
-            if (!activity.getType().equalsIgnoreCase("file_created") &&
-                !activity.getType().equalsIgnoreCase("file_deleted")) {
+            if (!"file_created".equalsIgnoreCase(activity.getType()) &&
+                !"file_deleted".equalsIgnoreCase(activity.getType())) {
                 if (Configuration.UI_MODE_NIGHT_YES == nightModeFlag) {
                     activityViewHolder.activityIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
                 } else {
@@ -213,7 +213,6 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             }
 
 
-
             if (activity.getRichSubjectElement() != null &&
                 activity.getRichSubjectElement().getRichObjectList().size() > 0) {
                 activityViewHolder.list.setVisibility(View.VISIBLE);
diff --git a/src/main/java/third_parties/ezvcard_android/ContactOperations.java b/src/main/java/third_parties/ezvcard_android/ContactOperations.java
index 1a6d97021d..2b377ed378 100644
--- a/src/main/java/third_parties/ezvcard_android/ContactOperations.java
+++ b/src/main/java/third_parties/ezvcard_android/ContactOperations.java
@@ -422,19 +422,19 @@ public class ContactOperations {
             for (RawProperty property : properties) {
                 String name = property.getPropertyName();
 
-                if (name.equalsIgnoreCase("X-ABDATE")) {
+                if ("X-ABDATE".equalsIgnoreCase(name)) {
                     label = property.getValue(); //date
                     mime = ABDATE;
                     continue;
                 }
 
-                if (name.equalsIgnoreCase("X-ABRELATEDNAMES")) {
+                if ("X-ABRELATEDNAMES".equalsIgnoreCase(name)) {
                     label = property.getValue(); //name
                     mime = ABRELATEDNAMES;
                     continue;
                 }
 
-                if (name.equalsIgnoreCase("X-ABLABEL")) {
+                if ("X-ABLABEL".equalsIgnoreCase(name)) {
                     val = property.getValue(); // type of value ..Birthday,anniversary
                     continue;
                 }
@@ -457,7 +457,7 @@ public class ContactOperations {
                         cv = new NonEmptyContentValues(ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE);
                         cv.put(ContactsContract.CommonDataKinds.Nickname.NAME, label);
 
-                        if (!val.equals("Nickname")) {
+                        if (!"Nickname".equals(val)) {
                             type = DataMappings.getNameType(val);
                             cv.put(ContactsContract.CommonDataKinds.Relation.TYPE, type);
                         }