Some miscellaneous code improvements

app/src/main/java/org/tasks/activities/CameraActivity.java

@@ -49,7 +49,7 @@ public class CameraActivity extends InjectingAppCompatActivity {
         throw new RuntimeException("Invalid Uri");
       }
       final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-      Uri shared =
+      final Uri shared =
           FileProvider.getUriForFile(
               this, Constants.FILE_PROVIDER_AUTHORITY, new File(uri.getPath()));
       intent.putExtra(MediaStore.EXTRA_OUTPUT, shared);
@@ -62,7 +62,7 @@ public class CameraActivity extends InjectingAppCompatActivity {
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == REQUEST_CODE_CAMERA) {
       if (resultCode == RESULT_OK) {
-        Intent intent = new Intent();
+        final Intent intent = new Intent();
         intent.setData(uri);
         setResult(RESULT_OK, intent);
       }

app/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java

@@ -76,7 +76,7 @@ public class DateAndTimePickerActivity extends InjectingAppCompatActivity
   @Override
   public void onTimePicked(long timestamp) {
     if (timestamp != MyTimePickerDialog.NO_TIME) {
-      Intent data = new Intent();
+      final Intent data = new Intent();
       data.putExtra(MyTimePickerDialog.EXTRA_TIMESTAMP, timestamp);
       setResult(RESULT_OK, data);
     }

app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt

@@ -122,14 +122,12 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
     private fun onDelete(index: Int) {
         criteria.removeAt(index)
         updateList()
-        return
     }
 
     private fun onMove(from: Int, to: Int) {
         val criterion = criteria.removeAt(from)
         criteria.add(to, criterion)
         adapter.notifyItemMoved(from, to)
-        return
     }
 
     private fun onClick(replaceId: String) {
@@ -148,24 +146,21 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
                 }
                 .setNeutralButton(R.string.help) { _, _ -> help() }
                 .show()
-        return
     }
 
-    private fun getSelected(instance: CriterionInstance): Int {
+    private fun getSelected(instance: CriterionInstance): Int =
-        return when (instance.type) {
+        when (instance.type) {
             CriterionInstance.TYPE_ADD -> R.id.button_or
             CriterionInstance.TYPE_SUBTRACT -> R.id.button_not
             else -> R.id.button_and
         }
-    }
 
-    private fun getType(selected: Int): Int {
+    private fun getType(selected: Int): Int =
-        return when (selected) {
+        when (selected) {
             R.id.button_or -> CriterionInstance.TYPE_ADD
             R.id.button_not -> CriterionInstance.TYPE_SUBTRACT
             else -> CriterionInstance.TYPE_INTERSECT
         }
-    }
 
     @OnClick(R.id.fab)
     fun addCriteria() {
@@ -305,14 +300,13 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
         finish()
     }
 
-    override fun onMenuItemClick(item: MenuItem): Boolean {
+    override fun onMenuItemClick(item: MenuItem): Boolean =
-        return if (item.itemId == R.id.menu_help) {
+        if (item.itemId == R.id.menu_help) {
             help()
             true
         } else {
             super.onMenuItemClick(item)
         }
-    }
 
     private fun help() {
         startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/filters")))

app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt

@@ -151,11 +151,10 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
     private val newName: String
         get() = name.text.toString().trim { it <= ' ' }
 
-    override fun hasChanges(): Boolean {
+    override fun hasChanges(): Boolean =
-        return if (isNewList) {
+        if (isNewList) {
             selectedColor >= 0 || !isNullOrEmpty(newName)
         } else colorChanged() || nameChanged() || iconChanged()
-    }
 
     private fun colorChanged() = selectedColor != gtasksList.getColor()
 
@@ -164,11 +163,14 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
     private fun nameChanged() = newName != gtasksList.title
 
     private suspend fun onListCreated(taskList: TaskList) {
-        gtasksList.remoteId = taskList.id
+        with(gtasksList) {
-        gtasksList.title = taskList.title
+            remoteId = taskList.id
-        gtasksList.setColor(selectedColor)
+            title = taskList.title
-        gtasksList.setIcon(selectedIcon)
+            setColor(selectedColor)
-        gtasksList.id = googleTaskListDao.insertOrReplace(gtasksList)
+            setIcon(selectedIcon)
+            id = googleTaskListDao.insertOrReplace(this)
+        }
+
         setResult(
                 Activity.RESULT_OK, Intent().putExtra(MainActivity.OPEN_FILTER, GtasksFilter(gtasksList)))
         finish()
@@ -183,10 +185,13 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
     }
 
     private suspend fun onListRenamed(taskList: TaskList) {
-        gtasksList.title = taskList.title
+        with(gtasksList) {
-        gtasksList.setColor(selectedColor)
+            title = taskList.title
-        gtasksList.setIcon(selectedIcon)
+            setColor(selectedColor)
-        googleTaskListDao.insertOrReplace(gtasksList)
+            setIcon(selectedIcon)
+            googleTaskListDao.insertOrReplace(this)
+        }
+
         setResult(
                 Activity.RESULT_OK,
                 Intent(TaskListFragment.ACTION_RELOAD)

app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt

@@ -59,11 +59,14 @@ class NavigationDrawerCustomization : ThemedInjectingAppCompatActivity(), Toolba
 
         toolbar = binding.toolbar.toolbar
 
-        toolbar.title = getString(R.string.manage_lists)
+        with(toolbar) {
-        toolbar.navigationIcon = getDrawable(R.drawable.ic_outline_arrow_back_24px)
+            title = getString(R.string.manage_lists)
-        toolbar.setNavigationOnClickListener { finish() }
+            navigationIcon = getDrawable(R.drawable.ic_outline_arrow_back_24px)
-        toolbar.setOnMenuItemClickListener(this)
+            setNavigationOnClickListener { finish() }
-        toolbar.inflateMenu(R.menu.menu_nav_drawer_customization)
+            setOnMenuItemClickListener(this@NavigationDrawerCustomization)
+            inflateMenu(R.menu.menu_nav_drawer_customization)
+        }
+
         themeColor.apply(toolbar)
         themeColor.applyToSystemBars(this)
 

app/src/main/java/org/tasks/activities/attribution/AttributionActivity.kt

@@ -57,7 +57,7 @@ class AttributionActivity : ThemedInjectingAppCompatActivity() {
     private fun getRows(attributions: List<LibraryAttribution>): Iterable<AttributionRow> {
         val byCopyrightHolder = Multimaps.index(attributions) { lib -> lib!!.copyrightHolder }
         return byCopyrightHolder.keySet().sorted().map {
-            val libraries = byCopyrightHolder[it].map { a -> "\u2022 " + a.libraryName }
+            val libraries = byCopyrightHolder[it].map { a -> "\u2022 ${a.libraryName}"}
             AttributionRow(it, libraries.sorted().joinToString("\n"))
         }
     }

app/src/main/java/org/tasks/extensions/ContextExtensions.kt

@@ -18,7 +18,7 @@ fun Context.safeStartActivity(intent: Intent) {
 fun Fragment.safeStartActivityForResult(intent: Intent, rc: Int) {
     try {
         startActivityForResult(intent, rc)
-    } catch(e: ActivityNotFoundException) {
+    } catch (e: ActivityNotFoundException) {
         toast(context)
     }
 }