Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b00b6b2
Added menu item
daniele-verducci Oct 6, 2026
4720d0c
Item detail layout and resources
daniele-verducci Oct 6, 2026
9dd2668
Stubbed activities fragment, implemented ItemDetailsActivity with pag…
daniele-verducci Oct 6, 2026
2a1789f
Replaced menu items
daniele-verducci Oct 6, 2026
409e130
Manifest
daniele-verducci Oct 6, 2026
7c9022b
wip
daniele-verducci Oct 6, 2026
ecedef2
Converted NoteShareActivity.java to Kotlin (automated conversion, no …
daniele-verducci Oct 12, 2026
7ad562b
Refactored NoteShareActivity to be more kotlin idiomatic
daniele-verducci Oct 12, 2026
78a3b9d
Converted NoteShareActivity to fragment
daniele-verducci Oct 12, 2026
8e6cb65
Removed stale code
daniele-verducci Oct 12, 2026
b7a5d57
Cleanup: the searchable <meta-data> wasn't present in the activity de…
daniele-verducci Oct 12, 2026
83b2a52
WIP passing required parameters
daniele-verducci Oct 12, 2026
4a7bad1
Wired new details screen in place of old share, preserved system shar…
daniele-verducci Oct 13, 2026
f1f9590
Moved collectNoteContents to worker thread to fix lint error (already…
daniele-verducci Oct 13, 2026
fb0cc62
Fixed view name
daniele-verducci Oct 13, 2026
c232c74
Header content, tabs icons, theming
daniele-verducci Oct 13, 2026
5aeb155
Actionbar
daniele-verducci Oct 13, 2026
0f8f92d
Removed size (we don't have such info right now)
daniele-verducci Oct 13, 2026
2fdb54e
Stubbed activities API and repository
daniele-verducci Oct 13, 2026
2be15a7
Missing copyright headers
daniele-verducci Oct 14, 2026
96c9bfb
Activities list layout
daniele-verducci Oct 14, 2026
9f0a086
Implemented activities APIs
daniele-verducci Oct 14, 2026
9968ae8
Implemented pagination for activities API
daniele-verducci Oct 14, 2026
c041832
Implemented activities list, fix activity optional fields
daniele-verducci Oct 14, 2026
4141dcb
Fix
daniele-verducci Oct 14, 2026
eb79668
Empty list
daniele-verducci Oct 14, 2026
d0a1a10
Pull-to-refresh
daniele-verducci Oct 14, 2026
9f739d0
List incremental loading
daniele-verducci Oct 14, 2026
0448a85
WIP icons in activities list
daniele-verducci Oct 14, 2026
cc00f90
Prevent Glide to rewrite the url and point to the WebDAV storage for …
daniele-verducci Oct 15, 2026
2c6707d
Converted CustomAppGlideModule to kotlin
daniele-verducci Oct 15, 2026
e329779
More kotlin-idiomatic CustomAppGlideModule
daniele-verducci Oct 15, 2026
6ab6d17
Added SVG transcoder to CustomAppGlideModule (note: added dependency …
daniele-verducci Oct 15, 2026
d8a5ebb
Added missing SvgDecoder (from Files app)
daniele-verducci Oct 15, 2026
a4775b2
Fixed Glide module not loaded since it was converted to Kotlin few co…
daniele-verducci Oct 15, 2026
fa63072
gradlew --write-verification-metadata
daniele-verducci Oct 15, 2026
657b0e4
Implemented Versions API (note: added dependency jackrabbit-webdav, a…
daniele-verducci Oct 16, 2026
547ee20
Implemented Versions repo
daniele-verducci Oct 16, 2026
6bcf17b
Fixed Versions call failing because unauthenticated
daniele-verducci Oct 16, 2026
da4c638
Implemented Activity/Versions ordered merging and updated adapter to …
daniele-verducci Oct 19, 2026
268e728
Fixed activity pagination (fileVersion endpoint donesn't have paginat…
daniele-verducci Oct 19, 2026
b55f19e
Applied branding color
daniele-verducci Oct 19, 2026
9619b6a
List loading/refresh
daniele-verducci Oct 19, 2026
3480cde
Restore version action icon
daniele-verducci Oct 19, 2026
3b9a44e
Implemented version restore, but MOVE Dav method is blocked by SSO li…
daniele-verducci Oct 19, 2026
53c8867
Updated MOVE WebDAV request call to SSO lib, user-readable error in c…
daniele-verducci Oct 20, 2026
9789abd
Refactored entire data fetch and presentation
daniele-verducci Oct 20, 2026
e944050
Fixes
daniele-verducci Oct 20, 2026
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
5 changes: 4 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

apply plugin: 'com.android.application'
apply plugin: 'com.google.devtools.ksp'

android {
namespace = 'it.niedermann.owncloud.notes'
Expand Down Expand Up @@ -130,6 +131,7 @@ dependencies {
implementation ('commons-httpclient:commons-httpclient:3.1') {
exclude group: 'commons-logging', module: 'commons-logging'
}
implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5'

implementation("com.github.nextcloud:android-library:2.26.0") {
exclude group: 'org.ogce', module: 'xpp3'
Expand All @@ -155,7 +157,8 @@ dependencies {

// Glide
implementation "com.github.bumptech.glide:glide:$glideVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
ksp "com.github.bumptech.glide:ksp:$glideVersion"
implementation "com.caverock:androidsvg-aar:1.4"

// Android X
implementation 'androidx.appcompat:appcompat:1.8.0'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</activity>

<activity
android:name=".share.NoteShareActivity" />
android:name=".itemdetails.ItemDetailsActivity" />

<activity
android:name=".share.NoteShareDetailActivity" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package it.niedermann.owncloud.notes.activities

import android.content.Context
import android.util.Log
import androidx.lifecycle.LifecycleCoroutineScope
import com.nextcloud.android.sso.helper.SingleAccountHelper
import it.niedermann.owncloud.notes.activities.ActivitiesFragment.Companion.TAG
import it.niedermann.owncloud.notes.activities.adapter.ActivitiesData
import it.niedermann.owncloud.notes.activities.repository.ActivitiesRepository
import it.niedermann.owncloud.notes.activities.repository.ActivitiesResult
import it.niedermann.owncloud.notes.activities.repository.VersionsRepository
import it.niedermann.owncloud.notes.activities.repository.VersionsResult
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

class ActivitiesDataProvider (
val context: Context,
val lifecycleScope: LifecycleCoroutineScope,
val noteId: Long,
val listener: OnPageFetchedListener
) {
val data = ActivitiesData()
private var job: Job? = null

private val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(context)
private val activitiesRepo = ActivitiesRepository(context, ssoAccount)
private val versionsRepo = VersionsRepository(context, ssoAccount)

fun fetchNextPage() {
// Versions are non-paginated: fetch only once
val fetchVersions = data.isEmpty()
job?.cancel()
job = lifecycleScope.launch {
val (activitiesResult, versionsResult) = withContext(Dispatchers.IO) {
val activities = async { activitiesRepo.fetchActivities(noteId, data.activitiesLastGiven) }
val versions = async {
if (fetchVersions) versionsRepo.fetchVersions(noteId)
else VersionsResult.Success(listOf())
}
activities.await() to versions.await()
}

when {
activitiesResult is ActivitiesResult.Success && versionsResult is VersionsResult.Success -> {
data.activitiesLastGiven = activitiesResult.lastGiven
data.activities.addAll(activitiesResult.activities)
data.versions.addAll(versionsResult.versions)
listener.onPageFetched()
return@launch
}

activitiesResult is ActivitiesResult.Failed -> Log.e(TAG, "Fetching activities failed")

versionsResult is VersionsResult.Failed -> Log.e(TAG, "Fetching versions failed")
}

listener.onPageFetchError()
}
}

fun reset() {
data.activities.clear()
data.versions.clear()
data.activitiesLastGiven = null
}

interface OnPageFetchedListener {
fun onPageFetched()
fun onPageFetchError()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
package it.niedermann.owncloud.notes.activities

import android.annotation.SuppressLint
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.lifecycle.lifecycleScope
import com.google.android.material.snackbar.Snackbar
import com.nextcloud.android.sso.helper.SingleAccountHelper
import com.owncloud.android.lib.resources.files.model.FileVersion
import it.niedermann.owncloud.notes.R
import it.niedermann.owncloud.notes.activities.adapter.ActivityListAdapter
import it.niedermann.owncloud.notes.activities.adapter.OnActivityClickListener
import it.niedermann.owncloud.notes.activities.model.Activity
import it.niedermann.owncloud.notes.activities.repository.ActivitiesRepository
import it.niedermann.owncloud.notes.activities.repository.RestoreVersionsResult
import it.niedermann.owncloud.notes.activities.repository.VersionsRepository
import it.niedermann.owncloud.notes.branding.BrandedFragment
import it.niedermann.owncloud.notes.branding.BrandedSnackbar
import it.niedermann.owncloud.notes.branding.BrandingUtil
import it.niedermann.owncloud.notes.databinding.FragmentActivitiesBinding
import it.niedermann.owncloud.notes.persistence.entity.Account
import it.niedermann.owncloud.notes.persistence.entity.Note
import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

/*
* Nextcloud Notes - Android Client
*
* SPDX-FileCopyrightText: 2026 Daniele Verducci <daniele.verducci@nextcloud.com>
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
class ActivitiesFragment : BrandedFragment(), OnActivityClickListener, ActivitiesDataProvider.OnPageFetchedListener {

lateinit var binding : FragmentActivitiesBinding
private lateinit var note: Note
private lateinit var account: Account
private lateinit var adapter: ActivityListAdapter

private lateinit var activityDataProvider: ActivitiesDataProvider

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
binding = FragmentActivitiesBinding.inflate(inflater, container, false)

initializeArguments()
initializeList()

return binding.root
}

private fun initializeArguments() {
val bundler = arguments
note = bundler.getSerializableArgument(ARG_NOTE, Note::class.java)
?: throw IllegalArgumentException("Argument $ARG_NOTE is mandatory")
account = bundler.getSerializableArgument(ARG_ACCOUNT, Account::class.java)
?: throw IllegalArgumentException("Argument $ARG_ACCOUNT is mandatory")
}

private fun initializeList() {
val id = note.remoteId
if (id == null) {
Log.e(TAG, "Unable to load list: note has no remoteId")
return
}

activityDataProvider = ActivitiesDataProvider(
requireContext(),
lifecycleScope,
id,
this
)
adapter = ActivityListAdapter(
requireContext(),
this
)
binding.list.adapter = adapter
binding.swipeContainingList.setOnRefreshListener {
// Reload list
activityDataProvider.reset()
activityDataProvider.fetchNextPage()
}

activityDataProvider.fetchNextPage()
}

override fun applyBrand(color: Int) {
adapter.applyBrand(color)
val util = BrandingUtil.of(color, requireContext())
util.platform.colorViewBackground(binding.getRoot())
util.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
}

override fun onActivityItemClick(activity: Activity) {
// No action
}

override fun onVersionItemClick(version: FileVersion) {
// Restore the version
val ssoAccount =
SingleAccountHelper.getCurrentSingleSignOnAccount(requireContext())
val repository = VersionsRepository(requireContext(), ssoAccount)
lifecycleScope.launch(Dispatchers.IO) {
val result = repository.restoreVersion(version)
withContext(Dispatchers.Main) {
val message =
if (result == RestoreVersionsResult.Success)
R.string.version_restored
else
R.string.version_restore_failed

BrandedSnackbar.make(binding.root, message, Snackbar.LENGTH_LONG).show()

// Reload list
if (result == RestoreVersionsResult.Success) {
activityDataProvider.reset()
activityDataProvider.fetchNextPage()
}
}
}
}

override fun lastActivityReached() {
if (adapter.itemCount < ActivitiesRepository.PAGE_SIZE)
return
activityDataProvider.fetchNextPage()
}

@SuppressLint("NotifyDataSetChanged")
override fun onPageFetched() {
binding.swipeContainingList.isRefreshing = false
binding.emptyList.visibility = View.GONE
adapter.items.clear()
adapter.items.addAll(
activityDataProvider.data.getAggregatedList(requireContext())
)
adapter.notifyDataSetChanged()
}

override fun onPageFetchError() {
binding.swipeContainingList.isRefreshing = false
if (adapter.items.isEmpty()) binding.emptyList.visibility = View.VISIBLE
BrandedSnackbar.make(binding.root, R.string.activities_error, Snackbar.LENGTH_SHORT).show()
}

companion object {
val TAG = ActivitiesFragment::class.simpleName
const val ARG_NOTE = "NOTE"
const val ARG_ACCOUNT = "ACCOUNT"

fun newInstance(note: Note, account: Account) : ActivitiesFragment {
val f = ActivitiesFragment()

val bundle = Bundle()
bundle.putSerializable(ARG_NOTE, note)
bundle.putSerializable(ARG_ACCOUNT, account)

f.arguments = bundle
return f
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package it.niedermann.owncloud.notes.activities.adapter

import android.content.Context
import com.owncloud.android.lib.resources.files.model.FileVersion
import it.niedermann.owncloud.notes.activities.model.Activity

class ActivitiesData {
val activities = arrayListOf<Activity>()
val versions = arrayListOf<FileVersion>()
var activitiesLastGiven: Long? = null

fun getAggregatedList(context: Context) : List<ActivityListItem> {
val items = arrayListOf<ActivityListItem>()
items.addAll(
activities.map { ActivityListItem(context, it) }
)
items.addAll(
versions.map { ActivityListItem(context, it) }
)
items.sort()
return items
}

fun isEmpty() : Boolean = activities.isEmpty() && versions.isEmpty()
}
Loading