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

Rename CapabilitiesNgNew to CapabilitiesUtilNew and mark old one as deprecated

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-24 10:11:43 +02:00
parent 9b55241881
commit 9f43eb5278
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
View File

@ -87,7 +87,7 @@ import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri
import com.nextcloud.talk.utils.NotificationUtils.getMessageRingtoneUri import com.nextcloud.talk.utils.NotificationUtils.getMessageRingtoneUri
import com.nextcloud.talk.utils.SecurityUtils import com.nextcloud.talk.utils.SecurityUtils
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ARE_CALL_SOUNDS import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ARE_CALL_SOUNDS
import com.nextcloud.talk.utils.database.user.CapabilitiesNgUtil import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.database.user.UserUtils
import com.nextcloud.talk.utils.preferences.MagicUserInputModule import com.nextcloud.talk.utils.preferences.MagicUserInputModule
@ -190,7 +190,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
} }
private fun setupPhoneBookIntegration() { private fun setupPhoneBookIntegration() {
if (CapabilitiesNgUtil.isPhoneBookIntegrationAvailable(currentUser)) { if (CapabilitiesUtilNew.isPhoneBookIntegrationAvailable(currentUser)) {
activity!!.runOnUiThread { activity!!.runOnUiThread {
binding.settingsPhoneBookIntegration.visibility = View.VISIBLE binding.settingsPhoneBookIntegration.visibility = View.VISIBLE
} }
@ -648,7 +648,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
private fun setupServerAgeWarning() { private fun setupServerAgeWarning() {
when { when {
CapabilitiesNgUtil.isServerEOL(currentUser) -> { CapabilitiesUtilNew.isServerEOL(currentUser) -> {
binding.serverAgeWarningText.setTextColor(ContextCompat.getColor((context)!!, R.color.nc_darkRed)) binding.serverAgeWarningText.setTextColor(ContextCompat.getColor((context)!!, R.color.nc_darkRed))
binding.serverAgeWarningText.setText(R.string.nc_settings_server_eol) binding.serverAgeWarningText.setText(R.string.nc_settings_server_eol)
binding.serverAgeWarningIcon.setColorFilter( binding.serverAgeWarningIcon.setColorFilter(
@ -656,7 +656,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
PorterDuff.Mode.SRC_IN PorterDuff.Mode.SRC_IN
) )
} }
CapabilitiesNgUtil.isServerAlmostEOL(currentUser) -> { CapabilitiesUtilNew.isServerAlmostEOL(currentUser) -> {
binding.serverAgeWarningText.setTextColor( binding.serverAgeWarningText.setTextColor(
ContextCompat.getColor((context)!!, R.color.nc_darkYellow) ContextCompat.getColor((context)!!, R.color.nc_darkYellow)
) )
@ -688,7 +688,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
if (CapabilitiesUtil.isReadStatusAvailable(userUtils.currentUser)) { if (CapabilitiesUtil.isReadStatusAvailable(userUtils.currentUser)) {
(binding.settingsReadPrivacy.findViewById<View>(R.id.mp_checkable) as Checkable).isChecked = (binding.settingsReadPrivacy.findViewById<View>(R.id.mp_checkable) as Checkable).isChecked =
!CapabilitiesNgUtil.isReadStatusPrivate(currentUser) !CapabilitiesUtilNew.isReadStatusPrivate(currentUser)
} else { } else {
binding.settingsReadPrivacy.visibility = View.GONE binding.settingsReadPrivacy.visibility = View.GONE
} }

7
app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
View File

@ -33,6 +33,10 @@ import java.util.Map;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
/**
* Deprecated, please use CapabilitiesNgUtil
*/
@Deprecated
public abstract class CapabilitiesUtil { public abstract class CapabilitiesUtil {
private static final String TAG = CapabilitiesUtil.class.getSimpleName(); private static final String TAG = CapabilitiesUtil.class.getSimpleName();
@ -66,13 +70,11 @@ public abstract class CapabilitiesUtil {
return false; return false;
} }
@Deprecated
public static boolean isServerEOL(@Nullable UserEntity user) { public static boolean isServerEOL(@Nullable UserEntity user) {
// Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018 // Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018
return !hasSpreedFeatureCapability(user, "no-ping"); return !hasSpreedFeatureCapability(user, "no-ping");
} }
@Deprecated
public static boolean isServerAlmostEOL(@Nullable UserEntity user) { public static boolean isServerAlmostEOL(@Nullable UserEntity user) {
// Capability is available since Talk 8 => Nextcloud 18 => January 2020 // Capability is available since Talk 8 => Nextcloud 18 => January 2020
return !hasSpreedFeatureCapability(user, "chat-replies"); return !hasSpreedFeatureCapability(user, "chat-replies");
@ -82,7 +84,6 @@ public abstract class CapabilitiesUtil {
return hasSpreedFeatureCapability(user, "chat-read-marker"); return hasSpreedFeatureCapability(user, "chat-read-marker");
} }
@Deprecated
public static boolean hasSpreedFeatureCapability(@Nullable UserEntity user, String capabilityName) { public static boolean hasSpreedFeatureCapability(@Nullable UserEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) { if (user != null && user.getCapabilities() != null) {
try { try {

3
app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesNgUtil.java → app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.java
View File

@ -29,8 +29,7 @@ import java.util.Map;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
public abstract class CapabilitiesNgUtil { public abstract class CapabilitiesUtilNew {
private static final String TAG = CapabilitiesNgUtil.class.getSimpleName();
public static boolean hasNotificationsCapability(@Nullable User user, String capabilityName) { public static boolean hasNotificationsCapability(@Nullable User user, String capabilityName) {
if (user != null && user.getCapabilities() != null) { if (user != null && user.getCapabilities() != null) {