arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-21 23:48:11 +00:00
Code Issues Releases Wiki Activity

Enable R8 and fix errors.

Browse Source
This commit is contained in:
Tom Hacohen 2020-09-06 11:51:22 +03:00
parent cf2198b1b8
commit c90bf78dc5
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/etesync/syncadapter/ui/AccountListFragment.kt
View File

@ -47,7 +47,7 @@ class AccountListFragment : ListFragment(), LoaderManager.LoaderCallbacks<Array<
} }
override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) { 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) val intent = Intent(context, AccountActivity::class.java)
intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account) intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)

2
app/src/main/java/com/etesync/syncadapter/ui/CollectionMembersListFragment.kt
View File

@ -104,7 +104,7 @@ class CollectionMembersListFragment : ListFragment(), AdapterView.OnItemClickLis
} }
override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) { 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!!) AlertDialog.Builder(activity!!)
.setIcon(R.drawable.ic_info_dark) .setIcon(R.drawable.ic_info_dark)

6
app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportActivity.kt
View File

@ -103,7 +103,7 @@ class ImportActivity : BaseActivity(), SelectImportMethod, ResultFragment.OnImpo
private var mSelectImportMethod: SelectImportMethod? = null private var mSelectImportMethod: SelectImportMethod? = null
override fun onAttach(context: Context?) { override fun onAttach(context: Context) {
super.onAttach(context) super.onAttach(context)
// This makes sure that the container activity has implemented // This makes sure that the container activity has implemented
// the callback interface. If not, it throws an exception // 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) super.onAttach(activity)
// This makes sure that the container activity has implemented // This makes sure that the container activity has implemented
// the callback interface. If not, it throws an exception // the callback interface. If not, it throws an exception
try { try {
mSelectImportMethod = activity as SelectImportMethod? mSelectImportMethod = activity as SelectImportMethod?
} catch (e: ClassCastException) { } catch (e: ClassCastException) {
throw ClassCastException(activity!!.toString() + " must implement MyInterface ") throw ClassCastException(activity.toString() + " must implement MyInterface ")
} }
} }

2
app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt
View File

@ -22,7 +22,7 @@ class ResultFragment : DialogFragment() {
result = arguments!!.getSerializable(KEY_RESULT) as ImportResult result = arguments!!.getSerializable(KEY_RESULT) as ImportResult
} }
override fun onDismiss(dialog: DialogInterface?) { override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog) super.onDismiss(dialog)
val activity = activity val activity = activity
if (activity is DialogInterface) { if (activity is DialogInterface) {

2
app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt
View File

@ -87,7 +87,7 @@ class ListEntriesFragment : ListFragment(), AdapterView.OnItemClickListener {
} }
override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) { 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)) startActivity(JournalItemActivity.newIntent(context!!, account, info, entry.content))
} }

1
gradle.properties
View File

@ -1,4 +1,3 @@
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
android.enableR8 = false
org.gradle.jvmargs=-Xmx2048M org.gradle.jvmargs=-Xmx2048M