Remove some context injections

pull/1280/head
Alex Baker 4 years ago
parent 5a5d1ae2ac
commit b74b78e3df

@ -1,6 +1,5 @@
package com.todoroo.astrid.activity package com.todoroo.astrid.activity
import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
@ -10,7 +9,6 @@ import com.google.common.io.Files
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import com.todoroo.astrid.service.TaskCreator import com.todoroo.astrid.service.TaskCreator
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.Strings.isNullOrEmpty import org.tasks.Strings.isNullOrEmpty
import org.tasks.data.TaskAttachment import org.tasks.data.TaskAttachment
@ -30,7 +28,6 @@ import kotlin.math.min
*/ */
@AndroidEntryPoint @AndroidEntryPoint
class ShareLinkActivity : InjectingAppCompatActivity() { class ShareLinkActivity : InjectingAppCompatActivity() {
@Inject @ApplicationContext lateinit var context: Context
@Inject lateinit var taskCreator: TaskCreator @Inject lateinit var taskCreator: TaskCreator
@Inject lateinit var preferences: Preferences @Inject lateinit var preferences: Preferences
@ -85,7 +82,7 @@ class ShareLinkActivity : InjectingAppCompatActivity() {
private fun copyAttachment(intent: Intent): ArrayList<Uri> { private fun copyAttachment(intent: Intent): ArrayList<Uri> {
val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM) ?: return ArrayList() val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM) ?: return ArrayList()
var filename = FileHelper.getFilename(context, uri) var filename = FileHelper.getFilename(this, uri)
if (isNullOrEmpty(filename)) { if (isNullOrEmpty(filename)) {
filename = intent.getStringExtra(Intent.EXTRA_SUBJECT) filename = intent.getStringExtra(Intent.EXTRA_SUBJECT)
?.takeIf { it.isNotBlank() } ?.takeIf { it.isNotBlank() }
@ -93,7 +90,7 @@ class ShareLinkActivity : InjectingAppCompatActivity() {
?: uri.lastPathSegment ?: uri.lastPathSegment
} }
val basename = Files.getNameWithoutExtension(filename!!) val basename = Files.getNameWithoutExtension(filename!!)
return Lists.newArrayList(FileHelper.copyToUri(context, preferences.attachmentsDirectory!!, uri, basename)) return Lists.newArrayList(FileHelper.copyToUri(this, preferences.attachmentsDirectory!!, uri, basename))
} }
private fun copyMultipleAttachments(intent: Intent): ArrayList<Uri> { private fun copyMultipleAttachments(intent: Intent): ArrayList<Uri> {
@ -101,7 +98,7 @@ class ShareLinkActivity : InjectingAppCompatActivity() {
val uris = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM) val uris = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
if (uris != null) { if (uris != null) {
for (uri in uris) { for (uri in uris) {
result.add(FileHelper.copyToUri(context, preferences.attachmentsDirectory!!, uri)) result.add(FileHelper.copyToUri(this, preferences.attachmentsDirectory!!, uri))
} }
} }
return result return result

@ -11,7 +11,6 @@ import com.todoroo.andlib.utility.AndroidUtilities
import com.todoroo.astrid.adapter.FilterAdapter import com.todoroo.astrid.adapter.FilterAdapter
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.LocalBroadcastManager import org.tasks.LocalBroadcastManager
import org.tasks.dialogs.DialogBuilder import org.tasks.dialogs.DialogBuilder
@ -24,7 +23,6 @@ import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class FilterSelectionActivity : InjectingAppCompatActivity() { class FilterSelectionActivity : InjectingAppCompatActivity() {
@Inject @ApplicationContext lateinit var context: Context
@Inject lateinit var dialogBuilder: DialogBuilder @Inject lateinit var dialogBuilder: DialogBuilder
@Inject lateinit var filterAdapter: FilterAdapter @Inject lateinit var filterAdapter: FilterAdapter
@Inject lateinit var filterProvider: FilterProvider @Inject lateinit var filterProvider: FilterProvider
@ -58,7 +56,7 @@ class FilterSelectionActivity : InjectingAppCompatActivity() {
data.putExtra(EXTRA_FILTER, selectedFilter) data.putExtra(EXTRA_FILTER, selectedFilter)
} }
if (widgetId != -1) { if (widgetId != -1) {
WidgetPreferences(context, preferences, widgetId) WidgetPreferences(this, preferences, widgetId)
.setFilter(defaultFilterProvider.getFilterPreferenceValue(selectedFilter)) .setFilter(defaultFilterProvider.getFilterPreferenceValue(selectedFilter))
localBroadcastManager.reconfigureWidget(widgetId) localBroadcastManager.reconfigureWidget(widgetId)
} }

@ -28,7 +28,6 @@ import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class GoogleTaskListSettingsActivity : BaseListSettingsActivity() { class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
@Inject @ApplicationContext lateinit var context: Context
@Inject lateinit var googleTaskListDao: GoogleTaskListDao @Inject lateinit var googleTaskListDao: GoogleTaskListDao
@Inject lateinit var taskDeleter: TaskDeleter @Inject lateinit var taskDeleter: TaskDeleter

Loading…
Cancel
Save