Skip to content

feat(unify): account handling #3438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(unify): account handling #3438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2325e11
feat(account): unify
alperozturk96 Nov 13, 2026
36600da
fix threading
alperozturk96 Nov 13, 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
25 changes: 25 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/main/EcosystemAccountMatcher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
package it.niedermann.owncloud.notes.main

import com.nextcloud.android.common.core.utils.AccountNameUtils
import it.niedermann.owncloud.notes.persistence.entity.Account

object EcosystemAccountMatcher {

@JvmStatic
fun find(accounts: List<Account>, receivedAccountName: String): Account? =
accounts.firstOrNull { it.accountName == receivedAccountName }
?: accounts.firstOrNull { it.isSameAccount(receivedAccountName) }

private fun Account.isSameAccount(receivedAccountName: String): Boolean {
val receivedUser = AccountNameUtils.getUserPart(receivedAccountName)
val isSameUser = receivedUser.equals(AccountNameUtils.getUserPart(accountName), ignoreCase = true) ||
receivedUser.equals(userName, ignoreCase = true)
return isSameUser && AccountNameUtils.isSameServer(url, AccountNameUtils.getServerPart(receivedAccountName))
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ private void handleEcosystemIntent(Intent intent) {
ecosystemManager.receiveAccount(intent, new AccountReceiverCallback() {
@Override
public void onAccountReceived(@NotNull String accountName) {
final var account = mainViewModel.getAccountByName(accountName);
final var account = mainViewModel.findEcosystemAccount(accountName);
if (account != null) {
onAccountChosen(account);
} else {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ public LiveData<Account> getCurrentAccount() {
return distinctUntilChanged(currentAccount);
}

public Account getAccountByName(String accountName) {
return repo.getAccountByName(accountName);
public Account findEcosystemAccount(String accountName) {
return EcosystemAccountMatcher.find(repo.getAccounts(), accountName);
}

public void postCurrentAccount(@NonNull Account account) {
Expand Down
9 changes: 2 additions & 7 deletions app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,8 @@ class NoteShareFragment : BrandedFragment(), ShareeListAdapterListener, NoteShar
return true
}

val share = shares[0]
val ownerDisplayName = share.ownerDisplayName
return TextUtils.isEmpty(ownerDisplayName) || account!!.accountName
.split("@".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[0].equals(
ownerDisplayName,
ignoreCase = true
)
val ownerId = shares[0].userId
return ownerId.isNullOrEmpty() || ownerId.equals(account!!.userName, ignoreCase = true)
}

private fun setShareWithYou() {
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/it/niedermann/owncloud/notes/share/helper/UsersAndGroupsSearchProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import android.net.Uri;
import android.provider.BaseColumns;

import com.nextcloud.android.common.core.utils.AccountNameUtils;
import com.owncloud.android.lib.resources.shares.GetShareesRemoteOperation;
import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.resources.users.Status;
Expand Down Expand Up @@ -151,10 +152,9 @@ public Cursor searchForUsersOrGroups(String userQuery, boolean isFederationShare
displayName = name;
subline = context.getString(R.string.remote);
} else {
String[] uriSplitted = shareWith.split("@");
displayName = name;
subline = context.getString(R.string.share_known_remote_on_clarification,
uriSplitted[uriSplitted.length - 1]);
AccountNameUtils.getServerPart(shareWith));
}
}
break;
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
kotlinVersion = '2.4.21'
commonsVersion = '2.4.1'
androidCommonsVersion = '1.1.1'
nextcloudAndroidCommonLib = "0.34.0"
nextcloudAndroidCommonLib = "580a84868ae2af10b2ace13dadc083f166047493"
singleSignOnVersion = "1.3.5"
}
repositories {
Expand Down
24 changes: 24 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14478,6 +14478,14 @@
<sha256 value="b37ee0968ac414cc15976c53f79aa3f477694b3071590e31d6a0246e21b44b17" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="core" version="580a84868ae2af10b2ace13dadc083f166047493">
<artifact name="core-580a84868ae2af10b2ace13dadc083f166047493.aar">
<sha256 value="4b4f6d5ef61b0f69d13617b7cc6e73e2d9fcd97d20de961c6b641d2d804b8b26" origin="Generated by Gradle"/>
</artifact>
<artifact name="core-580a84868ae2af10b2ace13dadc083f166047493.module">
<sha256 value="40f113572819edd79f53a89a6141aae458ab3d73e91031328ca8a428b03ba89b" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="core" version="ab22edd0cf">
<artifact name="core-ab22edd0cf.aar">
<sha256 value="b3f49702e6022549a2a48083c7720ffac98af72ae383beab2b79f7ebeac6a6cf" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -14754,6 +14762,14 @@
<sha256 value="c90c9703f3fc8ea945452b3d0e2981b40c2bbd4d6dede7028ee97b071053fad6" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="580a84868ae2af10b2ace13dadc083f166047493">
<artifact name="material-color-utilities-580a84868ae2af10b2ace13dadc083f166047493.jar">
<sha256 value="b901a9fdcc750cd912686ce7cdcadc03ceec7391ca0cdbddc356de3966672c9a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="material-color-utilities-580a84868ae2af10b2ace13dadc083f166047493.module">
<sha256 value="c10133f63cb0436499a05e94eed5cca480e77fc7066f7cc54bfabdbd3c5d5dfa" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="ab22edd0cf">
<artifact name="material-color-utilities-ab22edd0cf.jar">
<sha256 value="1bd3fd83697314ba2a0628eb139cab7a4664f3c0b190c87ccd5b02b81e90dd26" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -15026,6 +15042,14 @@
<sha256 value="d99d03e0c42cbec98256314c22b277b78592bc09961c61a997e0ecbc4f39f6a2" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="ui" version="580a84868ae2af10b2ace13dadc083f166047493">
<artifact name="ui-580a84868ae2af10b2ace13dadc083f166047493.aar">
<sha256 value="692c9949ac9b0f3625aaf76618f9a51a23815793204c6a1ee0208c8f3a5de88e" origin="Generated by Gradle"/>
</artifact>
<artifact name="ui-580a84868ae2af10b2ace13dadc083f166047493.module">
<sha256 value="3a6d68708442ba35170b40194357572daeaf4fa73f24c53858b9a4a7d981395a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="ui" version="ab22edd0cf">
<artifact name="ui-ab22edd0cf.aar">
<sha256 value="57a52f8bea07c3a80c81c4c66fa60d91393cfc28e823bc910e9c1a99b4d416e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down
Loading