From 789141f2194a6df9e4c8bf9e6a0df95d8510b2ad Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 18 Apr 2025 16:17:24 +0200 Subject: [PATCH] remove some unused code --- .../eu/siacs/conversations/AppSettings.java | 6 ++ .../services/NotificationService.java | 6 +- .../services/XmppConnectionService.java | 10 +-- .../NotificationsSettingsFragment.java | 2 +- .../conversations/utils/Compatibility.java | 69 ++----------------- 5 files changed, 21 insertions(+), 72 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/AppSettings.java b/src/main/java/eu/siacs/conversations/AppSettings.java index ea9139bc0e75cdc1c44afe309462cfae46f48b16..40aad2758609f26e4397e3cbed172d18b5cc2026 100644 --- a/src/main/java/eu/siacs/conversations/AppSettings.java +++ b/src/main/java/eu/siacs/conversations/AppSettings.java @@ -12,6 +12,7 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.services.QuickConversationsService; +import eu.siacs.conversations.utils.Compatibility; import java.security.SecureRandom; public class AppSettings { @@ -145,6 +146,11 @@ public class AppSettings { ACCEPT_INVITES_FROM_STRANGERS, R.bool.accept_invites_from_strangers); } + public boolean isKeepForegroundService() { + return Compatibility.twentySix() + || getBooleanPreference(KEEP_FOREGROUND_SERVICE, R.bool.enable_foreground_service); + } + private boolean getBooleanPreference(@NonNull final String name, @BoolRes int res) { final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index cd2045774e28a29685af493b956b3aed0211307e..277db9037d6bbf4e1fff4241247a957aad08fed8 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -1820,7 +1820,7 @@ public class NotificationService { .setSmallIcon(connected > 0 ? R.drawable.ic_link_24dp : R.drawable.ic_link_off_24dp) .setLocalOnly(true); - if (Compatibility.runsTwentySix()) { + if (Compatibility.twentySix()) { mBuilder.setChannelId("foreground"); mBuilder.addAction( R.drawable.ic_logout_24dp, @@ -1970,7 +1970,7 @@ public class NotificationService { s() ? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT : PendingIntent.FLAG_UPDATE_CURRENT)); - if (Compatibility.runsTwentySix()) { + if (Compatibility.twentySix()) { mBuilder.setChannelId("error"); } notify(ERROR_NOTIFICATION_ID, mBuilder.build()); @@ -1995,7 +1995,7 @@ public class NotificationService { builder.setContentIntent(createContentIntent(message.getConversation())); } builder.setOngoing(true); - if (Compatibility.runsTwentySix()) { + if (Compatibility.twentySix()) { builder.setChannelId("compression"); } return builder.build(); diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index f6cf075273ea55e1365df5b12c2d88a4f90631ab..7c627f755d3f0a150b29714aaa1f54b35433b49d 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1401,11 +1401,11 @@ public class XmppConnectionService extends Service { @Override public void onCreate() { LibIdnXmppStringprep.setup(); - if (Compatibility.runsTwentySix()) { + if (Compatibility.twentySix()) { mNotificationService.initializeChannels(); } mChannelDiscoveryService.initializeMuclumbusService(); - mForceDuringOnCreate.set(Compatibility.runsAndTargetsTwentySix(this)); + mForceDuringOnCreate.set(Compatibility.twentySix()); toggleForegroundService(); this.destroyed = false; OmemoSetting.load(this); @@ -1657,7 +1657,7 @@ public class XmppConnectionService extends Service { || mForceDuringOnCreate.get() || ongoingVideoTranscoding || ongoing != null - || (Compatibility.keepForegroundService(this) && hasEnabledAccounts())) { + || (appSettings.isKeepForegroundService() && hasEnabledAccounts())) { final Notification notification; if (ongoing != null) { notification = this.mNotificationService.getOngoingCallNotification(ongoing); @@ -1729,14 +1729,14 @@ public class XmppConnectionService extends Service { public boolean foregroundNotificationNeedsUpdatingWhenErrorStateChanges() { return !mOngoingVideoTranscoding.get() && ongoingCall.get() == null - && Compatibility.keepForegroundService(this) + && appSettings.isKeepForegroundService() && hasEnabledAccounts(); } @Override public void onTaskRemoved(final Intent rootIntent) { super.onTaskRemoved(rootIntent); - if ((Compatibility.keepForegroundService(this) && hasEnabledAccounts()) + if ((appSettings.isKeepForegroundService() && hasEnabledAccounts()) || mOngoingVideoTranscoding.get() || ongoingCall.get() != null) { Log.d(Config.LOGTAG, "ignoring onTaskRemoved because foreground service is activated"); diff --git a/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java index 624152a7e5c91dc316989609845b985059abdb28..f9b977081524713c65c301c9faa19e87b5364809 100644 --- a/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java @@ -75,7 +75,7 @@ public class NotificationsSettingsFragment extends XmppPreferenceFragment { || callIntegration == null) { throw new IllegalStateException("The preference resource file is missing preferences"); } - if (Compatibility.runsTwentySix()) { + if (Compatibility.twentySix()) { notificationRingtone.setVisible(false); notificationHeadsUp.setVisible(false); notificationVibrate.setVisible(false); diff --git a/src/main/java/eu/siacs/conversations/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java index 26a2331cc3143aa053859a92a77b3bd451d89bf0..36e7048e5cd2444a1e66df523b4fa65aea3fba1a 100644 --- a/src/main/java/eu/siacs/conversations/utils/Compatibility.java +++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java @@ -6,40 +6,30 @@ import android.annotation.SuppressLint; import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.os.Build; import android.os.Bundle; -import android.preference.PreferenceManager; import android.util.Log; - -import androidx.annotation.BoolRes; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; - -import eu.siacs.conversations.AppSettings; import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; public class Compatibility { public static boolean hasStoragePermission(final Context context) { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU || ContextCompat.checkSelfPermission( - context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU + || ContextCompat.checkSelfPermission( + context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) + == PackageManager.PERMISSION_GRANTED; } public static boolean s() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S; } - private static boolean runsTwentyFour() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; - } - - public static boolean runsTwentySix() { + public static boolean twentySix() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; } @@ -47,56 +37,9 @@ public class Compatibility { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P; } - private static boolean getBooleanPreference(Context context, String name, @BoolRes int res) { - return getPreferences(context).getBoolean(name, context.getResources().getBoolean(res)); - } - - private static SharedPreferences getPreferences(final Context context) { - return PreferenceManager.getDefaultSharedPreferences(context); - } - - private static boolean targetsTwentySix(Context context) { - try { - final PackageManager packageManager = context.getPackageManager(); - final ApplicationInfo applicationInfo = - packageManager.getApplicationInfo(context.getPackageName(), 0); - return applicationInfo.targetSdkVersion >= 26; - } catch (PackageManager.NameNotFoundException | RuntimeException e) { - return true; // when in doubt… - } - } - - private static boolean targetsTwentyFour(Context context) { - try { - final PackageManager packageManager = context.getPackageManager(); - final ApplicationInfo applicationInfo = - packageManager.getApplicationInfo(context.getPackageName(), 0); - return applicationInfo.targetSdkVersion >= 24; - } catch (PackageManager.NameNotFoundException | RuntimeException e) { - return true; // when in doubt… - } - } - - public static boolean runsAndTargetsTwentySix(Context context) { - return runsTwentySix() && targetsTwentySix(context); - } - - public static boolean runsAndTargetsTwentyFour(Context context) { - return runsTwentyFour() && targetsTwentyFour(context); - } - - public static boolean keepForegroundService(Context context) { - return runsAndTargetsTwentySix(context) - || getBooleanPreference( - context, - AppSettings.KEEP_FOREGROUND_SERVICE, - R.bool.enable_foreground_service); - } - - public static void startService(final Context context, final Intent intent) { try { - if (Compatibility.runsAndTargetsTwentySix(context)) { + if (Compatibility.twentySix()) { intent.putExtra(EXTRA_NEEDS_FOREGROUND_SERVICE, true); ContextCompat.startForegroundService(context, intent); } else {