empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Address a bunch of compiler warnings.

Browse source 
None of these should change any behavior, they're all annotations and stuff.
This commit is contained in:
Nicholas Tinsley 2023-05-26 10:17:10 -04:00 • committed by Cody Henthorne
parent de4c6ab7b7
commit a9a91e3162
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
View file

@ -140,7 +140,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
viewModel.onAvatarEditCompleted(vector)
}
setFragmentResultListener(PhotoEditorFragment.REQUEST_KEY_EDIT) { _, bundle ->
setFragmentResultListener(PhotoEditorFragment.REQUEST_KEY_EDIT) { _, _ ->
}
photoEditorLauncher = registerForActivityResult(PhotoEditorActivity.Contract()) { photo ->
@ -155,6 +155,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
ViewUtil.hideKeyboard(requireContext(), requireView())
}
@Deprecated("Deprecated in Java")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_CODE_SELECT_IMAGE && resultCode == Activity.RESULT_OK && data != null) {
val media: Media = requireNotNull(data.getParcelableExtraCompat(AvatarSelectionActivity.EXTRA_MEDIA, Media::class.java))
@ -194,7 +195,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
return true
}
fun openEditor(avatar: Avatar) {
private fun openEditor(avatar: Avatar) {
when (avatar) {
is Avatar.Photo -> openPhotoEditor(avatar)
is Avatar.Resource -> throw UnsupportedOperationException()
@ -250,6 +251,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
.execute()
}
@Deprecated("Deprecated in Java")
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
}

22
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
View file

@ -63,7 +63,7 @@ internal object ConversationOptionsMenu {
}
if (isPushAvailable) {
if (recipient!!.expiresInSeconds > 0) {
if (recipient.expiresInSeconds > 0) {
if (!isInActiveGroup) {
menuInflater.inflate(R.menu.conversation_expiring_on, menu)
}
@ -76,13 +76,13 @@ internal object ConversationOptionsMenu {
}
}
if (recipient?.isGroup == false) {
if (!recipient.isGroup) {
if (isPushAvailable) {
menuInflater.inflate(R.menu.conversation_callable_secure, menu)
} else if (!recipient.isReleaseNotes && SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
menuInflater.inflate(R.menu.conversation_callable_insecure, menu)
}
} else if (recipient?.isGroup == true) {
} else if (recipient.isGroup) {
if (isActiveV2Group) {
menuInflater.inflate(R.menu.conversation_callable_groupv2, menu)
if (hasActiveGroupCall) {
@ -104,21 +104,21 @@ internal object ConversationOptionsMenu {
menuInflater.inflate(R.menu.conversation, menu)
if (isInMessageRequest && !recipient!!.isBlocked) {
if (isInMessageRequest && !recipient.isBlocked) {
hideMenuItem(menu, R.id.menu_conversation_settings)
}
if (recipient?.isGroup == false && !isPushAvailable && !recipient.isReleaseNotes) {
if (!recipient.isGroup && !isPushAvailable && !recipient.isReleaseNotes) {
menuInflater.inflate(R.menu.conversation_insecure, menu)
}
if (recipient?.isMuted == true) menuInflater.inflate(R.menu.conversation_muted, menu) else menuInflater.inflate(R.menu.conversation_unmuted, menu)
if (recipient.isMuted) menuInflater.inflate(R.menu.conversation_muted, menu) else menuInflater.inflate(R.menu.conversation_unmuted, menu)
if (recipient?.isGroup == false && recipient.contactUri == null && !recipient.isReleaseNotes && !recipient.isSelf && recipient.hasE164()) {
if (!recipient.isGroup && (recipient.contactUri == null) && !recipient.isReleaseNotes && !recipient.isSelf && recipient.hasE164()) {
menuInflater.inflate(R.menu.conversation_add_to_contacts, menu)
}
if (recipient != null && recipient.isSelf) {
if (recipient.isSelf) {
if (isPushAvailable) {
hideMenuItem(menu, R.id.menu_call_secure)
hideMenuItem(menu, R.id.menu_video_secure)
@ -128,7 +128,7 @@ internal object ConversationOptionsMenu {
hideMenuItem(menu, R.id.menu_mute_notifications)
}
if (recipient?.isBlocked == true) {
if (recipient.isBlocked) {
if (isPushAvailable) {
hideMenuItem(menu, R.id.menu_call_secure)
hideMenuItem(menu, R.id.menu_video_secure)
@ -140,7 +140,7 @@ internal object ConversationOptionsMenu {
hideMenuItem(menu, R.id.menu_mute_notifications)
}
if (recipient?.isReleaseNotes == true) {
if (recipient.isReleaseNotes) {
hideMenuItem(menu, R.id.menu_add_shortcut)
}
@ -149,7 +149,7 @@ internal object ConversationOptionsMenu {
if (isActiveV2Group) {
hideMenuItem(menu, R.id.menu_mute_notifications)
hideMenuItem(menu, R.id.menu_conversation_settings)
} else if (recipient?.isGroup == true) {
} else if (recipient.isGroup) {
hideMenuItem(menu, R.id.menu_conversation_settings)
}

2
app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
View file

@ -68,6 +68,7 @@ public class BitmapUtil {
* @deprecated You probably want to use {@link ImageCompressionUtil} instead, which has a clearer
* contract and handles mimetypes properly.
*/
@Deprecated
@WorkerThread
public static <T> ScaleResult createScaledBytes(@NonNull Context context,
@NonNull T model,
@ -83,6 +84,7 @@ public class BitmapUtil {
* @deprecated You probably want to use {@link ImageCompressionUtil} instead, which has a clearer
* contract and handles mimetypes properly.
*/
@Deprecated
@WorkerThread
public static <T> ScaleResult createScaledBytes(Context context,
T model,

1
app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java
View file

@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*
* @deprecated Use a PublishSubject or PublishProcessor instead.
*/
@Deprecated
public class SingleLiveEvent<T> extends MutableLiveData<T> {
private static final String TAG = Log.tag(SingleLiveEvent.class);

4
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View file

@ -507,6 +507,7 @@ public class TextSecurePreferences {
/**
* @deprecated Use {@link SettingsValues#getMessageFontSize()} via {@link org.thoughtcrime.securesms.keyvalue.SignalStore} instead.
*/
@Deprecated
public static int getMessageBodyTextSize(Context context) {
return Integer.parseInt(getStringPreference(context, MESSAGE_BODY_TEXT_SIZE_PREF, "16"));
}
@ -783,6 +784,7 @@ public class TextSecurePreferences {
/**
* @deprecated Use {@link SettingsValues#getTheme()} via {@link org.thoughtcrime.securesms.keyvalue.SignalStore} instead.
*/
@Deprecated
public static String getTheme(Context context) {
return getStringPreference(context, THEME_PREF, DynamicTheme.systemThemeAvailable() ? "system" : "light");
}
@ -806,6 +808,7 @@ public class TextSecurePreferences {
/**
* @deprecated Use {@link SettingsValues#getLanguage()} via {@link org.thoughtcrime.securesms.keyvalue.SignalStore} instead.
*/
@Deprecated
public static String getLanguage(Context context) {
return getStringPreference(context, LANGUAGE_PREF, "zz");
}
@ -813,6 +816,7 @@ public class TextSecurePreferences {
/**
* @deprecated Use {@link SettingsValues#setLanguage(String)} via {@link org.thoughtcrime.securesms.keyvalue.SignalStore} instead.
*/
@Deprecated
public static void setLanguage(Context context, String language) {
setStringPreference(context, LANGUAGE_PREF, language);
}