Merge pull request #4470 from nextcloud/bump_minSdkVersion

bump minSdkVersion to 26 and remove old checks
nextcloud · Nov 21, 2024 · 3f5937d · 3f5937d
2 parents c9d84c2 + be99e1a
commit 3f5937d
Show file tree

Hide file tree

Showing 25 changed files with 120 additions and 306 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,7 +34,7 @@ android {
     namespace 'com.nextcloud.talk'
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/androidTest/java/com/nextcloud/talk/utils/VibrationUtilsTest.kt b/app/src/androidTest/java/com/nextcloud/talk/utils/VibrationUtilsTest.kt
@@ -7,7 +7,6 @@
 package com.nextcloud.talk.utils
 
 import android.content.Context
-import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
 import org.junit.Before
@@ -34,18 +33,13 @@ class VibrationUtilsTest {
     @Test
     fun testVibrateShort() {
         VibrationUtils.vibrateShort(mockContext)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            Mockito.verify(mockVibrator)
-                .vibrate(
-                    VibrationEffect
-                        .createOneShot(
-                            VibrationUtils.SHORT_VIBRATE,
-                            VibrationEffect.DEFAULT_AMPLITUDE
-                        )
-                )
-        } else {
-            Mockito.verify(mockVibrator).vibrate(VibrationUtils.SHORT_VIBRATE)
-        }
+        Mockito.verify(mockVibrator)
+            .vibrate(
+                VibrationEffect
+                    .createOneShot(
+                        VibrationUtils.SHORT_VIBRATE,
+                        VibrationEffect.DEFAULT_AMPLITUDE
+                    )
+            )
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
@@ -11,7 +11,6 @@ package com.nextcloud.talk.activities
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
@@ -21,7 +20,6 @@ import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.webkit.SslErrorHandler
 import android.widget.EditText
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
@@ -96,7 +94,7 @@ open class BaseActivity : AppCompatActivity() {
     public override fun onResume() {
         super.onResume()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences.isKeyboardIncognito) {
+        if (appPreferences.isKeyboardIncognito) {
             val viewGroup = (findViewById<View>(android.R.id.content) as ViewGroup).getChildAt(0) as ViewGroup
             disableKeyboardPersonalisedLearning(viewGroup)
         }
@@ -137,7 +135,6 @@ open class BaseActivity : AppCompatActivity() {
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     private fun disableKeyboardPersonalisedLearning(viewGroup: ViewGroup) {
         var view: View?
         var editText: EditText

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
@@ -47,7 +47,6 @@ import android.widget.FrameLayout
 import android.widget.RelativeLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.DrawableRes
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.lifecycle.ViewModelProvider
@@ -3054,7 +3053,6 @@ class CallActivity : CallBaseActivity() {
         }
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         Log.d(TAG, "onPictureInPictureModeChanged")
@@ -3087,7 +3085,7 @@ class CallActivity : CallBaseActivity() {
     }
 
     private fun updatePictureInPictureActions(@DrawableRes iconId: Int, title: String?, requestCode: Int) {
-        if (isGreaterEqualOreo && isPipModePossible) {
+        if (isPipModePossible) {
             val actions = ArrayList<RemoteAction>()
             val icon = Icon.createWithResource(this, iconId)
             val intentFlag: Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java
@@ -54,7 +54,7 @@ public void onCreate(Bundle savedInstanceState) {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        if (isGreaterEqualOreo() && isPipModePossible()) {
+        if (isPipModePossible()) {
             mPictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
         }
 
@@ -118,7 +118,7 @@ protected void onUserLeaveHint() {
 
     void enterPipMode() {
         enableKeyguard();
-        if (isGreaterEqualOreo() && isPipModePossible()) {
+        if (isPipModePossible()) {
             Rational pipRatio = new Rational(300, 500);
             mPictureInPictureParamsBuilder.setAspectRatio(pipRatio);
             enterPictureInPictureMode(mPictureInPictureParamsBuilder.build());
@@ -131,7 +131,6 @@ void enterPipMode() {
     }
 
     boolean isPipModePossible() {
-        if (isGreaterEqualOreo()) {
             boolean deviceHasPipFeature = getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
 
             AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
@@ -140,12 +139,6 @@ boolean isPipModePossible() {
                 android.os.Process.myUid(),
                 BuildConfig.APPLICATION_ID) == AppOpsManager.MODE_ALLOWED;
             return deviceHasPipFeature && isPipFeatureGranted;
-        }
-        return false;
-    }
-
-    boolean isGreaterEqualOreo(){
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     }
 
     public abstract void updateUiForPipMode();

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt
@@ -8,7 +8,6 @@
  */
 package com.nextcloud.talk.adapters.items
 
-import android.os.Build
 import android.text.TextUtils
 import android.view.View
 import androidx.core.content.res.ResourcesCompat
@@ -136,9 +135,9 @@ class ContactItem(
         if (model.calculatedActorType == Participant.ActorType.GROUPS ||
             model.calculatedActorType == Participant.ActorType.CIRCLES
         ) {
-            setGenericAvatar(holder!!, R.drawable.ic_avatar_group, R.drawable.ic_circular_group)
+            setGenericAvatar(holder!!, R.drawable.ic_avatar_group)
         } else if (model.calculatedActorType == Participant.ActorType.EMAILS) {
-            setGenericAvatar(holder!!, R.drawable.ic_avatar_mail, R.drawable.ic_circular_mail)
+            setGenericAvatar(holder!!, R.drawable.ic_avatar_mail)
         } else if (model.calculatedActorType == Participant.ActorType.GUESTS ||
             model.type == Participant.ParticipantType.GUEST || model.type == Participant.ParticipantType.GUEST_MODERATOR
         ) {
@@ -167,19 +166,12 @@ class ContactItem(
         }
     }
 
-    private fun setGenericAvatar(
-        holder: ContactItemViewHolder,
-        roundPlaceholderDrawable: Int,
-        fallbackImageResource: Int
-    ) {
-        val avatar = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+    private fun setGenericAvatar(holder: ContactItemViewHolder, roundPlaceholderDrawable: Int) {
+        val avatar =
             viewThemeUtils.talk.themePlaceholderAvatar(
                 holder.binding.avatarView,
                 roundPlaceholderDrawable
             )
-        } else {
-            fallbackImageResource
-        }
 
         holder.binding.avatarView.loadUserAvatar(avatar)
     }

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -13,7 +13,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Typeface
-import android.os.Build
 import android.text.TextUtils
 import android.text.format.DateUtils
 import android.view.View
@@ -195,18 +194,13 @@ class ConversationItem(
             }
 
             ConversationEnums.ObjectType.FILE -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    holder.binding.dialogAvatar.loadUserAvatar(
-                        viewThemeUtils.talk.themePlaceholderAvatar(
-                            holder.binding.dialogAvatar,
-                            R.drawable.ic_avatar_document
-                        )
-                    )
-                } else {
-                    holder.binding.dialogAvatar.loadUserAvatar(
-                        R.drawable.ic_circular_document
+                holder.binding.dialogAvatar.loadUserAvatar(
+                    viewThemeUtils.talk.themePlaceholderAvatar(
+                        holder.binding.dialogAvatar,
+                        R.drawable.ic_avatar_document
                     )
-                }
+                )
+
                 false
             }
 

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt
@@ -10,7 +10,6 @@ package com.nextcloud.talk.adapters.items
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.ResourcesCompat
@@ -117,32 +116,24 @@ class MentionAutocompleteItem(
             SOURCE_CALLS -> {
                 run {}
                 run {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        holder.binding.avatarView.loadUserAvatar(
-                            viewThemeUtils.talk.themePlaceholderAvatar(
-                                holder.binding.avatarView,
-                                R.drawable.ic_avatar_group
-                            )
-                        )
-                    } else {
-                        holder.binding.avatarView.loadUserAvatar(R.drawable.ic_circular_group)
-                    }
-                }
-            }
-
-            SOURCE_GROUPS -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     holder.binding.avatarView.loadUserAvatar(
                         viewThemeUtils.talk.themePlaceholderAvatar(
                             holder.binding.avatarView,
                             R.drawable.ic_avatar_group
                         )
                     )
-                } else {
-                    holder.binding.avatarView.loadUserAvatar(R.drawable.ic_circular_group)
                 }
             }
 
+            SOURCE_GROUPS -> {
+                holder.binding.avatarView.loadUserAvatar(
+                    viewThemeUtils.talk.themePlaceholderAvatar(
+                        holder.binding.avatarView,
+                        R.drawable.ic_avatar_group
+                    )
+                )
+            }
+
             SOURCE_FEDERATION -> {
                 val darkTheme = if (DisplayUtils.isDarkModeOn(context)) 1 else 0
                 holder.binding.avatarView.loadFederatedUserAvatar(

diff --git a/app/src/main/java/com/nextcloud/talk/callnotification/CallNotificationActivity.kt b/app/src/main/java/com/nextcloud/talk/callnotification/CallNotificationActivity.kt
@@ -10,13 +10,11 @@ package com.nextcloud.talk.callnotification
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.View
-import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationManagerCompat
 import autodagger.AutoInjector
 import com.nextcloud.talk.R
@@ -215,7 +213,6 @@ class CallNotificationActivity : CallBaseActivity() {
         super.onDestroy()
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode

diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/io/AudioFocusRequestManager.kt b/app/src/main/java/com/nextcloud/talk/chat/data/io/AudioFocusRequestManager.kt
@@ -13,8 +13,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioFocusRequest
 import android.media.AudioManager
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 
@@ -61,7 +59,6 @@ class AudioFocusRequestManager(private val context: Context) {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private val focusRequest = AudioFocusRequest.Builder(duration)
         .setOnAudioFocusChangeListener(audioFocusChangeListener)
         .build()
@@ -75,19 +72,13 @@ class AudioFocusRequestManager(private val context: Context) {
             return
         }
 
-        val isGranted: Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val isGranted: Int =
             if (shouldRequestFocus) {
                 audioManager.requestAudioFocus(focusRequest)
             } else {
                 audioManager.abandonAudioFocusRequest(focusRequest)
             }
-        } else {
-            if (shouldRequestFocus) {
-                audioManager.requestAudioFocus(audioFocusChangeListener, AudioManager.STREAM_MUSIC, duration)
-            } else {
-                audioManager.abandonAudioFocus(audioFocusChangeListener)
-            }
-        }
+
         if (isGranted == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
             onGranted()
             handleBecomingNoisyBroadcast(shouldRequestFocus)

diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt
@@ -13,7 +13,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.PorterDuff
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.util.Log
@@ -414,9 +413,7 @@ class ContactsActivity :
             searchView!!.maxWidth = Int.MAX_VALUE
             searchView!!.inputType = InputType.TYPE_TEXT_VARIATION_FILTER
             var imeOptions: Int = EditorInfo.IME_ACTION_DONE or EditorInfo.IME_FLAG_NO_FULLSCREEN
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
-                appPreferences.isKeyboardIncognito == true
-            ) {
+            if (appPreferences.isKeyboardIncognito == true) {
                 imeOptions = imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
             }
             searchView!!.imeOptions = imeOptions

diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -551,7 +551,7 @@ class ConversationsListActivity :
             searchView!!.maxWidth = Int.MAX_VALUE
             searchView!!.inputType = InputType.TYPE_TEXT_VARIATION_FILTER
             var imeOptions = EditorInfo.IME_ACTION_DONE or EditorInfo.IME_FLAG_NO_FULLSCREEN
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && appPreferences.isKeyboardIncognito) {
+            if (appPreferences.isKeyboardIncognito) {
                 imeOptions = imeOptions or EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
             }
             searchView!!.imeOptions = imeOptions