Merge pull request #6583 from thundernest/update_dependencies (e797da02) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -651,9 +651,13 @@ public class LocalStore {
		if (MimeUtil.ENC_QUOTED_PRINTABLE.equals(encoding)) {
		return new QuotedPrintableInputStream(rawInputStream) {
		@Override
		public void close() throws IOException {
		public void close() {
		super.close();
		try {
		rawInputStream.close();
		} catch (IOException e) {
		throw new RuntimeException(e);
		}
		}
		};
		}

+28 −14

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ if (rootProject.testCoverage) {
		}

		dependencies {
		coreLibraryDesugaring libs.desugar

		implementation project(":app:ui:legacy")
		implementation project(":app:ui:message-list-widget")
		implementation project(":app:core")
		@@ -69,6 +71,10 @@ android {
		release
		}

		compileOptions {
		coreLibraryDesugaringEnabled true
		}

		buildTypes {
		release {
		if (project.hasProperty('storeFile')) {
		@@ -103,24 +109,32 @@ android {
		}
		}

		lintOptions {
		lint {
		checkDependencies true
		}

		packagingOptions {
		exclude 'META-INF/DEPENDENCIES'
		exclude 'META-INF/LICENSE'
		exclude 'META-INF/LICENSE.txt'
		exclude 'META-INF/NOTICE'
		exclude 'META-INF/NOTICE.txt'
		exclude 'META-INF/README'
		exclude 'META-INF/README.md'
		exclude 'META-INF/CHANGES'
		exclude 'LICENSE.txt'
		exclude 'META-INF/*.kotlin_module'
		exclude 'META-INF/*.version'
		exclude 'kotlin/**'
		exclude 'DebugProbesKt.bin'
		jniLibs {
		excludes += ['kotlin/**']
		}

		resources {
		excludes += [
		'META-INF/DEPENDENCIES',
		'META-INF/LICENSE',
		'META-INF/LICENSE.txt',
		'META-INF/NOTICE',
		'META-INF/NOTICE.txt',
		'META-INF/README',
		'META-INF/README.md',
		'META-INF/CHANGES',
		'LICENSE.txt',
		'META-INF/*.kotlin_module',
		'META-INF/*.version',
		'kotlin/**',
		'DebugProbesKt.bin'
		]
		}
		}

		dependenciesInfo {

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,11 @@ import com.fsck.k9.ui.observeNotNull
		import com.fsck.k9.ui.settings.import.SettingsImportResultViewModel
		import com.fsck.k9.ui.settings.import.SettingsImportSuccess
		import org.koin.android.ext.android.inject
		import org.koin.androidx.viewmodel.ext.android.sharedViewModel
		import org.koin.androidx.viewmodel.ext.android.activityViewModel

		class WelcomeFragment : Fragment() {
		private val htmlToSpanned: HtmlToSpanned by inject()
		private val importResultViewModel: SettingsImportResultViewModel by sharedViewModel()
		private val importResultViewModel: SettingsImportResultViewModel by activityViewModel()

		override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
		return inflater.inflate(R.layout.fragment_welcome_message, container, false)

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,14 +39,14 @@ import com.fsck.k9.ui.settings.removeEntry
		import com.fsck.k9.ui.withArguments
		import com.takisoft.preferencex.PreferenceFragmentCompat
		import org.koin.android.ext.android.inject
		import org.koin.androidx.viewmodel.ext.android.sharedViewModel
		import org.koin.androidx.viewmodel.ext.android.activityViewModel
		import org.koin.core.parameter.parametersOf
		import org.openintents.openpgp.OpenPgpApiManager
		import org.openintents.openpgp.util.OpenPgpKeyPreference
		import org.openintents.openpgp.util.OpenPgpProviderUtil

		class AccountSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFragmentListener {
		private val viewModel: AccountSettingsViewModel by sharedViewModel()
		private val viewModel: AccountSettingsViewModel by activityViewModel()
		private val dataStoreFactory: AccountSettingsDataStoreFactory by inject()
		private val openPgpApiManager: OpenPgpApiManager by inject { parametersOf(this) }
		private val messagingController: MessagingController by inject()

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,12 +19,12 @@ import com.fsck.k9.ui.R
		import com.fsck.k9.ui.observeNotNull
		import com.mikepenz.fastadapter.FastAdapter
		import com.mikepenz.fastadapter.adapters.ItemAdapter
		import org.koin.androidx.viewmodel.ext.android.sharedViewModel
		import org.koin.androidx.viewmodel.ext.android.activityViewModel
		import org.koin.androidx.viewmodel.ext.android.viewModel

		class SettingsImportFragment : Fragment() {
		private val viewModel: SettingsImportViewModel by viewModel()
		private val resultViewModel: SettingsImportResultViewModel by sharedViewModel()
		private val resultViewModel: SettingsImportResultViewModel by activityViewModel()

		private lateinit var settingsImportAdapter: FastAdapter<ImportListItem<*>>
		private lateinit var itemAdapter: ItemAdapter<ImportListItem<*>>