Skip to content

Commit 3ff8fea

Browse files
tobiasKaminskytobiasKaminsky
authored
Merge branch 'master' into add-attributes-to-oc-share
2 parents 1c1a335 + 41ff437 commit 3ff8fea

8 files changed

Lines changed: 47 additions & 10 deletions

File tree

‎.github/workflows/assemble.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
with:
2323
distribution: "temurin"
2424
java-version: 17
25-
- uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
25+
- uses: gradle/actions/wrapper-validation@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
2626
- name: Setup JVM options
2727
run: |
2828
mkdir -p "$HOME/.gradle"
2929
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
3030
- name: Setup Gradle
31-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
31+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3232
- name: Assemble
3333
run: ./gradlew assemble

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
46+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 17
@@ -57,4 +57,4 @@ jobs:
5757
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5858
./gradlew assembleDebug
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
60+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
45+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
4646
with:
4747
sarif_file: results.sarif

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
buildscript {
1414
ext {
15-
kotlin_version = '2.1.20'
15+
kotlin_version = '2.1.21'
1616
jacoco_version = '0.8.13'
1717
}
1818
}

‎library/src/androidTest/java/com/owncloud/android/lib/common/operations/RemoveShareIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testRemoveShare() throws IOException {
4444
false,
4545
"", 1).execute(client);
4646

47-
assertTrue(result.isSuccess());
47+
assertTrue(result.getLogMessage(), result.isSuccess());
4848

4949
OCShare ocShare = result.getResultData().get(0);
5050

‎library/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
1818
import com.owncloud.android.lib.resources.status.NextcloudVersion
1919
import com.owncloud.android.lib.resources.status.OCCapability
2020
import junit.framework.TestCase.assertEquals
21+
import junit.framework.TestCase.assertTrue
2122
import org.junit.Before
2223
import org.junit.Test
2324

@@ -102,7 +103,7 @@ class FilesDownloadLimitIT : AbstractIT() {
102103
1
103104
).execute(client)
104105

105-
assert(result.isSuccess)
106+
assertTrue(result.getLogMessage(), result.isSuccess)
106107
val share = result.resultData.first()
107108
assert(share.token != null)
108109
return share

‎library/src/androidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,15 @@ public void testSetTwitter() {
133133
RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(nextcloudClient);
134134
assertTrue(userInfo.isSuccess());
135135
String oldValue = userInfo.getResultData().getTwitter();
136+
String newValue = "Nextclouders";
136137

137138
// set
138-
assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, "@Nextclouders")
139+
assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, newValue)
139140
.execute(nextcloudClient).isSuccess());
140141

141142
userInfo = new GetUserInfoRemoteOperation().execute(nextcloudClient);
142143
assertTrue(userInfo.isSuccess());
143-
assertEquals("@Nextclouders", userInfo.getResultData().getTwitter());
144+
assertEquals(newValue, userInfo.getResultData().getTwitter());
144145

145146
// reset
146147
assertTrue(new SetUserInfoRemoteOperation(SetUserInfoRemoteOperation.Field.TWITTER, oldValue)

‎library/src/main/res/values-fr/strings.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="account_not_new">Compte déjà existant lors de la création d\'un nouveau</string>
4+
<string name="account_not_the_same">Authentifié avec un compte différent de celui qui effectue la mise à jour</string>
5+
<string name="bad_oc_version">Aucune version valide de Nextcloud n\'a été trouvée sur le serveur</string>
6+
<string name="connect_timeout_exception">Exception de délai de connexion</string>
7+
<string name="exception_using_account">Exception lors de l\'utilisation du compte</string>
8+
<string name="file_locked">Le fichier est actuellement verrouillé par un autre utilisateur ou processus</string>
9+
<string name="file_not_found">Le fichier local n\'existe pas</string>
10+
<string name="http_violation">Violation HTTP</string>
11+
<string name="instance_not_configured">Le serveur Nextcloud n\'est pas configuré !</string>
12+
<string name="invalid_character_in_name">Le nom de fichier contient un caractère interdit</string>
13+
<string name="json_exception">Exception JSON</string>
14+
<string name="local_storage_full">Stockage local plein</string>
15+
<string name="local_storage_not_moved">Erreur lors du déplacement du fichier vers le répertoire final</string>
16+
<string name="malformed_url_exception">Exception d\'URL mal formée</string>
17+
<string name="message_install_client_cert">Souhaitez-vous installer un certificat client TLS \?</string>
18+
<string name="no_network_connection">Aucune connexion réseau</string>
19+
<string name="notification_channel_name">Connexion à Nextcloud</string>
20+
<string name="notification_message_select_client_cert">Sélectionnez le certificat du client pour %1$s : %2$d</string>
21+
<string name="notification_title_select_client_cert">Sélectionner un certificat client</string>
22+
<string name="operation_cancelled">Opération annulée par l\'appelant.</string>
23+
<string name="operation_cancelled_by_the_caller">Opération annulée par l\'appelant.</string>
24+
<string name="operation_finished_http_code">Opération terminée avec le code d\'état HTTP %1$d (%2$s)</string>
25+
<string name="socket_exception">Exception de socket</string>
26+
<string name="socket_timeout_exception">Exception d\'expiration du délai de socket</string>
27+
<string name="ssl_exception">Exception SSL</string>
28+
<string name="ssl_recoverable_exception">Exception récupérable SSL</string>
29+
<string name="sync_conflict">Conflit de synchronisation</string>
30+
<string name="title_no_client_cert">Aucun certificat client n\'a été trouvé</string>
31+
<string name="unexpected_exception">Exception inattendue</string>
32+
<string name="unexpected_webdav_exception">Exception WebDAV inattendue</string>
33+
<string name="unknown_host_exception">Exception d\'hôte inconnu</string>
34+
<string name="unrecovered_transport_exception">Exception de transport non récupérée</string>
35+
</resources>

0 commit comments

Comments
 (0)