diff --git a/app/build.gradle b/app/build.gradle index 1039ffb0af2c4e6308f05e7eab5f972f3d41ced9..3320d6921ea6d93a67574761b1397a7a59fccec4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ android { defaultConfig { applicationId "foundation.e.apps" - minSdk 25 + minSdk 26 targetSdk 30 versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch versionName "${versionMajor}.${versionMinor}.${versionPatch}" diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt index 27670c9be4774728eab4e0f43340ab3f47e0f229..94f2b2f6126893719b3aa9be968c51aeeb4a077c 100644 --- a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt @@ -65,7 +65,6 @@ class AppManagerImpl @Inject constructor( private val mutex = Mutex() - @RequiresApi(Build.VERSION_CODES.O) override fun createNotificationChannels() { notificationManager.apply { createNotificationChannel(downloadNotificationChannel) diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt index 83cc3f3f9c3c4e36f4180eb5809e87ecf03a7c29..359681c6c01133a6f7a472b0f176759395e2e712 100644 --- a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt +++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt @@ -21,7 +21,6 @@ class AppManagerWrapper @Inject constructor( private val fdroidRepository: FdroidRepository ) { - @RequiresApi(Build.VERSION_CODES.O) fun createNotificationChannels() { return appManager.createNotificationChannels() } diff --git a/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt index 3d3747adb7a2c9b085c8440e6528383fb053a8ad..fa13002d4e534794e51b81c07180020c49b162df 100644 --- a/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt @@ -49,7 +49,6 @@ object NotificationManagerModule { @Singleton @Provides @Named("download") - @RequiresApi(Build.VERSION_CODES.O) fun provideDownloadNotificationChannel( @ApplicationContext context: Context ): NotificationChannel { @@ -63,7 +62,6 @@ object NotificationManagerModule { @Singleton @Provides @Named("update") - @RequiresApi(Build.VERSION_CODES.O) fun provideUpdateNotificationChannel( @ApplicationContext context: Context ): NotificationChannel { diff --git a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt index edb939a16e5a6a625f53fa63720dc8518047cb6c..b72f8a71977771f30ad36b770a45f9d32e8af482 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt @@ -238,9 +238,8 @@ class AppLoungePackageManager @Inject constructor( val params = SessionParams(mode).apply { setAppPackageName(packageName) setOriginatingUid(android.os.Process.myUid()) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - setInstallReason(PackageManager.INSTALL_REASON_USER) - } + setInstallReason(PackageManager.INSTALL_REASON_USER) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED) } diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt index 0e303bf4a1543b1b497615195927521154377246..8e5e5da16476f348421418b9f9ead522d1dfc6a2 100644 --- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt @@ -85,19 +85,11 @@ class SplitInstallBinder( } private fun handleError(packageName: String) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - return - } - createNotificationChannel(context) showErrorNotification(context, packageName) } private fun createNotificationChannel(context: Context) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - return - } - val descriptionText = context.getString(R.string.notification_channel_desc) val notificationChannel = NotificationChannel( NOTIFICATION_CHANNEL, diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt index de50df95a18850d5e07349b53725b8b79e8556d9..3f55ae189387f028dc47c35a7db0315519c60c6b 100644 --- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt @@ -107,17 +107,15 @@ object UpdatesNotifier { } private fun createNotificationChannel(context: Context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val importance = NotificationManager.IMPORTANCE_DEFAULT - val channel = NotificationChannel( - UPDATES_NOTIFICATION_CHANNEL_ID, - UPDATES_NOTIFICATION_CHANNEL_TITLE, - importance - ) - val notificationManager: NotificationManager = - context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - notificationManager.createNotificationChannel(channel) - } + val importance = NotificationManager.IMPORTANCE_DEFAULT + val channel = NotificationChannel( + UPDATES_NOTIFICATION_CHANNEL_ID, + UPDATES_NOTIFICATION_CHANNEL_TITLE, + importance + ) + val notificationManager: NotificationManager = + context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) } fun showNotification( diff --git a/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt b/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt index 286c2727d138e28f925f5cb529be7906e7f8666a..e2011c231b18ff96b773e2de07fb18cb925dfbff 100644 --- a/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt +++ b/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt @@ -81,15 +81,13 @@ class InstallAppWorker @AssistedInject constructor( val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - // Create a Notification channel if necessary - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val mChannel = NotificationChannel( - channelId, - title, - NotificationManager.IMPORTANCE_LOW - ) - notificationManager.createNotificationChannel(mChannel) - } + + val mChannel = NotificationChannel( + channelId, + title, + NotificationManager.IMPORTANCE_LOW + ) + notificationManager.createNotificationChannel(mChannel) val notification = NotificationCompat.Builder(applicationContext, channelId) .setContentTitle(title) diff --git a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt index c82240b4047150b1629bb43c0c41418ee08d4eee..2d316853e7d35024ce2ef3ec01ada7956dce0c80 100644 --- a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt +++ b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt @@ -154,15 +154,13 @@ class AgeRatingProvider : ContentProvider() { val context = context ?: return val title = context.getString(R.string.app_name) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val channel = NotificationChannel( - CHANNEL_ID, - title, - NotificationManager.IMPORTANCE_HIGH - ) - channel.setSound(null, null) - notificationManager.createNotificationChannel(channel) - } + val channel = NotificationChannel( + CHANNEL_ID, + title, + NotificationManager.IMPORTANCE_HIGH + ) + channel.setSound(null, null) + notificationManager.createNotificationChannel(channel) val builder = NotificationCompat.Builder(context, CHANNEL_ID) .setSmallIcon(R.drawable.app_lounge_notification_icon) diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt index 486f1ed1a1bd569916de2c6e3fe3e56d14523374..b897133a0e843325c1561710389ca1d108f12265 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt @@ -98,9 +98,9 @@ class MainActivity : AppCompatActivity() { bottomNavigationView.selectedItemId = R.id.updatesFragment } - if (VERSION.SDK_INT >= VERSION_CODES.O) { - viewModel.createNotificationChannels() - } + + viewModel.createNotificationChannels() + viewModel.setupConnectivityManager(this.applicationContext) diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt index 030755e7d6865ef6205dc53cda537fda47ec0a31..e1b754c20f4591913f8d85151cdcd3f527898433 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -116,7 +116,6 @@ class MainActivityViewModel @Inject constructor( * Notification functions */ - @RequiresApi(Build.VERSION_CODES.O) fun createNotificationChannels() { appManagerWrapper.createNotificationChannels() } diff --git a/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt index 1c6ab8df4c3eeec86b1e79d918fb7441d20d2ccc..c49336d72dc0a77a096147b163dfefd4c388c7ab 100644 --- a/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt @@ -57,9 +57,7 @@ class AppPurchaseFragment : Fragment() { cookieManager.acceptThirdPartyCookies(binding.playStoreWebView) cookieManager.setAcceptThirdPartyCookies(binding.playStoreWebView, true) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - binding.playStoreWebView.settings.safeBrowsingEnabled = false - } + binding.playStoreWebView.settings.safeBrowsingEnabled = false binding.playStoreWebView.webViewClient = object : WebViewClient() { override fun onPageFinished(view: WebView, url: String) { diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt index 3f85ffe1252015b15ac7fff527c78f9f2fdda3ce..94b5d1fa51b948ca92311d9be137121a7a8320dd 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt @@ -64,9 +64,7 @@ class GoogleSignInFragment : Fragment(R.layout.fragment_google_signin) { cookieManager.acceptThirdPartyCookies(binding.webview) cookieManager.setAcceptThirdPartyCookies(binding.webview, true) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - binding.webview.settings.safeBrowsingEnabled = false - } + binding.webview.settings.safeBrowsingEnabled = false binding.webview.webViewClient = object : WebViewClient() { override fun onPageFinished(view: WebView, url: String) { diff --git a/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt b/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt index b280350f8ba73b00df98dd38650ff17a9175ef46..659d5f369a4b9c9911d349a3c02aceb175f64bf8 100644 --- a/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt +++ b/app/src/main/java/foundation/e/apps/utils/CustomUncaughtExceptionHandler.kt @@ -81,17 +81,15 @@ class CustomUncaughtExceptionHandler @Inject constructor( } private fun createNotificationChannel() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val id = context.getString(R.string.warning_notification_channel_id) - val title = context.getString(R.string.warning_notification_channel_title) + val id = context.getString(R.string.warning_notification_channel_id) + val title = context.getString(R.string.warning_notification_channel_title) - val channel = NotificationChannel( - id, title, NotificationManager.IMPORTANCE_DEFAULT - ) + val channel = NotificationChannel( + id, title, NotificationManager.IMPORTANCE_DEFAULT + ) - val notificationManager: NotificationManager = - context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - notificationManager.createNotificationChannel(channel) - } + val notificationManager: NotificationManager = + context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) } } diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c2e7af314936596b9b6aac76d321ddd225a923bf..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 08f0da41cbe6a1caff0e577fb419f837737df11f..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 4487de43dee7a64ac76e5ad738813534a941a995..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 0651e4c67010789abf0c7cfead70128b0969ea44..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index 9a6feed61043692575f5b57c773e4a74b1487e91..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap/ic_launcher.xml