mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 18:59:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6343 from nextcloud/lsc

Browse source 
fix LSC_LITERAL_STRING_COMPARISON
This commit is contained in:
Andy Scherzinger 2020-06-24 06:56:54 +02:00 committed by GitHub
commit 7ced94d42e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/analysis/findbugs-results.txt
View file

@ -1 +1 @@
367
361

5
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
View file

@ -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);

8
src/main/java/third_parties/ezvcard_android/ContactOperations.java
View file

@ -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);
}