From c90bf78dc5a3c07e4a019761a6e967000400f020 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sun, 6 Sep 2020 11:51:22 +0300
Subject: [PATCH] Enable R8 and fix errors.

---
 .../java/com/etesync/syncadapter/ui/AccountListFragment.kt  | 2 +-
 .../etesync/syncadapter/ui/CollectionMembersListFragment.kt | 2 +-
 .../etesync/syncadapter/ui/importlocal/ImportActivity.kt    | 6 +++---
 .../etesync/syncadapter/ui/importlocal/ResultFragment.kt    | 2 +-
 .../syncadapter/ui/journalviewer/ListEntriesFragment.kt     | 2 +-
 gradle.properties                                           | 1 -
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
index cbbae105..52abf562 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
@@ -47,7 +47,7 @@ class AccountListFragment : ListFragment(), LoaderManager.LoaderCallbacks<Array<
     }
 
     override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-        val account = listAdapter.getItem(position) as Account
+        val account = listAdapter?.getItem(position) as Account
 
         val intent = Intent(context, AccountActivity::class.java)
         intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt
index 59246888..c673da84 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt
@@ -104,7 +104,7 @@ class CollectionMembersListFragment : ListFragment(), AdapterView.OnItemClickLis
     }
 
     override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-        val member = listAdapter.getItem(position) as JournalManager.Member
+        val member = listAdapter?.getItem(position) as JournalManager.Member
 
         AlertDialog.Builder(activity!!)
                 .setIcon(R.drawable.ic_info_dark)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt
index 30eb2cc1..d9600cfe 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt
@@ -103,7 +103,7 @@ class ImportActivity : BaseActivity(), SelectImportMethod, ResultFragment.OnImpo
 
         private var mSelectImportMethod: SelectImportMethod? = null
 
-        override fun onAttach(context: Context?) {
+        override fun onAttach(context: Context) {
             super.onAttach(context)
             // This makes sure that the container activity has implemented
             // the callback interface. If not, it throws an exception
@@ -115,14 +115,14 @@ class ImportActivity : BaseActivity(), SelectImportMethod, ResultFragment.OnImpo
 
         }
 
-        override fun onAttach(activity: Activity?) {
+        override fun onAttach(activity: Activity) {
             super.onAttach(activity)
             // This makes sure that the container activity has implemented
             // the callback interface. If not, it throws an exception
             try {
                 mSelectImportMethod = activity as SelectImportMethod?
             } catch (e: ClassCastException) {
-                throw ClassCastException(activity!!.toString() + " must implement MyInterface ")
+                throw ClassCastException(activity.toString() + " must implement MyInterface ")
             }
 
         }
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt
index 6e01a22d..86ab9288 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt
@@ -22,7 +22,7 @@ class ResultFragment : DialogFragment() {
         result = arguments!!.getSerializable(KEY_RESULT) as ImportResult
     }
 
-    override fun onDismiss(dialog: DialogInterface?) {
+    override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         val activity = activity
         if (activity is DialogInterface) {
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt
index 16cde046..2efd5bde 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt
@@ -87,7 +87,7 @@ class ListEntriesFragment : ListFragment(), AdapterView.OnItemClickListener {
     }
 
     override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-        val entry = listAdapter.getItem(position) as EntryEntity
+        val entry = listAdapter?.getItem(position) as EntryEntity
         startActivity(JournalItemActivity.newIntent(context!!, account, info, entry.content))
     }
 
diff --git a/gradle.properties b/gradle.properties
index bca760ef..0c0632ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8 = false
 org.gradle.jvmargs=-Xmx2048M