Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class FileDetailFragmentStaticServerIT : AbstractIT() {
val fragment = FileDetailFragment.newInstance(oCFile, user, 0)
sut.addFragment(fragment)
sut.supportFragmentManager.executePendingTransactions()
fragment.fileDetailActivitiesFragment.populateList(activities as List<Any>?, true)
fragment.fileDetailActivitiesFragment?.populateList(activities as List<Any>?, true)
}

val screenShotName = createName(testClassName + "_" + "showDetailsActivities", "")
Expand All @@ -174,7 +174,7 @@ class FileDetailFragmentStaticServerIT : AbstractIT() {
val fragment = FileDetailFragment.newInstance(oCFile, user, 0)
sut.addFragment(fragment)
activity.supportFragmentManager.executePendingTransactions()
fragment.fileDetailActivitiesFragment.populateList(emptyList(), true)
fragment.fileDetailActivitiesFragment?.populateList(emptyList(), true)
}

val screenShotName = createName(testClassName + "_" + "showDetailsActivitiesNone", "")
Expand All @@ -193,8 +193,8 @@ class FileDetailFragmentStaticServerIT : AbstractIT() {
val fragment = FileDetailFragment.newInstance(oCFile, user, 0)
sut.addFragment(fragment)
sut.supportFragmentManager.executePendingTransactions()
fragment.fileDetailActivitiesFragment.disableLoadingActivities()
fragment.fileDetailActivitiesFragment.setErrorContent(
fragment.fileDetailActivitiesFragment?.disableLoadingActivities()
fragment.fileDetailActivitiesFragment?.setErrorContent(
targetContext.resources.getString(R.string.file_detail_activity_error)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2409,7 +2409,7 @@ class FileDisplayActivity :

val leftFragment = this.leftFragment
if (leftFragment is FileDetailFragment) {
leftFragment.getFileDetailActivitiesFragment().reload()
leftFragment.fileDetailActivitiesFragment?.reload()
}
} else {
SnackbarUtil.show(this, R.string.file_version_restored_error)
Expand Down
Loading
Loading