remove legacy notification channel cleanup (#2550)
This commit is contained in:
parent
00c139190e
commit
fd9d48e4a6
2 changed files with 0 additions and 23 deletions
|
@ -20,7 +20,6 @@ import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import com.keylesspalace.tusky.components.login.LoginActivity
|
import com.keylesspalace.tusky.components.login.LoginActivity
|
||||||
import com.keylesspalace.tusky.components.notifications.NotificationHelper
|
|
||||||
import com.keylesspalace.tusky.db.AccountManager
|
import com.keylesspalace.tusky.db.AccountManager
|
||||||
import com.keylesspalace.tusky.di.Injectable
|
import com.keylesspalace.tusky.di.Injectable
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
@ -34,12 +33,8 @@ class SplashActivity : AppCompatActivity(), Injectable {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
/** delete old notification channels */
|
|
||||||
NotificationHelper.deleteLegacyNotificationChannels(this, accountManager)
|
|
||||||
|
|
||||||
/** Determine whether the user is currently logged in, and if so go ahead and load the
|
/** Determine whether the user is currently logged in, and if so go ahead and load the
|
||||||
* timeline. Otherwise, start the activity_login screen. */
|
* timeline. Otherwise, start the activity_login screen. */
|
||||||
|
|
||||||
val intent = if (accountManager.activeAccount != null) {
|
val intent = if (accountManager.activeAccount != null) {
|
||||||
Intent(this, MainActivity::class.java)
|
Intent(this, MainActivity::class.java)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -458,24 +458,6 @@ public class NotificationHelper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void deleteLegacyNotificationChannels(@NonNull Context context, @NonNull AccountManager accountManager) {
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
|
||||||
|
|
||||||
NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
|
|
||||||
|
|
||||||
// used until Tusky 1.4
|
|
||||||
notificationManager.deleteNotificationChannel(CHANNEL_MENTION);
|
|
||||||
notificationManager.deleteNotificationChannel(CHANNEL_FAVOURITE);
|
|
||||||
notificationManager.deleteNotificationChannel(CHANNEL_BOOST);
|
|
||||||
notificationManager.deleteNotificationChannel(CHANNEL_FOLLOW);
|
|
||||||
|
|
||||||
// used until Tusky 1.7
|
|
||||||
for(AccountEntity account: accountManager.getAllAccountsOrderedByActive()) {
|
|
||||||
notificationManager.deleteNotificationChannel(CHANNEL_FAVOURITE+" "+account.getIdentifier());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean areNotificationsEnabled(@NonNull Context context, @NonNull AccountManager accountManager) {
|
public static boolean areNotificationsEnabled(@NonNull Context context, @NonNull AccountManager accountManager) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue