Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 1a96dbe0 authored by David Luhmer's avatar David Luhmer Committed by GitHub
Browse files

Merge branch 'master' into minor-refactoring



Signed-off-by: default avatarDavid Luhmer <david-dev@live.de>
parents 154ff5cc 867e07a1
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -304,6 +304,10 @@ Once the user clicks on "Allow" in the login dialog, the Nextcloud Files App wil
- [Nextcloud Deck app](https://github.com/stefan-niedermann/nextcloud-deck/)
  - [API](https://github.com/stefan-niedermann/nextcloud-deck/blob/master/app/src/main/java/it/niedermann/nextcloud/deck/api/DeckAPI.java)
  - [Login](https://github.com/stefan-niedermann/nextcloud-deck/blob/master/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java#L77)
- [Nextcloud Bookmarks app](https://gitlab.com/bisada/OCBookmarks)
  - [API](https://gitlab.com/bisada/OCBookmarks/-/blob/master/app/src/main/java/org/schabi/ocbookmarks/REST/OCBookmarksRestConnector.java#L42)
  - [Login](https://gitlab.com/bisada/OCBookmarks/-/blob/master/app/src/main/java/org/schabi/ocbookmarks/MainActivity.java#L261)


## Troubleshooting

+1 −1
Original line number Diff line number Diff line
buildscript {
    ext {
        kotlin_version = '1.7.22'
        kotlin_version = '1.8.10'
    }
    repositories {
        google()
+5 −5
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ dependencies {
    implementation "androidx.appcompat:appcompat:1.5.1"
    implementation 'androidx.annotation:annotation:1.5.0'
    implementation 'androidx.core:core:1.9.0'
    implementation 'androidx.fragment:fragment:1.5.4'
    implementation 'androidx.fragment:fragment:1.5.5'

    implementation 'com.google.android.material:material:1.7.0'

    compileOnly "org.projectlombok:lombok:1.18.24"
    compileOnly "org.projectlombok:lombok:1.18.26"
    annotationProcessor "org.projectlombok:lombok:1.18.24"

    api 'com.google.code.gson:gson:2.9.1'
    api 'com.google.code.gson:gson:2.10.1'

    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'

@@ -114,12 +114,12 @@ dependencies {
    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'

    ktlint "com.pinterest:ktlint:0.47.1"
    ktlint "com.pinterest:ktlint:0.48.2"

    // Required for local unit tests (JUnit 4 framework)
    testImplementation 'junit:junit:4.13.2'
    // required if you want to use Mockito for unit tests
    testImplementation 'org.mockito:mockito-core:4.9.0'
    testImplementation 'org.mockito:mockito-core:5.1.1'
}

afterEvaluate {
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
    <string name="nextcloud_files_app_account_not_found_message">Профилът не е намерен в приложението Nextcloud Файлове</string>

    <string name="nextcloud_files_app_account_permission_not_granted_title">Грешка</string>
    <string name="nextcloud_files_app_account_permission_not_granted_message">Трябва да приемете исканите права, за да използвате функцията за Единократна идентификация.</string>
    <string name="nextcloud_files_app_account_permission_not_granted_message">Трябва да приемете исканите права, за да използвате функцията за Еднократна идентификация.</string>

    <string name="nextcloud_http_request_failed_title">Грешка</string>
    <string name="nextcloud_http_request_failed_message" formatted="true">HTTP заявката беше неуспешна с HTTP статус-код: %1$d</string>
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
    <string name="current_account_not_found_exception_message">Ο επιλεγμένος λογαριασμός δεν βρέθηκε. Κάτι πήγε στραβά.</string>

    <string name="token_mismatch_title">Σφάλμα</string>
    <string name="token_mismatch_message">Το αναγνωριστικό πιστοποίησης που παρείχατε δεν είναι δωστό ή το όνομα πακέτου δεν επιτρέπετε για αυτή την ενέργεια</string>
    <string name="token_mismatch_message">Το αναγνωριστικό πιστοποίησης που παρείχατε δεν είναι σωστό ή το όνομα πακέτου δεν επιτρέπεται για αυτή την ενέργεια</string>

    <string name="nextcloud_files_app_not_installed_title">Σφάλμα</string>
    <string name="nextcloud_files_app_not_installed_message" formatted="true">Η εφαρμογή Αρχεία Nextcloud δεν είναι εγκατεστημένη. Παρακαλούμε εγκαταστήστε την: %1$s</string>
Loading