Skip to content

Commit 442f44f

Browse files
hamenohameno
committed
Update deprecated code
1 parent 91a5d02 commit 442f44f

File tree

4 files changed

+39
-29
lines changed

4 files changed

+39
-29
lines changed

‎app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ android {
9595
lintOptions {
9696
lintConfig project.file('lint.xml')
9797
disable "GoogleAppIndexingWarning"
98+
disable "RemoveWorkManagerInitializer"
9899
enable 'Interoperability'
99100
}
100101
packagingOptions {

‎app/src/main/java/de/psdev/devdrawer/adapters/PartialMatchAdapter.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ import android.widget.TextView
1111
import de.psdev.devdrawer.R
1212
import de.psdev.devdrawer.database.DevDrawerDatabase
1313
import kotlinx.coroutines.runBlocking
14-
import java.util.*
1514

1615
class PartialMatchAdapter(
1716
activity: Activity,
1817
private val profileId: String,
1918
private val items: List<String>,
2019
private val devDrawerDatabase: DevDrawerDatabase,
2120
private val editMode: Boolean = false
22-
): BaseAdapter(), Filterable {
21+
) : BaseAdapter(), Filterable {
2322
private val filteredItems = mutableListOf<String>()
2423
private val layoutInflater: LayoutInflater = activity.layoutInflater
25-
private val packageFilter = object: Filter() {
24+
private val packageFilter = object : Filter() {
2625
override fun performFiltering(charSequence: CharSequence?): FilterResults {
2726
return if (charSequence == null) {
2827
FilterResults().apply {
2928
count = items.size
3029
values = items
3130
}
3231
} else {
33-
val existingFilters = runBlocking { devDrawerDatabase.packageFilterDao().findAllByProfile(profileId) }
34-
.map { it.filter }
32+
val existingFilters =
33+
runBlocking { devDrawerDatabase.packageFilterDao().findAllByProfile(profileId) }
34+
.map { it.filter }
3535
val existingFilterRegexes = existingFilters
3636
.map { it.replace("*", ".*").toRegex() }
3737
val filteredItems = items
@@ -40,7 +40,7 @@ class PartialMatchAdapter(
4040
// Filter item matching existing filters with regex
4141
.filterNot { !editMode && existingFilterRegexes.any { regex -> regex.matches(it) } }
4242
// Filter matching
43-
.filter { it.toLowerCase(Locale.ROOT).contains(charSequence.toString().toLowerCase(Locale.ROOT)) }
43+
.filter { it.lowercase().contains(charSequence.toString().lowercase()) }
4444
FilterResults().apply {
4545
count = filteredItems.size
4646
values = filteredItems
@@ -66,7 +66,7 @@ class PartialMatchAdapter(
6666

6767
override fun getItemId(position: Int): Long = filteredItems[position].hashCode().toLong()
6868

69-
override fun getView(position: Int, convertView: View?, viewGroup: ViewGroup): View? {
69+
override fun getView(position: Int, convertView: View?, viewGroup: ViewGroup): View {
7070
val view = convertView ?: createView(viewGroup)
7171
bindView(position, view)
7272
return view

‎app/src/main/java/de/psdev/devdrawer/analytics/TrackingService.kt

+30-20
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ class TrackingService @Inject constructor(
3737
const val CONFIG_KEY_MIN_TIME = "feature_analytics_optin_min_time"
3838
}
3939

40-
private val sharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(application) }
40+
private val sharedPreferences by lazy {
41+
PreferenceManager.getDefaultSharedPreferences(
42+
application
43+
)
44+
}
4145
private var firebaseAnalyticsOptInStatus: OptInStatus
4246
get() = if (sharedPreferences.contains(PREF_KEY_OPTED_IN)) {
4347
when (sharedPreferences.getBoolean(PREF_KEY_OPTED_IN, false)) {
@@ -51,24 +55,26 @@ class TrackingService @Inject constructor(
5155
OptInStatus.UNKNOWN -> throw IllegalArgumentException("UNKNOWN not allowed")
5256
}
5357
private val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics
54-
private val preferenceChangedListener = OnSharedPreferenceChangeListener { sharedPreferences, key ->
55-
logger.info { "Preference changed: $key" }
56-
when (key) {
57-
PREF_KEY_OPTED_IN -> {
58-
val value = sharedPreferences.getBoolean(key, false)
59-
sharedPreferences.edit {
60-
putLong(PREF_KEY_OPTED_IN_TIME, System.currentTimeMillis())
61-
}
62-
if (value) {
63-
setConsentStatus(FirebaseAnalytics.ConsentStatus.GRANTED)
64-
firebaseAnalytics.setAnalyticsCollectionEnabled(true)
65-
} else {
66-
setConsentStatus(FirebaseAnalytics.ConsentStatus.DENIED)
67-
firebaseAnalytics.setAnalyticsCollectionEnabled(false)
58+
private val preferenceChangedListener =
59+
OnSharedPreferenceChangeListener { sharedPreferences, key ->
60+
logger.info { "Preference changed: $key" }
61+
when (key) {
62+
PREF_KEY_OPTED_IN -> {
63+
val value = sharedPreferences.getBoolean(key, false)
64+
sharedPreferences.edit {
65+
putLong(PREF_KEY_OPTED_IN_TIME, System.currentTimeMillis())
66+
}
67+
if (value) {
68+
setConsentStatus(FirebaseAnalytics.ConsentStatus.GRANTED)
69+
firebaseAnalytics.setAnalyticsCollectionEnabled(true)
70+
} else {
71+
setConsentStatus(FirebaseAnalytics.ConsentStatus.DENIED)
72+
firebaseAnalytics.setAnalyticsCollectionEnabled(false)
73+
}
6874
}
6975
}
7076
}
71-
}
77+
private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
7278

7379
init {
7480
sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangedListener)
@@ -117,9 +123,13 @@ class TrackingService @Inject constructor(
117123
)
118124
.setPositiveButton("Opt-in") { _, _ ->
119125
optIn()
120-
Snackbar.make(activity.findViewById(android.R.id.content), buildSpannedString {
121-
bold { append("Thank you! You can change your decision anytime on the settings tab.") }
122-
}, Snackbar.LENGTH_LONG).apply {
126+
Snackbar.make(
127+
activity.findViewById(android.R.id.content),
128+
buildSpannedString {
129+
bold { append("Thank you! You can change your decision anytime on the settings tab.") }
130+
},
131+
Snackbar.LENGTH_LONG
132+
).apply {
123133
animationMode = Snackbar.ANIMATION_MODE_SLIDE
124134
setAction("OK") {
125135
dismiss()
@@ -131,7 +141,7 @@ class TrackingService @Inject constructor(
131141
.setCancelable(false)
132142
.create()
133143
alertDialog.setCanceledOnTouchOutside(false)
134-
val job = GlobalScope.async(Dispatchers.Main, start = CoroutineStart.LAZY) {
144+
val job = coroutineScope.async(start = CoroutineStart.LAZY) {
135145
alertDialog.findViewById<TextView>(android.R.id.message)?.movementMethod =
136146
LinkMovementMethod.getInstance()
137147
val positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)

‎app/src/main/java/de/psdev/devdrawer/profiles/PackageFilterListAdapter.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import de.psdev.devdrawer.database.FilterType
1111
import de.psdev.devdrawer.database.PackageFilter
1212
import de.psdev.devdrawer.databinding.ListItemPackageFilterBinding
1313
import de.psdev.devdrawer.utils.layoutInflater
14-
import java.util.*
1514

1615
class PackageFilterListAdapter(
1716
private val onDeleteClickListener: PackageFilterActionListener,
@@ -81,7 +80,7 @@ class PackageFilterListAdapter(
8180
val text = when (packageFilter.type) {
8281
FilterType.PACKAGE_NAME -> packageFilter.description
8382
FilterType.SIGNATURE -> "SHA256: ${
84-
packageFilter.filter.toUpperCase(Locale.ROOT).chunkedSequence(2)
83+
packageFilter.filter.uppercase().chunkedSequence(2)
8584
.joinToString(separator = ":")
8685
}"
8786
}

0 commit comments

Comments
 (0)