gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

spotbugs: remove unused code, replace multiple strings with constants

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-04-07 17:10:56 +02:00
parent a0e1c11ca2
commit 6bbc7dd84a
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -107,6 +107,8 @@ import retrofit2.Retrofit;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class NotificationWorker extends Worker { public class NotificationWorker extends Worker {
public static final String TAG = "NotificationWorker"; public static final String TAG = "NotificationWorker";
private static final String CHAT = "chat";
private static final String ROOM = "room";
@Inject @Inject
AppPreferences appPreferences; AppPreferences appPreferences;
@ -274,7 +276,7 @@ public class NotificationWorker extends Worker {
smallIcon = R.drawable.ic_logo; smallIcon = R.drawable.ic_logo;
if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) { if (CHAT.equals(decryptedPushMessage.getType()) || ROOM.equals(decryptedPushMessage.getType())) {
category = Notification.CATEGORY_MESSAGE; category = Notification.CATEGORY_MESSAGE;
} else { } else {
category = Notification.CATEGORY_CALL; category = Notification.CATEGORY_CALL;
@ -289,7 +291,7 @@ public class NotificationWorker extends Worker {
break; break;
default: default:
// assuming one2one // assuming one2one
if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) { if (CHAT.equals(decryptedPushMessage.getType()) || ROOM.equals(decryptedPushMessage.getType())) {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_comment); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_comment);
} else { } else {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp);
@ -339,7 +341,7 @@ public class NotificationWorker extends Worker {
Long.toString(crc32.getValue()), Long.toString(crc32.getValue()),
groupName);*/ groupName);*/
if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) { if (CHAT.equals(decryptedPushMessage.getType()) || ROOM.equals(decryptedPushMessage.getType())) {
AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType
(AudioAttributes.CONTENT_TYPE_SONIFICATION); (AudioAttributes.CONTENT_TYPE_SONIFICATION);
audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT); audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT);
@ -517,7 +519,7 @@ public class NotificationWorker extends Worker {
AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType
(AudioAttributes.CONTENT_TYPE_SONIFICATION); (AudioAttributes.CONTENT_TYPE_SONIFICATION);
if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) { if (CHAT.equals(decryptedPushMessage.getType()) || ROOM.equals(decryptedPushMessage.getType())) {
audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT); audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT);
} else { } else {
audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST); audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST);

20
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View File

@ -318,7 +318,6 @@ public class DisplayUtils {
return chip; return chip;
} }
public static Spannable searchAndReplaceWithMentionSpan(Context context, Spannable text, public static Spannable searchAndReplaceWithMentionSpan(Context context, Spannable text,
String id, String label, String type, String id, String label, String type,
UserEntity conversationUser, UserEntity conversationUser,
@ -355,7 +354,6 @@ public class DisplayUtils {
} }
return spannableString; return spannableString;
} }
public static Spannable searchAndColor(Spannable text, String searchText, @ColorInt int color) { public static Spannable searchAndColor(Spannable text, String searchText, @ColorInt int color) {
@ -469,26 +467,8 @@ public class DisplayUtils {
*/ */
public static void themeSearchView(SearchView searchView, Context context) { public static void themeSearchView(SearchView searchView, Context context) {
// hacky as no default way is provided // hacky as no default way is provided
int fontColor = context.getResources().getColor(R.color.fontAppbar);
SearchView.SearchAutoComplete editText = searchView.findViewById(R.id.search_src_text); SearchView.SearchAutoComplete editText = searchView.findViewById(R.id.search_src_text);
editText.setTextSize(16); editText.setTextSize(16);
editText.setHintTextColor(context.getResources().getColor(R.color.fontSecondaryAppbar)); editText.setHintTextColor(context.getResources().getColor(R.color.fontSecondaryAppbar));
} }
public static boolean isDarkModeActive(Context context, AppPreferences prefs) {
if (prefs.getTheme().equals("night_yes")) {
return true;
}
int currentNightMode =
context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
switch (currentNightMode) {
case Configuration.UI_MODE_NIGHT_NO:
return false;
case Configuration.UI_MODE_NIGHT_YES:
return true;
default:
return false;
}
}
} }