Skip to content

Commit fd73132

Browse files
darshanparajulidarshanparajuli
committed
Upgrade AGP, and dependencies.
1 parent 4fe384d commit fd73132

File tree

12 files changed

+164
-120
lines changed

12 files changed

+164
-120
lines changed

‎app/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ apply plugin: 'kotlin-kapt'
66
def fileProvider = "file_provider"
77

88
android {
9-
compileSdkVersion 30
10-
buildToolsVersion "30.0.3"
9+
compileSdkVersion 33
10+
buildToolsVersion "33.0.1"
1111

1212
defaultConfig {
1313
applicationId "com.dp.logcatapp"
1414
minSdkVersion 16
15-
targetSdkVersion 30
15+
targetSdkVersion 33
1616
versionCode 33
1717
versionName "1.7.2"
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
vectorDrawables.useSupportLibrary = true
20+
multiDexEnabled true
2021
}
2122

2223
signingConfigs {
@@ -90,6 +91,7 @@ dependencies {
9091
kapt "androidx.room:room-compiler:$room_version"
9192
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_core_version"
9293
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_android_version"
94+
implementation "androidx.multidex:multidex:$multidex_version"
9395

9496
testImplementation "junit:junit:$junit_version"
9597
androidTestImplementation "androidx.test:runner:$runner_version"

‎app/src/main/AndroidManifest.xml

+62-60
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,103 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.dp.logcatapp">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="com.dp.logcatapp">
55

66
<!-- adb shell pm grant com.dp.logcatapp android.permission.READ_LOGS -->
7-
<uses-permission android:name="android.permission.READ_LOGS" />
7+
<uses-permission android:name="android.permission.READ_LOGS"/>
88

9-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
10-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
11-
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
9+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
10+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
11+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
1212

1313
<application
14-
android:name=".LogcatApp"
15-
android:allowBackup="true"
16-
android:fullBackupContent="true"
17-
android:icon="@mipmap/ic_launcher"
18-
android:label="@string/app_name"
19-
android:largeHeap="true"
20-
android:supportsRtl="true"
21-
android:theme="@style/LightTheme"
22-
tools:ignore="GoogleAppIndexingWarning">
14+
android:name=".LogcatApp"
15+
android:allowBackup="true"
16+
android:fullBackupContent="true"
17+
android:icon="@mipmap/ic_launcher"
18+
android:label="@string/app_name"
19+
android:largeHeap="true"
20+
android:supportsRtl="true"
21+
android:theme="@style/LightTheme"
22+
tools:ignore="GoogleAppIndexingWarning">
2323
<activity
24-
android:name=".activities.SplashActivity"
25-
android:theme="@style/SplashScreenTheme">
24+
android:exported="true"
25+
android:name=".activities.SplashActivity"
26+
android:theme="@style/SplashScreenTheme">
2627
<intent-filter>
27-
<action android:name="android.intent.action.MAIN" />
28+
<action android:name="android.intent.action.MAIN"/>
2829

29-
<category android:name="android.intent.category.LAUNCHER" />
30+
<category android:name="android.intent.category.LAUNCHER"/>
3031
</intent-filter>
3132
</activity>
3233
<activity
33-
android:name=".activities.MainActivity"
34-
android:launchMode="singleTask" />
34+
android:name=".activities.MainActivity"
35+
android:launchMode="singleTask"/>
3536
<activity
36-
android:name=".activities.SettingsActivity"
37-
android:launchMode="singleTask"
38-
android:parentActivityName=".activities.MainActivity"
39-
android:windowSoftInputMode="adjustResize">
37+
android:name=".activities.SettingsActivity"
38+
android:launchMode="singleTask"
39+
android:parentActivityName=".activities.MainActivity"
40+
android:windowSoftInputMode="adjustResize">
4041
<meta-data
41-
android:name="android.support.PARENT_ACTIVITY"
42-
android:value=".activities.MainActivity" />
42+
android:name="android.support.PARENT_ACTIVITY"
43+
android:value=".activities.MainActivity"/>
4344
</activity>
4445

4546
<activity
46-
android:name=".activities.FiltersActivity"
47-
android:launchMode="singleTask"
48-
android:parentActivityName=".activities.MainActivity"
49-
android:windowSoftInputMode="adjustResize">
47+
android:name=".activities.FiltersActivity"
48+
android:launchMode="singleTask"
49+
android:parentActivityName=".activities.MainActivity"
50+
android:windowSoftInputMode="adjustResize">
5051
<meta-data
51-
android:name="android.support.PARENT_ACTIVITY"
52-
android:value=".activities.MainActivity" />
52+
android:name="android.support.PARENT_ACTIVITY"
53+
android:value=".activities.MainActivity"/>
5354
</activity>
5455

5556
<activity
56-
android:name=".activities.SavedLogsActivity"
57-
android:launchMode="singleTask"
58-
android:parentActivityName=".activities.MainActivity"
59-
android:windowSoftInputMode="adjustResize">
57+
android:name=".activities.SavedLogsActivity"
58+
android:launchMode="singleTask"
59+
android:parentActivityName=".activities.MainActivity"
60+
android:windowSoftInputMode="adjustResize">
6061
<meta-data
61-
android:name="android.support.PARENT_ACTIVITY"
62-
android:value=".activities.MainActivity" />
62+
android:name="android.support.PARENT_ACTIVITY"
63+
android:value=".activities.MainActivity"/>
6364
</activity>
6465

6566
<activity
66-
android:name=".activities.SavedLogsViewerActivity"
67-
android:launchMode="singleTask"
68-
android:parentActivityName=".activities.SavedLogsActivity"
69-
android:windowSoftInputMode="adjustResize">
67+
android:name=".activities.SavedLogsViewerActivity"
68+
android:launchMode="singleTask"
69+
android:parentActivityName=".activities.SavedLogsActivity"
70+
android:windowSoftInputMode="adjustResize"
71+
android:exported="true">
7072
<meta-data
71-
android:name="android.support.PARENT_ACTIVITY"
72-
android:value=".activities.SavedLogsActivity" />
73+
android:name="android.support.PARENT_ACTIVITY"
74+
android:value=".activities.SavedLogsActivity"/>
7375
<intent-filter>
74-
<action android:name="android.intent.action.VIEW" />
75-
<category android:name="android.intent.category.DEFAULT" />
76+
<action android:name="android.intent.action.VIEW"/>
77+
<category android:name="android.intent.category.DEFAULT"/>
7678

7779
<data
78-
android:mimeType="text/plain"
79-
android:scheme="file" />
80+
android:mimeType="text/plain"
81+
android:scheme="file"/>
8082
<data
81-
android:mimeType="text/plain"
82-
android:scheme="content" />
83+
android:mimeType="text/plain"
84+
android:scheme="content"/>
8385
</intent-filter>
8486
</activity>
8587

8688
<service
87-
android:name=".services.LogcatService"
88-
android:exported="false"
89-
android:stopWithTask="false" />
89+
android:name=".services.LogcatService"
90+
android:exported="false"
91+
android:stopWithTask="false"/>
9092

9193
<provider
92-
android:name="androidx.core.content.FileProvider"
93-
android:authorities="${applicationId}.${fileProvider}"
94-
android:exported="false"
95-
android:grantUriPermissions="true">
94+
android:name="androidx.core.content.FileProvider"
95+
android:authorities="${applicationId}.${fileProvider}"
96+
android:exported="false"
97+
android:grantUriPermissions="true">
9698
<meta-data
97-
android:name="android.support.FILE_PROVIDER_PATHS"
98-
android:resource="@xml/file_provider_paths" />
99+
android:name="android.support.FILE_PROVIDER_PATHS"
100+
android:resource="@xml/file_provider_paths"/>
99101
</provider>
100102
</application>
101103

‎app/src/main/java/com/dp/logcatapp/fragments/filters/FiltersFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.view.View
1010
import android.view.ViewGroup
1111
import android.widget.ImageButton
1212
import android.widget.TextView
13+
import androidx.fragment.app.setFragmentResultListener
1314
import androidx.lifecycle.Observer
1415
import androidx.recyclerview.widget.DiffUtil
1516
import androidx.recyclerview.widget.DividerItemDecoration

‎app/src/main/java/com/dp/logcatapp/fragments/settings/SettingsFragment.kt

+12-12
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
5050
}
5151

5252
private fun setupAppearanceCategory() {
53-
val sharedPrefs = preferenceScreen.sharedPreferences
53+
val sharedPrefs = preferenceScreen.sharedPreferences!!
5454
val themePref = findPreference<ListPreference>(PreferenceKeys.Appearance.KEY_THEME)!!
5555
val useBlackThemePref =
5656
findPreference<Preference>(PreferenceKeys.Appearance.KEY_USE_BLACK_THEME)!!
@@ -91,7 +91,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
9191
val prefBuffers = findPreference<MultiSelectListPreference>(PreferenceKeys.Logcat.KEY_BUFFERS)!!
9292
val prefMaxLogs = findPreference<Preference>(PreferenceKeys.Logcat.KEY_MAX_LOGS)!!
9393

94-
prefPollInterval.summary = preferenceScreen.sharedPreferences
94+
prefPollInterval.summary = preferenceScreen.sharedPreferences!!
9595
.getString(
9696
PreferenceKeys.Logcat.KEY_POLL_INTERVAL,
9797
PreferenceKeys.Logcat.Default.POLL_INTERVAL
@@ -119,7 +119,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
119119
val availableBuffers = Logcat.AVAILABLE_BUFFERS
120120
val defaultBuffers = PreferenceKeys.Logcat.Default.BUFFERS
121121
if (availableBuffers.isNotEmpty() && defaultBuffers.isNotEmpty()) {
122-
val bufferValues = preferenceScreen.sharedPreferences
122+
val bufferValues = preferenceScreen.sharedPreferences!!
123123
.getStringSet(PreferenceKeys.Logcat.KEY_BUFFERS, defaultBuffers)!!
124124

125125
val toSummary = { values: Set<String> ->
@@ -153,7 +153,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
153153
prefBuffers.isVisible = false
154154
}
155155

156-
val maxLogs = preferenceScreen.sharedPreferences.getString(
156+
val maxLogs = preferenceScreen.sharedPreferences!!.getString(
157157
PreferenceKeys.Logcat.KEY_MAX_LOGS,
158158
PreferenceKeys.Logcat.Default.MAX_LOGS
159159
)!!.trim().toInt()
@@ -163,7 +163,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
163163
.OnPreferenceChangeListener callback@{ preference, newValue ->
164164
val activity = requireActivity()
165165
try {
166-
val oldValue = preferenceScreen.sharedPreferences.getString(
166+
val oldValue = preferenceScreen.sharedPreferences!!.getString(
167167
PreferenceKeys.Logcat.KEY_MAX_LOGS,
168168
PreferenceKeys.Logcat.Default.MAX_LOGS
169169
)!!.trim().toInt()
@@ -190,8 +190,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
190190
}
191191

192192
private fun setupSaveLocationOption() {
193-
prefSaveLocation = findPreference<Preference>(PreferenceKeys.Logcat.KEY_SAVE_LOCATION)!!
194-
val saveLocation = preferenceScreen.sharedPreferences.getString(
193+
prefSaveLocation = findPreference(PreferenceKeys.Logcat.KEY_SAVE_LOCATION)!!
194+
val saveLocation = preferenceScreen.sharedPreferences!!.getString(
195195
PreferenceKeys.Logcat.KEY_SAVE_LOCATION,
196196
PreferenceKeys.Logcat.Default.SAVE_LOCATION
197197
)!!.trim()
@@ -250,7 +250,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
250250
return
251251
}
252252

253-
preferenceScreen.sharedPreferences.edit {
253+
preferenceScreen.sharedPreferences!!.edit {
254254
putString(PreferenceKeys.Logcat.KEY_SAVE_LOCATION, file.absolutePath)
255255
}
256256
prefSaveLocation.summary = "%s/%s".format(
@@ -311,12 +311,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
311311
SAVE_LOCATION_REQ -> {
312312
val uri = data?.data
313313
if (uri != null) {
314-
activity!!.contentResolver.takePersistableUriPermission(
314+
requireActivity().contentResolver.takePersistableUriPermission(
315315
uri,
316316
Intent.FLAG_GRANT_READ_URI_PERMISSION or
317317
Intent.FLAG_GRANT_WRITE_URI_PERMISSION
318318
)
319-
preferenceScreen.sharedPreferences.edit {
319+
preferenceScreen.sharedPreferences!!.edit {
320320
putString(
321321
PreferenceKeys.Logcat.KEY_SAVE_LOCATION,
322322
uri.toString()
@@ -329,7 +329,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
329329
}
330330

331331
private fun setupDefaultSaveLocation() {
332-
preferenceScreen.sharedPreferences.edit {
332+
preferenceScreen.sharedPreferences!!.edit {
333333
putString(PreferenceKeys.Logcat.KEY_SAVE_LOCATION, "")
334334
}
335335
prefSaveLocation.summary = getString(R.string.save_location_internal)
@@ -359,7 +359,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
359359
}
360360

361361
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
362-
return AlertDialog.Builder(activity!!)
362+
return AlertDialog.Builder(requireActivity())
363363
.setTitle(R.string.save_location)
364364
.setItems(R.array.save_location_options) { _, which ->
365365
if (which == 0) {

‎app/src/main/java/com/dp/logcatapp/fragments/shared/dialogs/FilterExclusionDialogFragment.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.dp.logcat.Log
99
import com.dp.logcatapp.R
1010
import com.dp.logcatapp.activities.FiltersActivity
1111
import com.dp.logcatapp.fragments.base.BaseDialogFragment
12+
import com.dp.logcatapp.util.getParcelableCompat
1213

1314
class FilterExclusionDialogFragment : BaseDialogFragment(), DialogInterface.OnClickListener {
1415

@@ -42,7 +43,7 @@ class FilterExclusionDialogFragment : BaseDialogFragment(), DialogInterface.OnCl
4243
dialog: DialogInterface,
4344
which: Int
4445
) {
45-
val log = requireArguments().getParcelable<Log>(KEY_LOG)!!
46+
val log = requireArguments().getParcelableCompat<Log>(KEY_LOG)!!
4647
when (which) {
4748
LogContentType.FILTER.ordinal -> moveToFilterActivity(log, false)
4849
LogContentType.EXCLUDE.ordinal -> moveToFilterActivity(log, true)

0 commit comments

Comments
 (0)