Merge branch 'feature/cache-fix' into 'develop'

Fixed cache space cleanup

Closes #1284

See merge request ultrasonic/ultrasonic!1206

.circleci/config.yml

@@ -1,143 +0,0 @@
-version: 3
-jobs:
-  build:
-    docker:
-      - image: circleci/android:api-30
-    working_directory: ~/ultrasonic
-    environment:
-      JVM_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v2-ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
-            - v2-ultrasonic-{{ .Branch }}
-            - v2-ultrasonic
-      - run:
-          name: configure gradle.properties for CI building
-          command: |
-            sed -i '/^org.gradle.jvmargs/d' gradle.properties
-            sed -i 's/^org.gradle.daemon=true/org.gradle.daemon=false/g' gradle.properties
-      - run:
-          name: checkstyle
-          command: ./gradlew -Pqc ktlintCheck
-      - run:
-          name: static analysis
-          command: ./gradlew -Pqc detekt
-      - run:
-          name: build debug
-          command: ./gradlew assembleDebug
-      - run:
-          name: unit-tests
-          command: |
-            ./gradlew ciTest testDebugUnitTest
-            ./gradlew jacocoFullReport
-      - run:
-          name: lint
-          command: ./gradlew :ultrasonic:lintRelease
-      - run:
-          name: build
-          command: ./gradlew buildRelease
-      - run:
-          name: assemble release
-          command: ./gradlew assembleRelease
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key:  v1-ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
-      - store_artifacts:
-          path: ultrasonic/build/reports
-          destination: reports
-      - store_artifacts:
-          path: subsonic-api/build/reports
-          destination: reports
-      - store_artifacts:
-          path: build/reports/jacoco/jacocoFullReport/
-  push_translations:
-    docker:
-      - image: circleci/python:3.6
-    working_directory: ~/ultrasonic
-    steps:
-      - checkout
-      - run:
-          name: install transifex client
-          command: |
-            python -m venv ~/venv
-            . ~/venv/bin/activate
-            pip install transifex-client
-      - run:
-          name: configure transifex client
-          command: echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = api\npassword = '"${TRANSIFEX_PASSWORD}"$'\n' > ~/.transifexrc
-      - run:
-          name: push changes in translation files
-          command: |
-            . ~/venv/bin/activate
-            tx push -s
-  generate_signed_apk:
-    docker:
-      - image: circleci/android:api-30
-    working_directory: ~/ultrasonic
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v2-ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
-            - v2-ultrasonic-{{ .Branch }}
-            - v2-ultrasonic
-      - run:
-          name: decrypt ultrasonic-keystore
-          command: openssl aes-256-cbc -K ${ULTRASONIC_KEYSTORE_KEY} -iv ${ULTRASONIC_KEYSTORE_IV} -in ultrasonic-keystore.enc -out ultrasonic-keystore -d
-      - run:
-          name: build release apk
-          command: ./gradlew build assembleRelease
-      - run:
-          name: sign release apk
-          command: |
-            export PATH="${JAVA_HOME}/bin:${PATH}"
-            mkdir -p /tmp/ultrasonic-release
-            ${ANDROID_HOME}/build-tools/30.0.0/zipalign -v 4 ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
-            ${ANDROID_HOME}/build-tools/30.0.0/apksigner sign --verbose --ks ~/ultrasonic/ultrasonic-keystore --ks-pass pass:${ULTRASONIC_KEYSTORE_STOREPASS} --key-pass pass:${ULTRASONIC_KEYSTORE_KEYPASS} /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
-            ${ANDROID_HOME}/build-tools/30.0.0/apksigner verify --verbose /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
-      - persist_to_workspace:
-          root: /tmp/ultrasonic-release
-          paths:
-            - ultrasonic-*.apk*
-  publish_github_signed_apk:
-    docker:
-      - image: circleci/golang
-    steps:
-      - attach_workspace:
-          at: /tmp/ultrasonic-release
-      - run:
-          name: install ghr
-          command: go get -v github.com/tcnksm/ghr
-      - run:
-          name: publish release on github tag
-          command: ghr -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} ${CIRCLE_TAG} /tmp/ultrasonic-release
-workflows:
-  version: 2
-  build_and_push_translations:
-    jobs:
-      - build
-      - push_translations:
-          requires:
-            - build
-          filters:
-            branches:
-              only:
-                - develop
-      - generate_signed_apk:
-          filters:
-            tags:
-              only: /^[0-9]+(\.[0-9]+)*/
-            branches:
-              ignore: /.*/
-      - publish_github_signed_apk:
-          requires:
-            - generate_signed_apk
-          filters:
-            tags:
-              only: /^[0-9]+(\.[0-9]+)*/
-            branches:
-              ignore: /.*/
-

.editorconfig

@@ -0,0 +1,2 @@
+[*.{kt,kts}]
+ktlint_code_style = android_studio

.github/dependabot.yml

@@ -1,15 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "gradle" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "monthly"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
-

.gitignore

@@ -18,6 +18,7 @@ out/
 
 # Gradle files
 .gradle/
+.kotlin/
 build/
 
 # Local configuration file (sdk path, etc)
@@ -39,6 +40,7 @@ captures/
 *.iml
 .idea/
 
+
 # Keystore files
 *.jks
 

.gitlab-ci.yml

@@ -0,0 +1,151 @@
+default:
+  image: registry.gitlab.com/ultrasonic/ci-android:1.2.0
+  cache: &global_cache
+    key:
+      files:
+        - gradle/wrapper/gradle-wrapper.properties
+    paths:
+      - .gradle/
+
+variables:
+  CACHE_FALLBACK_KEY: develop-protected
+  MEMORY_CONFIG: "-Xmx3200m -Xms256m -XX:MaxMetaspaceSize=1g"
+  MEMORY_CONFIG_DEBUG: "-Xmx3200m -Xms256m -XX:MaxMetaspaceSize=1g -verbose:gc -Xlog:gc*"
+  JVM_OPTS: ${MEMORY_CONFIG}
+  JAVA_TOOL_OPTIONS: ${MEMORY_CONFIG}
+  GRADLE_OPTS: ${MEMORY_CONFIG}
+  PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/Ultrasonic/${CI_COMMIT_TAG}"
+  PACKAGE_APK: "ultrasonic-${CI_COMMIT_TAG}.apk"
+  PACKAGE_APK_IDSIG: "ultrasonic-${CI_COMMIT_TAG}.apk.idsig"
+  GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle"
+  # The project id of https://gitlab.com/ultrasonic/ultrasonic/
+  ROOT_PROJECT_ID: 37671564
+
+stages:
+  - Check
+  - Build
+  - Sign APK
+  - Publish
+  - Release
+
+Check Style:
+  stage: Check
+  script: ./gradlew -Pqc ktlintCheck
+  cache:
+    # inherit all global cache settings
+    <<: *global_cache
+    policy: pull
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+Static Analysis:
+  stage: Check
+  script: ./gradlew -Pqc detekt
+  cache:
+    # inherit all global cache settings
+    <<: *global_cache
+    policy: pull
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+Lint:
+  stage: Check
+  script: ./gradlew :ultrasonic:lintRelease
+  cache:
+    # inherit all global cache settings
+    <<: *global_cache
+    policy: pull-push
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+Unit Tests:
+  stage: Check
+  script: ./gradlew ciTest testDebugUnitTest
+  cache:
+    # inherit all global cache settings
+    <<: *global_cache
+    policy: pull-push
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+Assemble Release:
+  stage: Build
+  script:
+    - sed -i 's/applicationId \"org.moire.ultrasonic\"/applicationId "org.moire.ultrasonic.gitlab"/' ultrasonic/build.gradle
+    - ./gradlew assembleRelease
+  artifacts:
+    name: ultrasonic-release-unsigned-${CI_COMMIT_SHA}
+    paths:
+      - ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
+
+# We generate a signed package for each commit to develop as well as when making a release.
+# Since the develop signed apk are not persistent they can be downloaded for around 3 weeks before Gitlab deletes them.
+Generate Signed APK:
+  stage: Sign APK
+  # We don't need the gradle cache here
+  cache: []
+  script:
+    - openssl aes-256-cbc -K ${ULTRASONIC_KEYSTORE_KEY} -iv ${ULTRASONIC_KEYSTORE_IV} -in ultrasonic-keystore.enc -out ultrasonic-keystore -d
+    - mkdir -p ${CI_PROJECT_DIR}/ultrasonic-release
+    - ${ANDROID_HOME}/build-tools/*/zipalign -v 4 ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk ${CI_PROJECT_DIR}/ultrasonic-release/${PACKAGE_APK}
+    - ${ANDROID_HOME}/build-tools/*/apksigner sign --verbose --ks ${CI_PROJECT_DIR}/ultrasonic-keystore --ks-pass pass:${ULTRASONIC_KEYSTORE_STOREPASS} --key-pass pass:${ULTRASONIC_KEYSTORE_KEYPASS} ${CI_PROJECT_DIR}/ultrasonic-release/${PACKAGE_APK}
+    - ${ANDROID_HOME}/build-tools/*/apksigner verify --verbose ${CI_PROJECT_DIR}/ultrasonic-release/${PACKAGE_APK}
+  artifacts:
+    name: $PACKAGE_APK
+    paths:
+      - ultrasonic-release/
+  rules:
+    # Run when releasing a new tag
+    - if: $CI_COMMIT_TAG && $CI_PROJECT_ID == $ROOT_PROJECT_ID
+    # Or when adding a new commit to develop (but never inside merge events)
+    - if: $CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_ID == $ROOT_PROJECT_ID && $CI_PIPELINE_SOURCE != "merge_request_event"
+      variables:
+        PACKAGE_APK: ultrasonic-${CI_COMMIT_SHA}.apk
+
+
+Publish Signed APK:
+  stage: Publish
+  image: curlimages/curl:latest
+  script:
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ultrasonic-release/${PACKAGE_APK} "${PACKAGE_REGISTRY_URL}/${PACKAGE_APK}"
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ultrasonic-release/${PACKAGE_APK_IDSIG} "${PACKAGE_REGISTRY_URL}/${PACKAGE_APK_IDSIG}"
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_PROJECT_ID == $ROOT_PROJECT_ID
+
+Release:
+  stage: Release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  script: |
+    release-cli create --name "Release ${CI_COMMIT_TAG}" --tag-name ${CI_COMMIT_TAG} \
+      --assets-link "{\"name\":\"${PACKAGE_APK}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${PACKAGE_APK}\"}" \
+      --assets-link "{\"name\":\"${PACKAGE_APK_IDSIG}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${PACKAGE_APK_IDSIG}\"}"
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_PROJECT_ID == $ROOT_PROJECT_ID
+
+RoboTest:
+  stage: Release
+  image: gcr.io/google.com/cloudsdktool/google-cloud-cli:latest
+  # We don't need the gradle cache here
+  cache: []
+  script:
+    - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
+    - gcloud auth activate-service-account --key-file .secure_files/firebase-key.json 
+    - gcloud firebase test android run --project ultrasonic-61089 --type robo --app ultrasonic-release/${PACKAGE_APK} --robo-directives click:button1= --device model=Nexus6,version=21,locale=en,orientation=portrait  --device model=Pixel3,version=28,locale=fr,orientation=landscape 
+  rules:
+    # Run when releasing a new tag
+    - if: $CI_COMMIT_TAG && $CI_PROJECT_ID == $ROOT_PROJECT_ID
+    # or when requested by using [ROBO] inside the commit message and merging to develop
+    # Would be nice to be able to run it in a MR as well, but currently not possible
+    # Because it would not have access to the protected keys.
+    - if: $CI_COMMIT_MESSAGE =~ /^\[ROBO\].*/ && $CI_PROJECT_ID == $ROOT_PROJECT_ID && $CI_COMMIT_REF_NAME == "develop" && $CI_PIPELINE_SOURCE != "merge_request_event"
+      variables:
+        PACKAGE_APK: ultrasonic-${CI_COMMIT_SHA}.apk
+

.gitlab/issue_templates/Default.md

@@ -0,0 +1,35 @@
+## Problem description
+
+Describe your problem here. Describe what you want to happen, and what
+happens if you try to do it. If you have a stack trace or any logs, please
+format them using Markdown triple backquote notation.
+
+### Steps to reproduce
+
+Describe how somebody else could observe the same behavior you do. Don't
+share here any logins and passwords!
+
+### Please provide a log!
+
+Many issues are hard to reproduce without a log file. Please enable logging by opening the setting and scrolling to the bottom.
+There you will find an option to activate loging and to export the file. Please note that the log might contain personal information,
+such as the name of the tracks you listened to. If you don't want to post it publicly, let us know, and we will find a way.
+
+
+## System information
+
+### Ultrasonic client
+
+ * **Ultrasonic version**: *version of the app*
+ * **Android version**: *Version of Android OS on the device*
+ * **Device info**: *Device manufacturer, model*
+
+### Server
+
+ * **Server name**: *Airsonic, Ampache, Supysonic...*
+ * **Server version**: *version of server software*
+ * **Protocol used**: *http or https (self certificate, letsencrypt...)*
+
+## Additional notes
+
+Include any extra notes here. Otherwise you may remove this section.

.gitlab/issue_templates/Enhancement.md

@@ -0,0 +1,32 @@
+## Motivation
+
+Describe here what motivated you to make this enhancement request. What is
+currently happening and what would you like to improve. If you have a stack
+trace or any logs, please format them using Markdown triple backquote
+notation.
+
+### Proposal
+
+Tell us in detail what you propose. How you want to achieve what you would
+like to improve.
+
+## System information
+
+Include this section only if you consider that is relevant to this ticket,
+otherwise you may remove it.
+
+### Ultrasonic client
+
+ * **Ultrasonic version**: *version of the app*
+ * **Android version**: *Version of Android OS on the device*
+ * **Device info**: *Device manufacturer, model*
+
+### Server
+
+ * **Server name**: *Airsonic, Ampache, Supysonic...*
+ * **Server version**: *version of server software*
+ * **Protocol used**: *http or https (self certificate, letsencrypt...)*
+
+## Additional notes
+
+Include any extra notes here. Otherwise you may remove this section.

.gitlab/issue_templates/Feature Request.md

@@ -0,0 +1,27 @@
+## Proposal
+
+Describe your proposed feature request here. Use this template only to
+request a new feature that does not exist in Ultrasonic. If you are
+requesting an enhancement to a current feature, please use the enhancement
+template.
+
+## System information
+
+Include this section only if you consider that is relevant to this ticket,
+otherwise you may remove it.
+
+### Ultrasonic client
+
+ * **Ultrasonic version**: *version of the app*
+ * **Android version**: *Version of Android OS on the device*
+ * **Device info**: *Device manufacturer, model*
+
+### Server
+
+ * **Server name**: *Airsonic, Ampache, Supysonic...*
+ * **Server version**: *version of server software*
+ * **Protocol used**: *http or https (self certificate, letsencrypt...)*
+
+## Additional notes
+
+Include any extra notes here. Otherwise you may remove this section.

.gitlab/merge_request_templates/Default.md

@@ -0,0 +1,12 @@
+<!-- Please describe your changes here -->
+
+----------------------------------------------------------------------------
+
+- [ ] I have opened an issue where I discuss the change I wish to make.
+- [ ] I ran `./gradlew -Pqc ktlintCheck`, `./gradlew -Pqc detekt` and
+  `./gradlew :ultrasonic:lintRelease` and no problems found. See
+  [CONTRIBUTING](CONTRIBUTING.md) for further information.
+- [ ] All commits [are
+  signed](https://docs.gitlab.com/ee/user/project/repository/gpg_signed_commits/).
+- [ ] I agree to release my code and all other changes of this MR under the
+  [GNU GPLv3](LICENSE) license.

.gitlab/merge_request_templates/Release.md

@@ -0,0 +1,10 @@
+#### Before merge:
+- [ ] MR is targetting the master branch
+- [ ] **Squash commits must be disabled!**
+- [ ] RoboTests (5 physical, 10 virtual) on a Release apk return no errors
+- [ ] Release notes present
+
+#### After merge
+- [ ] ``git fetch``
+- [ ] Create an annotated and signed tag: ``git tag -sa``
+- [ ] Push the tag to git:``git push --tags``

.gitlab/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "baseBranches": [ "develop" ],
+  "labels": [ "housekeeping", "dependencies" ]
+}

.idea/codeStyles/Project.xml

@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
+</project>

.idea/copyright/Default.xml

@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="&amp;#36;file.fileName&#10;Copyright (C) 2009-&amp;#36;today.year Ultrasonic developers&#10;&#10;Distributed under terms of the GNU GPLv3 license." />
+    <option name="myName" value="Default" />
+  </copyright>
+</component>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="Default">
+    <LanguageOptions name="Kotlin">
+      <option name="fileTypeOverride" value="3" />
+    </LanguageOptions>
+  </settings>
+</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Reformat" enabled="false" level="WEAK WARNING" enabled_by_default="false">
+      <option name="processChangedFilesOnly" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.tx/config

@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = nl_NL:nl,pl_PL:pl,fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in,lt_LT:lt,km_KH:km-rKH,th_TH:th,ru_RU:ru,it_IT:it
-
-[ultrasonic.app]
-file_filter = ultrasonic/src/main/res/values-<lang>/strings.xml
-source_file = ultrasonic/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-

CONTRIBUTING.md

@@ -1,35 +1,83 @@
 # Contributing
 
-Ultrasonic development is a community project, and contributions are welcomed.
+Ultrasonic development is a community project, and contributions are
+welcomed.
 
-First, see if your issue haven’t been yet reported [here](https://github.com/ultrasonic/ultrasonic/issues),
-then, please, first discuss the change you wish to make via [a new issue](https://github.com/ultrasonic/ultrasonic/issues/new).
+First, see if your issue haven’t been yet reported
+[here](https://gitlab.com/ultrasonic/ultrasonic/issues), then, please, first
+discuss the change you wish to make via [a new
+issue](https://gitlab.com/ultrasonic/ultrasonic/issues/new).
 
 ## Contributing Translations
 
 Interested in help to translate Ultrasonic? You can contribute in our
-[Transifex team](https://www.transifex.com/ultrasonic/ultrasonic/).
+[Weblate team](https://hosted.weblate.org/projects/ultrasonic/).
 
 ## Contributing Code
 
-By default Pull Request should be opened against **develop** branch, PR against **master** branch should be used only
- for critical bugfixes.
+By default, merge requests should be opened against the **develop** branch
+from your own branch, MR against the **master** branch should only be used
+for critical bug fixes.
 
 ### Here are a few guidelines you should follow before submitting:
 
-1. **License Acceptance:** All contributions must be licensed as [GNU GPLv3](LICENSE) to be accepted.
-Use `git commit --signoff` to acknowledge this.
-2. **App is migrating to [Kotlin](https://kotlinlang.org/) programming language:** new Pull Requests
-should be written in this programming language.
-3. **No Breakage:** New features or changes to existing ones must not degrade the user experience.
-4. **Coding standards:** best-practices should be followed, comment generously, and avoid "clever" algorithms.
-Refactoring existing messes is great, but watch out for breakage.
-5. **No large PR:** Try to limit the scope of PR only to the related issue, so it will be easier to review
-and test.
+1. **License Acceptance:** All contributions must be licensed as [GNU
+   GPLv3](LICENSE) to be accepted. Use `git commit --signoff` to acknowledge
+   this.
+2. **No Breakage**: New features or changes to existing ones must not
+   degrade the user experience.
+3. **Coding standards**: best-practices should be followed, comment
+   generously, and avoid "clever" algorithms. Refactoring existing messes is
+   great, but watch out for breakage.
+4. **No large PR**: Try to limit the scope of PR only to the related issue,
+   so it will be easier to review and test.
+5. **Make your own branch**: When you send us a merge request, please do it
+   from your own branch. Avoid using the `develop` branch.
 
-### Pull Request Process
+### Merge request process
 
-1. Ensure [all commits are signed-off](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification).
-2. Check tests for the new code are added.
-3. Check code style is passing.
-4. Check code static analysis is passing.
+On each merge request GitLab runs a number of checks to make sure there are
+no problems.
+
+Take special note of point five of the previous paragraph. Do not use the
+`develop` branch, make your own. Not following this step will cause your
+merge request to be rejected without even checking it.
+
+#### Signed commits
+
+Commits must be signed. [See here how to set it
+up](https://docs.gitlab.com/ee/user/project/repository/gpg_signed_commits/).
+
+#### KtLint
+
+This programm checks if the source code is formatted correctly. You can run
+it yourself locally with
+```
+./gradlew -Pqc ktlintFormat
+```
+Running this command will fix common problems and will notify you of
+problems it couldn't fix automatically.
+
+#### Detekt
+
+Detekt is a static analyser. It helps to find potential bugs in our code.
+You can run it yourself locally with
+```
+./gradlew -Pqc detekt
+```
+There is a "baseline" file, in which errors which have been in the code base
+before are noted. Sometimes it is necessary to regenerate this file by
+running:
+```
+./gradlew -Pqc detektBaseline
+```
+
+#### Lint
+
+Lint looks for general problems in the code or unused resources etc. You can
+run it with
+```
+./gradlew -Pqc lintRelease
+```
+If there is a need to regenerate the baseline, remove
+`ultrasonic/lint-baseline.xml` and rerun the command.

ISSUE_TEMPLATE.md

@@ -1,20 +0,0 @@
-## Problem description
-
-Describe your problem here. Describe what you want to happen, and what happens
-if you try to do it. If you have a stack trace or any logs, please format them using
-github triple backquote notation
-
-### Steps to reproduce
-
-Describe how somebody else could observe the same behavior you do. Don't share here any logins and 
-passwords!
-
-## System information
-
- * **Ultrasonic version**: *version of the app*
- * **Android version**: *Version of Android OS on the device*
- * **Device info**: *Device manufacturer, model*
-
-## Additional notes
-
-Include any extra notes here. Otherwise you may remove this section.

README.md

@@ -1,14 +1,14 @@
 # Ultrasonic
-[![Build Status](https://circleci.com/gh/ultrasonic/ultrasonic/tree/develop.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/ultrasonic)
-[![Codecov branch](https://img.shields.io/codecov/c/github/ultrasonic/ultrasonic/develop.svg)]()
-[![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
 
-Ultrasonic is free and open-source music streaming Android client for [Subsonic](http://www.subsonic.org/) [API](http://www.subsonic.org/pages/api.jsp) (version 1.7.0 or higher) compatible servers.
+Ultrasonic is free and open-source music streaming Android client for
+[Subsonic][subsonic] [API][subapi] (version 1.7.0 or higher) compatible
+servers.
 
 ## Help wanted
 
 We currently don't have that much time to spend developing Subsonic, so any
 contributions or active developers are always welcomed.
+Have a look at [CONTRIBUTING](CONTRIBUTING.md) to get started.
 
 ## Download
 
@@ -16,24 +16,20 @@ App is available to download at following stores:
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="70">](https://play.google.com/store/apps/details?id=org.moire.ultrasonic)
 [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="70">](https://f-droid.org/packages/org.moire.ultrasonic/)
-[<img src="https://ultrasonic.github.io/assets/img/get-it-on-github.png" alt="Get it on GitHub" height="70">](https://github.com/ultrasonic/ultrasonic/releases)
+[<img src="https://ultrasonic.gitlab.io/assets/img/get-it-on-gitlab.png" alt="Get it on GitLab" height="70">](https://gitlab.com/ultrasonic/ultrasonic/-/releases)
 
 **Warning**: All three versions (Google Play, F-Droid and the APKs) are not
 compatible (not signed by the same key)! You must uninstall one to install
-the other, which will delete all your data.  
+the other, which will delete all your data.
 
-If you want to use the version downloaded from F-Droid or form Github with **Android Auto**, you must enable Unknown Sources as it is described in [this wiki page](https://github.com/ultrasonic/ultrasonic/wiki/Using-Ultrasonic-with-Android-Auto).
+If you want to use the version downloaded from F-Droid or from GitLab with
+**Android Auto**, you must enable Unknown Sources as it is described in
+[this wiki page][wikiaa].
 
 ## Bugs and issues
 
-First, see if your issue haven’t been yet reported [here](https://github.com/ultrasonic/ultrasonic/issues),
-otherwise open [a new issue](https://github.com/ultrasonic/ultrasonic/issues/new).
-
-### Known (not our) bugs
-
-If you are using *Madsonic 5.1.X* several sections of Ultrasonic will not
-work. This is caused by bad implementation of Subsonic API by Madsonic. For
-more info about this you can read [this bug](https://github.com/ultrasonic/ultrasonic/issues/129).
+First, see if your issue haven’t been yet reported [here][issues], otherwise
+open [a new issue][newissue].
 
 ## Contributing
 
@@ -41,16 +37,28 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Supported (tested) Subsonic API implementations
 
-- [Subsonic](http://www.subsonic.org/pages/index.jsp)
-- [Airsonic](https://github.com/airsonic/airsonic)
-- [Supysonic](https://github.com/spl0k/supysonic)
-- [Ampache](https://ampache.org/)
+- [Subsonic][subsonic]
+- [Airsonic-Advanced][airsonic]
+- [Supysonic][supysonic]
+- [Ampache][ampache]
 
-Other *Subsonic API* implementations should work as well as long as they follow API
-[documentation](http://www.subsonic.org/pages/api.jsp).
+Other *Subsonic API* implementations should work as well as long as they
+follow API [documentation][subapi].
 
 ## License
 
-This software is licensed under the terms of the GNU General Public License version 3 (GPLv3).
+This software is licensed under the terms of the GNU General Public License
+version 3 (GPLv3).
 
-Full text of the license is available in the [LICENSE](LICENSE) file and [online](https://opensource.org/licenses/gpl-3.0.html).
+Full text of the license is available in the [LICENSE](LICENSE) file and
+[online][gpl3].
+
+[wikiaa]: https://gitlab.com/ultrasonic/ultrasonic/-/wikis/Using-Ultrasonic-with-Android-Auto
+[issues]: https://gitlab.com/ultrasonic/ultrasonic/-/issues
+[newissue]: https://gitlab.com/ultrasonic/ultrasonic/-/issues/new
+[subsonic]: http://www.subsonic.org/
+[subapi]: http://www.subsonic.org/pages/api.jsp
+[airsonic]: https://github.com/airsonic-advanced/airsonic-advanced
+[supysonic]: https://github.com/spl0k/supysonic
+[ampache]: https://ampache.org/
+[gpl3]: https://opensource.org/licenses/gpl-3.0.html

build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     apply from: 'gradle/versions.gradle'
@@ -10,14 +12,15 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
+        maven { url = "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath libs.gradle
         classpath libs.kotlin
         classpath libs.ktlintGradle
         classpath libs.detekt
-        classpath libs.jacoco
+        classpath libs.navigationSafeArgs
     }
 }
 
@@ -26,27 +29,32 @@ allprojects {
     buildscript {
         repositories {
             mavenCentral()
+            gradlePluginPortal()
             google()
         }
     }
 
     repositories {
         mavenCentral()
+        gradlePluginPortal()
         google()
-        maven { url 'https://jitpack.io' }
     }
 
     // Set Kotlin JVM target to the same for all subprojects
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    tasks.withType(KotlinCompile).configureEach {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "21"
+        }
+    }
+
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            options.compilerArgs.add("-Xlint:deprecation")
         }
     }
 }
 
-apply from: 'gradle_scripts/jacoco.gradle'
-
 wrapper {
-    gradleVersion(libs.versions.gradle.get())
-    distributionType("all")
-}
+    gradleVersion = libs.versions.gradle.get()
+    distributionType = "all"
+}

config/detekt/detekt.yml

@@ -2,14 +2,11 @@ build:
   maxIssues: 0
   weights:
     complexity: 2
-    formatting: 1
     LongParameterList: 1
     comments: 1
 
 potential-bugs:
   active: true
-  DuplicateCaseInWhenExpression:
-    active: true
   EqualsWithHashCodeExist:
     active: true
   ExplicitGarbageCollectionCall:
@@ -49,34 +46,32 @@ complexity:
   LabeledExpression:
     active: false
 
-
-formatting:
-  autoCorrect: true
-  active: false
-
 style:
   active: true
   NewLineAtEndOfFile:
     active: true
   ForbiddenComment:
     active: true
-    values: 'FIXME:,STOPSHIP:'
+    comments:
+      - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
+        value: 'FIXME:'
+      - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.'
+        value: 'STOPSHIP:'
   WildcardImport:
     active: true
   MaxLineLength:
-    active: true
-    maxLineLength: 120
-    excludePackageStatements: false
-    excludeImportStatements: false
+    active: false
   MagicNumber:
     # 100 common in percentage, 1000 in milliseconds
-    ignoreNumbers: ['-1', '0', '1', '2', '5', '10', '100', '256', '512', '1000', '1024']
+    ignoreNumbers: ['-1', '0', '1', '2', '5', '10', '100', '256', '512', '1000', '1024', '4096']
     ignoreEnums: true
     ignorePropertyDeclaration: true
   UnnecessaryAbstractClass:
     active: false
   ReturnCount:
     max: 5
+  ForbiddenImport:
+    imports: ['android.app.AlertDialog']
 
 comments:
   active: true

core/domain/build.gradle

@@ -1,14 +1,20 @@
-apply from: bootstrap.androidModule
-apply plugin: 'kotlin-kapt'
-
-ext {
-    jacocoExclude = [
-            '**/domain/**'
-    ]
+plugins {
+    alias libs.plugins.ksp
 }
 
+apply from: bootstrap.androidModule
+
 dependencies {
+    implementation libs.core
     implementation libs.roomRuntime
     implementation libs.roomKtx
-    kapt libs.room
+    ksp libs.room
+}
+
+android {
+    namespace = 'org.moire.ultrasonic.subsonic.domain'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
 }

core/domain/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.moire.ultrasonic.subsonic.domain">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt

@@ -0,0 +1,38 @@
+/*
+ * Album.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
+package org.moire.ultrasonic.domain
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import java.util.Date
+
+@Entity(tableName = "albums", primaryKeys = ["id", "serverId"])
+data class Album(
+    override var id: String,
+    @ColumnInfo(defaultValue = "-1")
+    override var serverId: Int = -1,
+    override var parent: String? = null,
+    override var album: String? = null,
+    override var title: String? = null,
+    override val name: String? = null,
+    override var discNumber: Int? = 0,
+    override var coverArt: String? = null,
+    override var songCount: Long? = null,
+    override var created: Date? = null,
+    override var artist: String? = null,
+    override var artistId: String? = null,
+    override var duration: Int? = 0,
+    override var year: Int? = 0,
+    override var genre: String? = null,
+    override var starred: Boolean = false,
+    override var path: String? = null,
+    override var closeness: Int = 0
+) : MusicDirectory.Child() {
+    override var isDirectory = true
+    override var isVideo = false
+}

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt

@@ -1,14 +1,23 @@
+/*
+ * Artist.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.domain
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 
-@Entity(tableName = "artists")
+@Entity(tableName = "artists", primaryKeys = ["id", "serverId"])
 data class Artist(
-    @PrimaryKey override var id: String,
+    override var id: String,
+    @ColumnInfo(defaultValue = "-1")
+    override var serverId: Int = -1,
     override var name: String? = null,
     override var index: String? = null,
     override var coverArt: String? = null,
     override var albumCount: Long? = null,
     override var closeness: Int = 0
-) : ArtistOrIndex(id)
+) : ArtistOrIndex(id, serverId)

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ArtistOrIndex.kt

@@ -1,11 +1,21 @@
+/*
+ * ArtistOrIndex.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.domain
 
 import androidx.room.Ignore
 
+@Suppress("LongParameterList")
 abstract class ArtistOrIndex(
     @Ignore
     override var id: String,
     @Ignore
+    open var serverId: Int,
+    @Ignore
     override var name: String? = null,
     @Ignore
     open var index: String? = null,
@@ -18,15 +28,15 @@ abstract class ArtistOrIndex(
 ) : GenericEntry() {
 
     fun compareTo(other: ArtistOrIndex): Int {
-        when {
+        return when {
             this.closeness == other.closeness -> {
-                return 0
+                0
             }
             this.closeness > other.closeness -> {
-                return -1
+                -1
             }
             else -> {
-                return 1
+                1
             }
         }
     }

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Bookmark.kt

@@ -2,7 +2,6 @@ package org.moire.ultrasonic.domain
 
 import java.io.Serializable
 import java.util.Date
-import org.moire.ultrasonic.domain.MusicDirectory.Entry
 
 data class Bookmark(
     val position: Int = 0,
@@ -10,7 +9,7 @@ data class Bookmark(
     val comment: String,
     val created: Date? = null,
     val changed: Date? = null,
-    val entry: Entry
+    val track: Track
 ) : Serializable {
     companion object {
         private const val serialVersionUID = 8988990025189807803L

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Index.kt

@@ -1,15 +1,24 @@
+/*
+ * Index.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.domain
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 
-@Entity(tableName = "indexes")
+@Entity(tableName = "indexes", primaryKeys = ["id", "serverId"])
 data class Index(
-    @PrimaryKey override var id: String,
+    override var id: String,
+    @ColumnInfo(defaultValue = "-1")
+    override var serverId: Int = -1,
     override var name: String? = null,
     override var index: String? = null,
     override var coverArt: String? = null,
     override var albumCount: Long? = null,
     override var closeness: Int = 0,
     var musicFolderId: String? = null
-) : ArtistOrIndex(id)
+) : ArtistOrIndex(id, serverId)

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt

@@ -1,18 +1,19 @@
+/*
+ * MusicDirectory.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.domain
 
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
 import java.util.Date
 
 class MusicDirectory : ArrayList<MusicDirectory.Child>() {
     var name: String? = null
 
     @JvmOverloads
-    fun getChildren(
-        includeDirs: Boolean = true,
-        includeFiles: Boolean = true
-    ): List<Child> {
+    fun getChildren(includeDirs: Boolean = true, includeFiles: Boolean = true): List<Child> {
         if (includeDirs && includeFiles) {
             return toList()
         }
@@ -20,9 +21,9 @@ class MusicDirectory : ArrayList<MusicDirectory.Child>() {
         return filter { it.isDirectory && includeDirs || !it.isDirectory && includeFiles }
     }
 
-    fun getTracks(): List<Entry> {
+    fun getTracks(): List<Track> {
         return mapNotNull {
-            it as? Entry
+            it as? Track
         }
     }
 
@@ -34,6 +35,7 @@ class MusicDirectory : ArrayList<MusicDirectory.Child>() {
 
     abstract class Child : GenericEntry() {
         abstract override var id: String
+        abstract var serverId: Int
         abstract var parent: String?
         abstract var isDirectory: Boolean
         abstract var album: String?
@@ -53,87 +55,4 @@ class MusicDirectory : ArrayList<MusicDirectory.Child>() {
         abstract var closeness: Int
         abstract var isVideo: Boolean
     }
-
-    // TODO: Rename to Track
-    @Entity
-    data class Entry(
-        @PrimaryKey override var id: String,
-        override var parent: String? = null,
-        override var isDirectory: Boolean = false,
-        override var title: String? = null,
-        override var album: String? = null,
-        var albumId: String? = null,
-        override var artist: String? = null,
-        override var artistId: String? = null,
-        var track: Int? = null,
-        override var year: Int? = null,
-        override var genre: String? = null,
-        var contentType: String? = null,
-        var suffix: String? = null,
-        var transcodedContentType: String? = null,
-        var transcodedSuffix: String? = null,
-        override var coverArt: String? = null,
-        var size: Long? = null,
-        override var songCount: Long? = null,
-        override var duration: Int? = null,
-        var bitRate: Int? = null,
-        override var path: String? = null,
-        override var isVideo: Boolean = false,
-        override var starred: Boolean = false,
-        override var discNumber: Int? = null,
-        var type: String? = null,
-        override var created: Date? = null,
-        override var closeness: Int = 0,
-        var bookmarkPosition: Int = 0,
-        var userRating: Int? = null,
-        var averageRating: Float? = null,
-        override var name: String? = null
-    ) : Serializable, Child() {
-        fun setDuration(duration: Long) {
-            this.duration = duration.toInt()
-        }
-
-        companion object {
-            private const val serialVersionUID = -3339106650010798108L
-        }
-
-        fun compareTo(other: Entry): Int {
-            when {
-                this.closeness == other.closeness -> {
-                    return 0
-                }
-                this.closeness > other.closeness -> {
-                    return -1
-                }
-                else -> {
-                    return 1
-                }
-            }
-        }
-
-        override fun compareTo(other: Identifiable) = compareTo(other as Entry)
-    }
-
-    data class Album(
-        @PrimaryKey override var id: String,
-        override var parent: String? = null,
-        override var album: String? = null,
-        override var title: String? = null,
-        override val name: String? = null,
-        override var discNumber: Int? = 0,
-        override var coverArt: String? = null,
-        override var songCount: Long? = null,
-        override var created: Date? = null,
-        override var artist: String? = null,
-        override var artistId: String? = null,
-        override var duration: Int? = 0,
-        override var year: Int? = 0,
-        override var genre: String? = null,
-        override var starred: Boolean = false,
-        override var path: String? = null,
-        override var closeness: Int = 0,
-    ) : Child() {
-        override var isDirectory = true
-        override var isVideo = false
-    }
 }

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt

@@ -1,13 +1,22 @@
+/*
+ * MusicFolder.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.domain
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 
 /**
  * Represents a top level directory in which music or other media is stored.
  */
-@Entity(tableName = "music_folders")
+@Entity(tableName = "music_folders", primaryKeys = ["id", "serverId"])
 data class MusicFolder(
-    @PrimaryKey override val id: String,
-    override val name: String
+    override val id: String,
+    override val name: String,
+    @ColumnInfo(defaultValue = "-1")
+    var serverId: Int
 ) : GenericEntry()

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PlayerState.kt

@@ -1,12 +0,0 @@
-package org.moire.ultrasonic.domain
-
-enum class PlayerState {
-    IDLE,
-    DOWNLOADING,
-    PREPARING,
-    PREPARED,
-    STARTED,
-    STOPPED,
-    PAUSED,
-    COMPLETED
-}

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Playlist.kt

@@ -14,4 +14,8 @@ data class Playlist @JvmOverloads constructor(
     companion object {
         private const val serialVersionUID = -4160515427075433798L
     }
+
+    override fun toString(): String {
+        return name
+    }
 }

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/PodcastsChannel.kt

@@ -12,4 +12,6 @@ data class PodcastsChannel(
     companion object {
         private const val serialVersionUID = -4160515427075433798L
     }
+
+    override fun toString(): String = title.toString()
 }

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/RepeatMode.kt

@@ -1,15 +0,0 @@
-package org.moire.ultrasonic.domain
-
-enum class RepeatMode {
-    OFF {
-        override operator fun next(): RepeatMode = ALL
-    },
-    ALL {
-        override operator fun next(): RepeatMode = SINGLE
-    },
-    SINGLE {
-        override operator fun next(): RepeatMode = OFF
-    };
-
-    abstract operator fun next(): RepeatMode
-}

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/SearchResult.kt

@@ -1,13 +1,10 @@
 package org.moire.ultrasonic.domain
 
-import org.moire.ultrasonic.domain.MusicDirectory.Album
-import org.moire.ultrasonic.domain.MusicDirectory.Entry
-
 /**
  * The result of a search.  Contains matching artists, albums and songs.
  */
 data class SearchResult(
     val artists: List<ArtistOrIndex> = listOf(),
     val albums: List<Album> = listOf(),
-    val songs: List<Entry> = listOf()
+    val songs: List<Track> = listOf()
 )

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Share.kt

@@ -1,7 +1,6 @@
 package org.moire.ultrasonic.domain
 
 import java.io.Serializable
-import org.moire.ultrasonic.domain.MusicDirectory.Entry
 
 data class Share(
     override var id: String,
@@ -12,7 +11,7 @@ data class Share(
     var lastVisited: String? = null,
     var expires: String? = null,
     var visitCount: Long? = null,
-    private val entries: MutableList<Entry> = mutableListOf()
+    private val tracks: MutableList<Track> = mutableListOf()
 ) : Serializable, GenericEntry() {
     override val name: String?
         get() {
@@ -22,12 +21,12 @@ data class Share(
             return null
         }
 
-    fun getEntries(): List<Entry> {
-        return entries.toList()
+    fun getEntries(): List<Track> {
+        return tracks.toList()
     }
 
-    fun addEntry(entry: Entry) {
-        entries.add(entry)
+    fun addEntry(track: Track) {
+        tracks.add(track)
     }
 
     companion object {

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Track.kt

@@ -0,0 +1,74 @@
+/*
+ * Track.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
+package org.moire.ultrasonic.domain
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import java.io.Serializable
+import java.util.Date
+
+@Entity(tableName = "tracks", primaryKeys = ["id", "serverId"])
+data class Track(
+    override var id: String,
+    @ColumnInfo(defaultValue = "-1")
+    override var serverId: Int = -1,
+    override var parent: String? = null,
+    override var isDirectory: Boolean = false,
+    override var title: String? = null,
+    override var album: String? = null,
+    var albumId: String? = null,
+    override var artist: String? = null,
+    override var artistId: String? = null,
+    var track: Int? = null,
+    override var year: Int? = null,
+    override var genre: String? = null,
+    var contentType: String? = null,
+    var suffix: String? = null,
+    var transcodedContentType: String? = null,
+    var transcodedSuffix: String? = null,
+    override var coverArt: String? = null,
+    var size: Long? = null,
+    override var songCount: Long? = null,
+    override var duration: Int? = null,
+    var bitRate: Int? = null,
+    override var path: String? = null,
+    override var isVideo: Boolean = false,
+    override var starred: Boolean = false,
+    override var discNumber: Int? = null,
+    var type: String? = null,
+    override var created: Date? = null,
+    override var closeness: Int = 0,
+    var bookmarkPosition: Int = 0,
+    var userRating: Int? = null,
+    var averageRating: Float? = null,
+    override var name: String? = null
+) : Serializable, MusicDirectory.Child() {
+    fun setDuration(duration: Long) {
+        this.duration = duration.toInt()
+    }
+
+    companion object {
+        private const val serialVersionUID = -3339106650010798108L
+    }
+
+    fun compareTo(other: Track): Int {
+        return when {
+            this.closeness == other.closeness -> {
+                0
+            }
+            this.closeness > other.closeness -> {
+                -1
+            }
+            else -> {
+                1
+            }
+        }
+    }
+
+    override fun compareTo(other: Identifiable) = compareTo(other as Track)
+}

core/subsonic-api/build.gradle

@@ -1,5 +1,14 @@
+plugins {
+    alias libs.plugins.ksp
+}
+
 apply from: bootstrap.kotlinModule
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 dependencies {
     api libs.retrofit
     api libs.jacksonConverter
@@ -10,21 +19,11 @@ dependencies {
     }
     implementation libs.kotlinReflect // for jackson kotlin, but to use the same version
     implementation libs.okhttpLogging
-    implementation libs.timber
 
     testImplementation libs.kotlinJunit
     testImplementation libs.mockito
-    testImplementation libs.mockitoInline
     testImplementation libs.mockitoKotlin
     testImplementation libs.kluent
     testImplementation libs.mockWebServer
     testImplementation libs.apacheCodecs
 }
-
-ext {
-    // Excluding data classes
-    jacocoExclude = [
-            '**/models/**',
-            '**/di/**'
-    ]
-}

core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt

@@ -8,7 +8,8 @@ import java.util.Locale
 import java.util.TimeZone
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
-import okio.Okio
+import okio.buffer
+import okio.source
 import org.amshove.kluent.`should be`
 import org.amshove.kluent.`should contain`
 import org.amshove.kluent.`should not be`
@@ -40,12 +41,12 @@ fun MockWebServer.enqueueResponse(resourceName: String) {
 }
 
 fun Any.loadJsonResponse(name: String): String {
-    val source = Okio.buffer(Okio.source(javaClass.classLoader.getResourceAsStream(name)))
+    val source = javaClass.classLoader.getResourceAsStream(name)!!.source().buffer()
     return source.readString(Charset.forName("UTF-8"))
 }
 
 fun Any.loadResourceStream(name: String): InputStream {
-    val source = Okio.buffer(Okio.source(javaClass.classLoader.getResourceAsStream(name)))
+    val source = javaClass.classLoader.getResourceAsStream(name)!!.source().buffer()
     return source.inputStream()
 }
 

core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt

@@ -8,7 +8,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule
  * Base class for integration tests for [SubsonicAPIClient] class.
  */
 abstract class SubsonicAPIClientTest {
-    @JvmField @Rule val mockWebServerRule = MockWebServerRule()
+    @JvmField @Rule
+    val mockWebServerRule = MockWebServerRule()
 
     protected lateinit var config: SubsonicClientConfiguration
     protected lateinit var client: SubsonicAPIClient

core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt

@@ -11,7 +11,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule
  * Base class for testing [okhttp3.Interceptor] implementations.
  */
 abstract class BaseInterceptorTest {
-    @Rule @JvmField val mockWebServerRule = MockWebServerRule()
+    @Rule @JvmField
+    val mockWebServerRule = MockWebServerRule()
 
     lateinit var client: OkHttpClient
 

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt

@@ -1,3 +1,10 @@
+/*
+ * ApiVersionCheckWrapper.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.api.subsonic
 
 import okhttp3.ResponseBody
@@ -85,7 +92,13 @@ internal class ApiVersionCheckWrapper(
         checkVersion(V1_4_0)
         checkParamVersion(musicFolderId, V1_12_0)
         return api.search2(
-            query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId
+            query,
+            artistCount,
+            artistOffset,
+            albumCount,
+            albumOffset,
+            songCount,
+            musicFolderId
         )
     }
 
@@ -101,7 +114,13 @@ internal class ApiVersionCheckWrapper(
         checkVersion(V1_8_0)
         checkParamVersion(musicFolderId, V1_12_0)
         return api.search3(
-            query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId
+            query,
+            artistCount,
+            artistOffset,
+            albumCount,
+            albumOffset,
+            songCount,
+            musicFolderId
         )
     }
 
@@ -221,7 +240,13 @@ internal class ApiVersionCheckWrapper(
         checkParamVersion(estimateContentLength, V1_8_0)
         checkParamVersion(converted, V1_14_0)
         return api.stream(
-            id, maxBitRate, format, timeOffset, videoSize, estimateContentLength, converted
+            id,
+            maxBitRate,
+            format,
+            timeOffset,
+            videoSize,
+            estimateContentLength,
+            converted
         )
     }
 
@@ -328,8 +353,9 @@ internal class ApiVersionCheckWrapper(
     private fun checkVersion(expectedVersion: SubsonicAPIVersions) {
         // If it is true, it is probably the first call with this server
         if (!isRealProtocolVersion) return
-        if (currentApiVersion < expectedVersion)
+        if (currentApiVersion < expectedVersion) {
             throw ApiNotSupportedException(currentApiVersion)
+        }
     }
 
     private fun checkParamVersion(param: Any?, expectedVersion: SubsonicAPIVersions) {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt

@@ -17,8 +17,8 @@ fun Response<out ResponseBody>.toStreamResponse(): StreamResponse {
         val contentType = responseBody?.contentType()
         if (
             contentType != null &&
-            contentType.type().equals("application", true) &&
-            contentType.subtype().equals("json", true)
+            contentType.type.equals("application", true) &&
+            contentType.subtype.equals("json", true)
         ) {
             val error = SubsonicAPIClient.jacksonMapper.readValue<SubsonicResponse>(
                 responseBody.byteStream()
@@ -40,11 +40,11 @@ fun Response<out ResponseBody>.toStreamResponse(): StreamResponse {
  * It creates Exceptions from the results returned by the Subsonic API
  */
 @Suppress("ThrowsCount")
-fun <T : SubsonicResponse> Response<out T>.throwOnFailure(): Response<out T> {
+fun <T : SubsonicResponse> Response<T>.throwOnFailure(): Response<T> {
     val response = this
 
     if (response.isSuccessful && response.body()!!.status === SubsonicResponse.Status.OK) {
-        return this as Response<T>
+        return this
     }
     if (!response.isSuccessful) {
         throw IOException("Server error, code: " + response.code())

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt

@@ -8,6 +8,7 @@ import java.security.cert.X509Certificate
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.net.ssl.SSLContext
 import javax.net.ssl.X509TrustManager
+import okhttp3.Credentials
 import okhttp3.OkHttpClient
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
@@ -43,7 +44,7 @@ class SubsonicAPIClient(
         config.minimalProtocolVersion,
         PasswordHexInterceptor(config.password),
         PasswordMD5Interceptor(config.password),
-        config.enableLdapUserSupport
+        config.forcePlainTextPassword
     )
 
     var onProtocolChange: (SubsonicAPIVersions) -> Unit = {}
@@ -63,17 +64,30 @@ class SubsonicAPIClient(
         }
 
     val okHttpClient: OkHttpClient = baseOkClient.newBuilder()
+        // Disable HTTP2 because OkHttp with Exoplayer causes a bug. See https://github.com/square/okhttp/issues/6749
         .readTimeout(READ_TIMEOUT, MILLISECONDS)
         .apply { if (config.allowSelfSignedCertificate) allowSelfSignedCertificates() }
         .addInterceptor { chain ->
             // Adds default request params
             val originalRequest = chain.request()
-            val newUrl = originalRequest.url().newBuilder()
+            val newUrl = originalRequest.url.newBuilder()
                 .addQueryParameter("u", config.username)
                 .addQueryParameter("c", config.clientID)
                 .addQueryParameter("f", "json")
                 .build()
-            chain.proceed(originalRequest.newBuilder().url(newUrl).build())
+            val newRequestBuilder = originalRequest.newBuilder().url(newUrl)
+            if (originalRequest.url.username.isNotEmpty() &&
+                originalRequest.url.password.isNotEmpty()
+            ) {
+                newRequestBuilder.addHeader(
+                    "Authorization",
+                    Credentials.basic(
+                        originalRequest.url.username,
+                        originalRequest.url.password
+                    )
+                )
+            }
+            chain.proceed(newRequestBuilder.build())
         }
         .addInterceptor(versionInterceptor)
         .addInterceptor(proxyPasswordInterceptor)
@@ -81,10 +95,12 @@ class SubsonicAPIClient(
         .apply { if (config.debug) addLogging() }
         .build()
 
+    val baseUrl = "${config.baseUrl}/rest/"
+
     // Create the Retrofit instance, and register a special converter factory
     // It will update our protocol version to the correct version, once we made a successful call
     private val retrofit: Retrofit = Retrofit.Builder()
-        .baseUrl("${config.baseUrl}/rest/")
+        .baseUrl(baseUrl)
         .client(okHttpClient)
         .addConverterFactory(
             VersionAwareJacksonConverterFactory.create(
@@ -109,17 +125,16 @@ class SubsonicAPIClient(
 
     private fun OkHttpClient.Builder.addLogging() {
         val loggingInterceptor = HttpLoggingInterceptor(okLogger)
-        loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+        loggingInterceptor.level = HttpLoggingInterceptor.Level.HEADERS
         this.addInterceptor(loggingInterceptor)
     }
 
+    @Suppress("CustomX509TrustManager", "TrustAllX509TrustManager")
     private fun OkHttpClient.Builder.allowSelfSignedCertificates() {
         val trustManager =
-            @Suppress("CustomX509TrustManager")
+
             object : X509TrustManager {
-                @Suppress("TrustAllX509TrustManager")
                 override fun checkClientTrusted(p0: Array<out X509Certificate>?, p1: String?) {}
-                @Suppress("TrustAllX509TrustManager")
                 override fun checkServerTrusted(p0: Array<out X509Certificate>?, p1: String?) {}
                 override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
             }
@@ -139,11 +154,17 @@ class SubsonicAPIClient(
         return call.toStreamResponse()
     }
 
+    val isOffline by lazy {
+        config.baseUrl == OFFLINE_DB_URL
+    }
+
     companion object {
         val jacksonMapper: ObjectMapper = ObjectMapper()
             .configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true)
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
             .configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true)
-            .registerModule(KotlinModule())
+            .registerModule(KotlinModule.Builder().build())
+
+        const val OFFLINE_DB_URL = "http://localhost"
     }
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt

@@ -1,3 +1,10 @@
+/*
+ * SubsonicAPIDefinition.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.api.subsonic
 
 import okhttp3.ResponseBody
@@ -47,6 +54,9 @@ interface SubsonicAPIDefinition {
     @GET("ping.view")
     fun ping(): Call<SubsonicResponse>
 
+    @GET("ping.view")
+    suspend fun pingSuspend(): SubsonicResponse
+
     @GET("getLicense.view")
     fun getLicense(): Call<LicenseResponse>
 
@@ -80,10 +90,7 @@ interface SubsonicAPIDefinition {
     ): Call<SubsonicResponse>
 
     @GET("setRating.view")
-    fun setRating(
-        @Query("id") id: String,
-        @Query("rating") rating: Int
-    ): Call<SubsonicResponse>
+    fun setRating(@Query("id") id: String, @Query("rating") rating: Int): Call<SubsonicResponse>
 
     @GET("getArtist.view")
     fun getArtist(@Query("id") id: String): Call<GetArtistResponse>
@@ -148,8 +155,7 @@ interface SubsonicAPIDefinition {
         @Query("public") public: Boolean? = null,
         @Query("songIdToAdd") songIdsToAdd: List<String>? = null,
         @Query("songIndexToRemove") songIndexesToRemove: List<Int>? = null
-    ):
-        Call<SubsonicResponse>
+    ): Call<SubsonicResponse>
 
     @GET("getPodcasts.view")
     fun getPodcasts(
@@ -157,6 +163,12 @@ interface SubsonicAPIDefinition {
         @Query("id") id: String? = null
     ): Call<GetPodcastsResponse>
 
+    @GET("getPodcasts.view")
+    suspend fun getPodcastsSuspend(
+        @Query("includeEpisodes") includeEpisodes: Boolean? = null,
+        @Query("id") id: String? = null
+    ): GetPodcastsResponse
+
     @GET("getLyrics.view")
     fun getLyrics(
         @Query("artist") artist: String? = null,
@@ -211,10 +223,7 @@ interface SubsonicAPIDefinition {
 
     @Streaming
     @GET("getCoverArt.view")
-    fun getCoverArt(
-        @Query("id") id: String,
-        @Query("size") size: Long? = null
-    ): Call<ResponseBody>
+    fun getCoverArt(@Query("id") id: String, @Query("size") size: Long? = null): Call<ResponseBody>
 
     @Streaming
     @GET("stream.view")
@@ -254,6 +263,9 @@ interface SubsonicAPIDefinition {
     @GET("getShares.view")
     fun getShares(): Call<SharesResponse>
 
+    @GET("getShares.view")
+    suspend fun getSharesSuspend(): SharesResponse
+
     @GET("createShare.view")
     fun createShare(
         @Query("id") idsToShare: List<String>,
@@ -285,15 +297,24 @@ interface SubsonicAPIDefinition {
     @GET("getUser.view")
     fun getUser(@Query("username") username: String): Call<GetUserResponse>
 
+    @GET("getUser.view")
+    suspend fun getUserSuspend(@Query("username") username: String): GetUserResponse
+
     @GET("getChatMessages.view")
     fun getChatMessages(@Query("since") since: Long? = null): Call<ChatMessagesResponse>
 
+    @GET("getChatMessages.view")
+    suspend fun getChatMessagesSuspend(@Query("since") since: Long? = null): ChatMessagesResponse
+
     @GET("addChatMessage.view")
     fun addChatMessage(@Query("message") message: String): Call<SubsonicResponse>
 
     @GET("getBookmarks.view")
     fun getBookmarks(): Call<BookmarksResponse>
 
+    @GET("getBookmarks.view")
+    suspend fun getBookmarksSuspend(): BookmarksResponse
+
     @GET("createBookmark.view")
     fun createBookmark(
         @Query("id") id: String,
@@ -307,6 +328,9 @@ interface SubsonicAPIDefinition {
     @GET("getVideos.view")
     fun getVideos(): Call<VideosResponse>
 
+    @GET("getVideos.view")
+    suspend fun getVideosSuspend(): VideosResponse
+
     @GET("getAvatar.view")
     fun getAvatar(@Query("username") username: String): Call<ResponseBody>
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt

@@ -29,20 +29,25 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion:
     V1_13_0("5.3", "1.13.0"),
     V1_14_0("6.0", "1.14.0"),
     V1_15_0("6.1", "1.15.0"),
-    V1_16_0("6.1.2", "1.16.0");
+    V1_16_0("6.1.2", "1.16.0")
+    ;
 
     companion object {
-        @JvmStatic @Throws(IllegalArgumentException::class)
+        @JvmStatic
+        @Throws(IllegalArgumentException::class)
         fun getClosestKnownClientApiVersion(apiVersion: String): SubsonicAPIVersions {
             val versionComponents = apiVersion.split(".")
-            if (versionComponents.size < 2)
-                throw IllegalArgumentException("Unknown api version $apiVersion")
+
+            require(versionComponents.size >= 2) { "Unknown api version $apiVersion" }
 
             try {
                 val majorVersion = versionComponents[0].toInt()
                 val minorVersion = versionComponents[1].toInt()
-                val patchVersion = if (versionComponents.size > 2) versionComponents[2].toInt()
-                else 0
+                val patchVersion = if (versionComponents.size > 2) {
+                    versionComponents[2].toInt()
+                } else {
+                    0
+                }
 
                 when (majorVersion) {
                     1 -> when {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicClientConfiguration.kt

@@ -10,7 +10,7 @@ data class SubsonicClientConfiguration(
     val minimalProtocolVersion: SubsonicAPIVersions,
     val clientID: String,
     val allowSelfSignedCertificate: Boolean = false,
-    val enableLdapUserSupport: Boolean = false,
+    val forcePlainTextPassword: Boolean = false,
     val debug: Boolean = false,
     val isRealProtocolVersion: Boolean = false
 )

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt

@@ -35,7 +35,7 @@ class VersionAwareJacksonConverterFactory(
         type: Type,
         annotations: Array<Annotation>,
         retrofit: Retrofit
-    ): Converter<ResponseBody, *>? {
+    ): Converter<ResponseBody, *> {
         val javaType: JavaType = mapper!!.typeFactory.constructType(type)
         val reader: ObjectReader? = mapper!!.readerFor(javaType)
         return VersionAwareResponseBodyConverter<Any>(notifier, reader!!)
@@ -48,7 +48,10 @@ class VersionAwareJacksonConverterFactory(
         retrofit: Retrofit
     ): Converter<*, RequestBody>? {
         return jacksonConverterFactory?.requestBodyConverter(
-            type, parameterAnnotations, methodAnnotations, retrofit
+            type,
+            parameterAnnotations,
+            methodAnnotations,
+            retrofit
         )
     }
 
@@ -63,7 +66,7 @@ class VersionAwareJacksonConverterFactory(
         }
     }
 
-    class VersionAwareResponseBodyConverter<T> (
+    class VersionAwareResponseBodyConverter<T>(
         private val notifier: (SubsonicAPIVersions) -> Unit = {},
         private val adapter: ObjectReader
     ) : Converter<ResponseBody, T> {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt

@@ -18,7 +18,7 @@ class PasswordHexInterceptor(private val password: String) : Interceptor {
 
     override fun intercept(chain: Chain): Response {
         val originalRequest = chain.request()
-        val updatedUrl = originalRequest.url().newBuilder()
+        val updatedUrl = originalRequest.url.newBuilder()
             .addEncodedQueryParameter("p", passwordHex).build()
         return chain.proceed(originalRequest.newBuilder().url(updatedUrl).build())
     }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt

@@ -21,7 +21,7 @@ class PasswordMD5Interceptor(private val password: String) : Interceptor {
     override fun intercept(chain: Chain): Response {
         val originalRequest = chain.request()
         val salt = getSalt()
-        val updatedUrl = originalRequest.url().newBuilder()
+        val updatedUrl = originalRequest.url.newBuilder()
             .addQueryParameter("t", getPasswordMD5Hash(salt))
             .addQueryParameter("s", salt)
             .build()

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt

@@ -6,6 +6,7 @@ import okhttp3.Interceptor.Chain
 import okhttp3.Response
 
 internal const val SOCKET_READ_TIMEOUT_DOWNLOAD = 30 * 1000
+
 // Allow 20 seconds extra timeout pear MB offset.
 internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02
 
@@ -19,7 +20,7 @@ internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02
 internal class RangeHeaderInterceptor : Interceptor {
     override fun intercept(chain: Chain): Response {
         val originalRequest = chain.request()
-        val headers = originalRequest.headers()
+        val headers = originalRequest.headers
         return if (headers.names().contains("Range")) {
             val offsetValue = headers["Range"] ?: "0"
             val offset = "bytes=$offsetValue-"

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt

@@ -18,7 +18,7 @@ internal class VersionInterceptor(
         val newRequest = originalRequest.newBuilder()
             .url(
                 originalRequest
-                    .url()
+                    .url
                     .newBuilder()
                     .addQueryParameter("v", protocolVersion.restApiVersion)
                     .build()

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt

@@ -1,3 +1,10 @@
+/*
+ * AlbumListOrderType.kt
+ * Copyright (C) 2009-2022 Ultrasonic developers
+ *
+ * Distributed under terms of the GNU GPLv3 license.
+ */
+
 package org.moire.ultrasonic.api.subsonic.models
 
 /**
@@ -16,7 +23,8 @@ enum class AlbumListType(val typeName: String) {
     SORTED_BY_ARTIST("alphabeticalByArtist"),
     STARRED("starred"),
     BY_YEAR("byYear"),
-    BY_GENRE("byGenre");
+    BY_GENRE("byGenre")
+    ;
 
     override fun toString(): String {
         return typeName

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt

@@ -16,7 +16,8 @@ enum class JukeboxAction(val action: String) {
     CLEAR("clear"),
     REMOVE("remove"),
     SHUFFLE("shuffle"),
-    SET_GAIN("setGain");
+    SET_GAIN("setGain")
+    ;
 
     override fun toString(): String {
         return action

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt

@@ -10,7 +10,8 @@ class BookmarksResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("bookmarks") private val bookmarksWrapper = BookmarkWrapper()
+    @JsonProperty("bookmarks")
+    private val bookmarksWrapper = BookmarkWrapper()
 
     val bookmarkList: List<Bookmark> get() = bookmarksWrapper.bookmarkList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt

@@ -10,7 +10,8 @@ class ChatMessagesResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("chatMessages") private val wrapper = ChatMessagesWrapper()
+    @JsonProperty("chatMessages")
+    private val wrapper = ChatMessagesWrapper()
 
     val chatMessages: List<ChatMessage> get() = wrapper.messagesList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt

@@ -10,7 +10,8 @@ class GenresResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("genres") private val genresWrapper = GenresWrapper()
+    @JsonProperty("genres")
+    private val genresWrapper = GenresWrapper()
     val genresList: List<Genre> get() = genresWrapper.genresList
 }
 

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt

@@ -11,7 +11,8 @@ class GetAlbumList2Response(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("albumList2") private val albumWrapper2 = AlbumWrapper2()
+    @JsonProperty("albumList2")
+    private val albumWrapper2 = AlbumWrapper2()
 
     val albumList: List<Album>
         get() = albumWrapper2.albumList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt

@@ -10,7 +10,8 @@ class GetAlbumListResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("albumList") private val albumWrapper = AlbumWrapper()
+    @JsonProperty("albumList")
+    private val albumWrapper = AlbumWrapper()
 
     val albumList: List<Album>
         get() = albumWrapper.albumList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt

@@ -10,7 +10,8 @@ class GetPodcastsResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("podcasts") private val channelsWrapper = PodcastChannelWrapper()
+    @JsonProperty("podcasts")
+    private val channelsWrapper = PodcastChannelWrapper()
 
     val podcastChannels: List<PodcastChannel>
         get() = channelsWrapper.channelsList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt

@@ -10,7 +10,8 @@ class GetRandomSongsResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("randomSongs") private val songsWrapper = RandomSongsWrapper()
+    @JsonProperty("randomSongs")
+    private val songsWrapper = RandomSongsWrapper()
 
     val songsList
         get() = songsWrapper.songsList

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt

@@ -10,7 +10,8 @@ class GetSongsByGenreResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("songsByGenre") private val songsByGenreList = SongsByGenreWrapper()
+    @JsonProperty("songsByGenre")
+    private val songsByGenreList = SongsByGenreWrapper()
 
     val songsList get() = songsByGenreList.songsList
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt

@@ -11,11 +11,13 @@ class JukeboxResponse(
     error: SubsonicError?,
     var jukebox: JukeboxStatus = JukeboxStatus()
 ) : SubsonicResponse(status, version, error) {
-    @JsonSetter("jukeboxStatus") fun setJukeboxStatus(jukebox: JukeboxStatus) {
+    @JsonSetter("jukeboxStatus")
+    fun setJukeboxStatus(jukebox: JukeboxStatus) {
         this.jukebox = jukebox
     }
 
-    @JsonSetter("jukeboxPlaylist") fun setJukeboxPlaylist(jukebox: JukeboxStatus) {
+    @JsonSetter("jukeboxPlaylist")
+    fun setJukeboxPlaylist(jukebox: JukeboxStatus) {
         this.jukebox = jukebox
     }
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt

@@ -10,7 +10,8 @@ class MusicFoldersResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("musicFolders") private val wrapper = MusicFoldersWrapper()
+    @JsonProperty("musicFolders")
+    private val wrapper = MusicFoldersWrapper()
 
     val musicFolders get() = wrapper.musicFolders
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt

@@ -10,7 +10,8 @@ class SharesResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("shares") private val wrappedShares = SharesWrapper()
+    @JsonProperty("shares")
+    private val wrappedShares = SharesWrapper()
 
     val shares get() = wrappedShares.share
 }

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt

@@ -20,12 +20,13 @@ open class SubsonicResponse(
 ) {
     @JsonDeserialize(using = Status.Companion.StatusJsonDeserializer::class)
     enum class Status(val jsonValue: String) {
-        OK("ok"), ERROR("failed");
+        OK("ok"),
+        ERROR("failed");
 
         companion object {
-            fun getStatusFromJson(jsonValue: String) = values()
-                .filter { it.jsonValue == jsonValue }.firstOrNull()
-                ?: throw IllegalArgumentException("Unknown status value: $jsonValue")
+            fun getStatusFromJson(jsonValue: String) =
+                values().firstOrNull { it.jsonValue == jsonValue }
+                    ?: throw IllegalArgumentException("Unknown status value: $jsonValue")
 
             class StatusJsonDeserializer : JsonDeserializer<Status>() {
                 override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Status {

core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt

@@ -10,7 +10,8 @@ class VideosResponse(
     version: SubsonicAPIVersions,
     error: SubsonicError?
 ) : SubsonicResponse(status, version, error) {
-    @JsonProperty("videos") private val videosWrapper = VideosWrapper()
+    @JsonProperty("videos")
+    private val videosWrapper = VideosWrapper()
 
     val videosList: List<MusicDirectoryChild> get() = videosWrapper.videosList
 }

core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt

@@ -18,7 +18,9 @@ class ProxyPasswordInterceptorTest {
 
     private val proxyInterceptor = ProxyPasswordInterceptor(
         V1_12_0,
-        mockPasswordHexInterceptor, mockPasswordMd5Interceptor, false
+        mockPasswordHexInterceptor,
+        mockPasswordMd5Interceptor,
+        false
     )
 
     @Test
@@ -40,8 +42,10 @@ class ProxyPasswordInterceptorTest {
     @Test
     fun `Should use hex password if forceHex is true`() {
         val interceptor = ProxyPasswordInterceptor(
-            V1_16_0, mockPasswordHexInterceptor,
-            mockPasswordMd5Interceptor, true
+            V1_16_0,
+            mockPasswordHexInterceptor,
+            mockPasswordMd5Interceptor,
+            true
         )
 
         interceptor.intercept(mockChain)

core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListTypeTest.kt

@@ -36,6 +36,7 @@ class AlbumListTypeTest {
 
     @Test
     fun `Should return type name for toString call`() {
-        AlbumListType.STARRED.typeName `should be equal to` AlbumListType.STARRED.toString()
+        AlbumListType.STARRED.typeName `should be equal to`
+            AlbumListType.STARRED.toString()
     }
 }

detekt-baseline.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" ?>
-<SmellBaseline>
-  <ManuallySuppressedIssues></ManuallySuppressedIssues>
-  <CurrentIssues>
-    <ID>ComplexCondition:DownloadHandler.kt$DownloadHandler.&lt;no name provided&gt;$!append &amp;&amp; !playNext &amp;&amp; !unpin &amp;&amp; !background</ID>
-    <ID>ComplexCondition:FilePickerAdapter.kt$FilePickerAdapter$currentDirectory.absolutePath == "/" || currentDirectory.absolutePath == "/storage" || currentDirectory.absolutePath == "/storage/emulated" || currentDirectory.absolutePath == "/mnt"</ID>
-    <ID>ComplexMethod:DownloadFile.kt$DownloadFile.DownloadTask$override fun execute()</ID>
-    <ID>ComplexMethod:FilePickerAdapter.kt$FilePickerAdapter$private fun fileLister(currentDirectory: File)</ID>
-    <ID>ComplexMethod:SongView.kt$SongView$fun setSong(song: MusicDirectory.Entry, checkable: Boolean, draggable: Boolean)</ID>
-    <ID>ComplexMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun enableButtons()</ID>
-    <ID>ComplexMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun updateInterfaceWithEntries(musicDirectory: MusicDirectory)</ID>
-    <ID>ImplicitDefaultLocale:DownloadFile.kt$DownloadFile$String.format("DownloadFile (%s)", song)</ID>
-    <ID>ImplicitDefaultLocale:DownloadFile.kt$DownloadFile.DownloadTask$String.format("Download of '%s' was cancelled", song)</ID>
-    <ID>ImplicitDefaultLocale:DownloadFile.kt$DownloadFile.DownloadTask$String.format("DownloadTask (%s)", song)</ID>
-    <ID>ImplicitDefaultLocale:EditServerFragment.kt$EditServerFragment.&lt;no name provided&gt;$String.format( "%s %s", resources.getString(R.string.settings_connection_failure), getErrorMessage(error) )</ID>
-    <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Failed to write log to %s", file)</ID>
-    <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Log file rotated, logging into file %s", file?.name)</ID>
-    <ID>ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Logging into file %s", file?.name)</ID>
-    <ID>ImplicitDefaultLocale:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$String.format("BufferTask (%s)", downloadFile)</ID>
-    <ID>ImplicitDefaultLocale:LocalMediaPlayer.kt$LocalMediaPlayer.CheckCompletionTask$String.format("CheckCompletionTask (%s)", downloadFile)</ID>
-    <ID>ImplicitDefaultLocale:ShareHandler.kt$ShareHandler$String.format("%d:%s", timeSpanAmount, timeSpanType)</ID>
-    <ID>ImplicitDefaultLocale:SongView.kt$SongView$String.format("%02d.", trackNumber)</ID>
-    <ID>ImplicitDefaultLocale:SongView.kt$SongView$String.format("%s ", bitRate)</ID>
-    <ID>ImplicitDefaultLocale:SongView.kt$SongView$String.format("%s &gt; %s", suffix, transcodedSuffix)</ID>
-    <ID>LargeClass:TrackCollectionFragment.kt$TrackCollectionFragment : Fragment</ID>
-    <ID>LongMethod:DownloadFile.kt$DownloadFile.DownloadTask$override fun execute()</ID>
-    <ID>LongMethod:EditServerFragment.kt$EditServerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
-    <ID>LongMethod:LocalMediaPlayer.kt$LocalMediaPlayer$@Synchronized private fun doPlay(downloadFile: DownloadFile, position: Int, start: Boolean)</ID>
-    <ID>LongMethod:NavigationActivity.kt$NavigationActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
-    <ID>LongMethod:ShareHandler.kt$ShareHandler$private fun showDialog( fragment: Fragment, shareDetails: ShareDetails, swipe: SwipeRefreshLayout?, cancellationToken: CancellationToken )</ID>
-    <ID>LongMethod:SongView.kt$SongView$fun setSong(song: MusicDirectory.Entry, checkable: Boolean, draggable: Boolean)</ID>
-    <ID>LongMethod:TrackCollectionFragment.kt$TrackCollectionFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean</ID>
-    <ID>LongMethod:TrackCollectionFragment.kt$TrackCollectionFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
-    <ID>LongMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun updateDisplay(refresh: Boolean)</ID>
-    <ID>LongMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun updateInterfaceWithEntries(musicDirectory: MusicDirectory)</ID>
-    <ID>LongParameterList:ServerRowAdapter.kt$ServerRowAdapter$( private var context: Context, private var data: Array&lt;ServerSetting&gt;, private val model: ServerSettingsModel, private val activeServerProvider: ActiveServerProvider, private val manageMode: Boolean, private val serverDeletedCallback: ((Int) -&gt; Unit), private val serverEditRequestedCallback: ((Int) -&gt; Unit) )</ID>
-    <ID>MagicNumber:ActiveServerProvider.kt$ActiveServerProvider$8192</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.&lt;no name provided&gt;$60000</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$100000</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$8</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$86400L</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$8L</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.CheckCompletionTask$5000L</ID>
-    <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$3</ID>
-    <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$4</ID>
-    <ID>MagicNumber:RESTMusicService.kt$RESTMusicService$206</ID>
-    <ID>MagicNumber:SongView.kt$SongView$3</ID>
-    <ID>MagicNumber:SongView.kt$SongView$4</ID>
-    <ID>MagicNumber:SongView.kt$SongView$60</ID>
-    <ID>NestedBlockDepth:DownloadFile.kt$DownloadFile.DownloadTask$override fun execute()</ID>
-    <ID>NestedBlockDepth:DownloadHandler.kt$DownloadHandler$private fun downloadRecursively( fragment: Fragment, id: String, name: String?, isShare: Boolean, isDirectory: Boolean, save: Boolean, append: Boolean, autoPlay: Boolean, shuffle: Boolean, background: Boolean, playNext: Boolean, unpin: Boolean, isArtist: Boolean )</ID>
-    <ID>NestedBlockDepth:MediaPlayerService.kt$MediaPlayerService$private fun setupOnSongCompletedHandler()</ID>
-    <ID>ReturnCount:ServerRowAdapter.kt$ServerRowAdapter$ private fun popupMenuItemClick(menuItem: MenuItem, position: Int): Boolean</ID>
-    <ID>ReturnCount:TrackCollectionFragment.kt$TrackCollectionFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean</ID>
-    <ID>TooGenericExceptionCaught:DownloadFile.kt$DownloadFile$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:FileLoggerTree.kt$FileLoggerTree$x: Throwable</ID>
-    <ID>TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$ex: Exception</ID>
-    <ID>TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$exception: Throwable</ID>
-    <ID>TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$x: Exception</ID>
-    <ID>TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer.PositionCache$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:SongView.kt$SongView$e: Exception</ID>
-    <ID>TooGenericExceptionThrown:DownloadFile.kt$DownloadFile.DownloadTask$throw Exception(String.format("Download of '%s' was cancelled", song))</ID>
-    <ID>TooManyFunctions:MediaPlayerService.kt$MediaPlayerService : Service</ID>
-    <ID>TooManyFunctions:RESTMusicService.kt$RESTMusicService : MusicService</ID>
-    <ID>TooManyFunctions:TrackCollectionFragment.kt$TrackCollectionFragment : Fragment</ID>
-    <ID>UtilityClassWithPublicConstructor:FragmentTitle.kt$FragmentTitle</ID>
-  </CurrentIssues>
-</SmellBaseline>

fastlane/metadata/android/en-US/changelogs/100.txt

@@ -1,4 +1,3 @@
 Others
-
 - #671: Bump versions.mockito from 4.1.0 to 4.3.1.
 - Update translations.

fastlane/metadata/android/en-US/changelogs/101.txt

@@ -1,4 +1,3 @@
 Enhancements
-
 - #683: Rewrite the about and remove the webview.
 - #685: Server coloring feature.

fastlane/metadata/android/en-US/changelogs/102.txt

@@ -0,0 +1,2 @@
+Bug fixes
+- #688: Connection failure.

fastlane/metadata/android/en-US/changelogs/103.txt

@@ -0,0 +1,14 @@
+Bug fixes
+- #673: Disabling "Browse Using ID3 Tags" causes artist search result content to mismatch.
+- #679: Keyboard should be hidden when navigating away from Search.
+- #686: In landscape mode, the scroll bar is missing in the about text.
+- #691: TrackCollectionFragment: fix play all button.
+- #698: Track based context menus do not function correctly in most fragments.
+
+Features
+- #669: Option to change language.
+
+Enhancements
+- #654: Update OkHttp.
+- #694: Reword alert for better help.
+- #702: Show Downloads on Play.

fastlane/metadata/android/en-US/changelogs/104.txt

@@ -0,0 +1,37 @@
+Release notes
+Ultrasonic 4.0.0 brings along a complete overhaul of how media is being played back. We have switched to a modern library to handle the playback and fixed wuite a few bugs in the process.
+Additionally the Offline mode now supports browsing based on ID3 tags. This requires additional metadata which will be missing for tracks downloaded with previous versions. If you enable this setting, the app will therefore show only the music that you have downloaded with 4.0.0 or later.
+
+Bug fixes
+- #621: Empty notification shouldn't be visible.
+- #664: Weird behaviour and system crash.
+- #680: Now playing list should be able to distinguish duplicate items.
+- #696: Ultrasonic is activated with BT even when all media play functions are disabled.
+- #697: No sound after one track.
+- #717: Insert after current song not fully working.
+- #735: No longer showing any track data via bluetooth.
+- #738: App no longer appears as running or in notifications when resuming playback after wake.
+- #742: Pinned/downloaded music gets wiped/deleted on exit & start.
+- #759: Crash browsing by folder (unchecking browsing by ID3 label in config).
+- #767: Shuffle setting does not persist after reboot/resume.
+- #768: Album art doesn't appear in the media notification.
+- #769: The setting "settings.show_artist_picture" do nothing.
+- #776: Strange behavior in device rotation.
+- #785: Buttons below track list don't update anymore
+- #787: The down arrow is no longer animated when downloading new tracks.
+
+Enhancements
+- #426: Start service only when playback is started by the user.
+- #432: Ultrasonic notification should be dismissible by swipe.
+- #553: Duration not read from metadata.
+- #581: Bluetooth not updating Now Playing information anymore.
+- #718: Add ID3 support when offline.
+- #727: Disable LoggingInterceptor for Streaming calls.
+- #739: Add more preload values.
+- #752: Target SDK 31.
+- #756: Android Auto needs work.
+- #775: Use Picasso to load images for the notification.
+
+Others
+- #751: Remove Jacoco.
+- #786: Update to MediaBeta02.

fastlane/metadata/android/en-US/changelogs/105.txt

@@ -0,0 +1,27 @@
+Bug fixes
+- #765: Bad performance in Track scrolling.
+- #779: Starting playback from Bluetooth should display the Media
+  notification.
+- #780: Album art isn't displayed on first play of a non-cached track.
+- #790: Items shouldn't be stuck in the ActivelyDownloading queue.
+- #792: LyricsFragment unaccessible.
+- #794: Equalizer broken.
+- #795: Backups not allowed.
+- #797: Server setting 'Jukebox By Default' broken.
+- #798: Jukebox mode in 4.0.0 seems mostly broken.
+- #799: Trying to open settings crashes the app.
+- #801: Last.FM scrobbling broken on v4.0.0.
+- #817: Crash when switching to Offline mode.
+
+Enhancements
+- #734: Migrate Downloader.
+- #778: Do not show badge on Ultrasonic icon during playback.
+- #784: Redesign Album Art download and cache handling.
+- #796: Make the app more material.
+- #815: Download buttons don't show when a track is downloading.
+- #826: Reword the force plain text password setting.
+
+Others
+- #510: Use SafeArgs for remaining fragments.
+- #793: Remove Visualizer.
+- #818: Add Renovatebot.

fastlane/metadata/android/en-US/changelogs/106.txt

@@ -0,0 +1,6 @@
+Bug fixes
+- #821: Multiple podcast selected = Never-ending buffering.
+- !847: Fix Download bug in Custom Locations.
+
+Enhancements
+- !820: Updated widget handling and layouts, add Day&Night theme.

fastlane/metadata/android/en-US/changelogs/107.txt

@@ -0,0 +1,8 @@
+Bug fixes
+- #823: Version 4 caches incomplete files (poor download error handling?).
+- #832: Version 4.1.1 and develop: back(-navigation) no longer possible.
+- #835: Crashing when play all songs in offline mode.
+- #837: Saving playlist fails.
+
+Enhancements
+- #816: Accented letters should not be added seperately in the Artists list.

fastlane/metadata/android/en-US/changelogs/108.txt

@@ -0,0 +1,8 @@
+Bug fixes
+- #833: Widget height is always a minimum of 2 rows instead of previous 1 row.
+- #840: DownloadTask shouldn't be started multiple times for a track.
+- !849: Bunch of fixes 💐.
+
+Enhancements
+- #841: Remove whitespace as default text in server settings.
+- !865: Fix a small deprecation notice.

fastlane/metadata/android/en-US/changelogs/109.txt

@@ -0,0 +1 @@
+See 110

fastlane/metadata/android/en-US/changelogs/110.txt

@@ -0,0 +1,7 @@
+Bug fixes
+- #849: NoSuchElementException.
+- !874: Fix a crash.
+
+Features
+- #806: Display albums sorted chronologically.
+- #843: Add Album cover view (Rework UI).

fastlane/metadata/android/en-US/changelogs/111.txt

@@ -0,0 +1,5 @@
+Bug fixes
+- #848: ConcurrentModification crash.
+
+Enhancements
+- #859: "Download on Wi-Fi only" setting doesn't detect Wi-Fi when VPN is enabled.

fastlane/metadata/android/en-US/changelogs/112.txt

@@ -0,0 +1,14 @@
+Bug fixes
+- #831: Version 4.1.1 and develop: 'jukebox on/off' no longer shown in 'Now Playing'.
+- #850: ArrayIndexOutOfBoundsException.
+- #858: Playlist is empty on relauch.
+- #861: Podcast titles all shown as "null".
+- #863: Ultrasonic crashes on startup when pointed to subsonic demo server.
+- #864: Ultrasonic sends invalid URLs when Server Address ends in '/'.
+- #867: Ultrasonic shouldn't crash when deleting a playlist.
+- #872: Ultrasonic should handle custom cache location without creating multiple copies of a track.
+- #886: Jukebox crashes since 4.2.1.
+
+Enhancements
+- #829: isJukeBoxAvailable is called on every visit of PlayerFragment.
+- #854: Remove Videos menu option for servers which don't support it.

fastlane/metadata/android/en-US/changelogs/113.txt

@@ -0,0 +1,7 @@
+Bug fixes
+- #831: Version 4.1.1 and develop: 'jukebox on/off' no longer shown in 'Now Playing'.
+
+Enhancements
+- #827: Make app full compliant Android Auto to publish in Play Store.
+- #878: "Play shuffled" option for playlists always begins with the first track.
+- #891: Dump config to log file when logging is enabled.

fastlane/metadata/android/en-US/changelogs/114.txt

@@ -0,0 +1,4 @@
+Bug fixes
+- Fix a crash when a ID3 tag date is in a wrong format.
+- Fix a crash on API 31 (newest Android).
+- Fix empty search results.

fastlane/metadata/android/en-US/changelogs/115.txt

@@ -0,0 +1,2 @@
+Bug fixes
+- Fix a crash when downloading the album art.

fastlane/metadata/android/en-US/changelogs/116.txt

@@ -0,0 +1,8 @@
+Bug fixes
+- Fix various crashes
+
+Changes since 4.2.0
+- #827: Make app full compliant Android Auto to publish in Play Store.
+- #878: "Play shuffled" option for playlists always begins with the first track.
+- #891: Dump config to log file when logging is enabled.
+- #854: Remove Videos menu option for servers which don't support it.

fastlane/metadata/android/en-US/changelogs/117.txt

@@ -0,0 +1,8 @@
+Bug fixes
+- Fix more exceptions
+
+Changes since 4.2.0
+- #827: Make app full compliant Android Auto to publish in Play Store.
+- #878: "Play shuffled" option for playlists always begins with the first track.
+- #891: Dump config to log file when logging is enabled.
+- #854: Remove Videos menu option for servers which don't support it.

fastlane/metadata/android/en-US/changelogs/119.txt

@@ -0,0 +1,10 @@
+Features:
+- This releases focuses on shuffled playback. The view of the playlist will now present itself in the order it will actually play. You can toggle the shuffle mode to create a new order, while the past playback history will be preserved.
+- Use Coroutines for triggering the download or playback of music through the context menus
+- Enable Artists pictures by Default
+
+Bug fixes:
+- Remove an unhelpful popup that "ID must be set"
+- Shuffle mode doesn't always play all tracks
+- Shuffle mode starts with the first track most of the time
+

fastlane/metadata/android/en-US/changelogs/120.txt

@@ -0,0 +1,10 @@
+Features:
+- This releases focuses on shuffled playback. The view of the playlist will now present itself in the order it will actually play. You can toggle the shuffle mode to create a new order, while the past playback history will be preserved.
+- Use Coroutines for triggering the download or playback of music through the context menus
+- Enable Artists pictures by Default
+
+Bug fixes:
+- Remove an unhelpful popup that "ID must be set"
+- Shuffle mode doesn't always play all tracks
+- Shuffle mode starts with the first track most of the time
+

fastlane/metadata/android/en-US/changelogs/122.txt

@@ -0,0 +1,10 @@
+Features:
+- Revamp management of ratings. Tracks can be starred from the notification in Android 13, and the changes will show up everywhere immediately.
+- Add a setting to control the maximum bitrate when pinning music (can be used to avoid downloading lossless files like flac).
+- Modernize the Jukebox player.
+- The hardware keys can be used to set the Jukebox volume.
+- The current playlist shows a spinner when loading takes some time
+
+Bug fixes:
+- Request correct bluetooth permission on Android 13 (needed to pause/play on connect)
+- Update dependencies (OkHttp, Material)

fastlane/metadata/android/en-US/changelogs/123.txt

@@ -0,0 +1,12 @@
+Features:
+- Search is accesible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active
+- Upgrade material to 1.9.0
+

fastlane/metadata/android/en-US/changelogs/124.txt

@@ -0,0 +1,15 @@
+Features:
+- Search is accessible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Readd the "Star" button to the Now Playing screen
+- Fix a rare crash when shuffling playlists with duplicate entries
+- Fix a crash when choosing "Play next" on an empty playlist.
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active
+- Upgrade material to 1.9.0
+

fastlane/metadata/android/en-US/changelogs/125.txt

@@ -0,0 +1,15 @@
+Features:
+- Search is accessible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Avoid triggering a bug in Supysonic
+- Readd the "Star" button to the Now Playing screen
+- Fix a rare crash when shuffling playlists with duplicate entries
+- Fix a crash when choosing "Play next" on an empty playlist.
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active
+

fastlane/metadata/android/en-US/changelogs/126.txt

@@ -0,0 +1,15 @@
+Features:
+- Search is accessible through a new icon on the main screen
+- Modernize Back Handling
+- Reenable R8 Code minification
+- Add a "Play Random Songs" shortcut
+
+Bug fixes:
+- Fix a few crashes
+- Avoid triggering a bug in Supysonic
+- Readd the "Star" button to the Now Playing screen
+- Fix a rare crash when shuffling playlists with duplicate entries
+- Fix a crash when choosing "Play next" on an empty playlist.
+- Tracks buttons flash a scrollbar sometimes in Android 13
+- Fix EndlessScrolling in genre listing
+- Couldn't delete a track when shuffle was active

fastlane/metadata/android/en-US/changelogs/128.txt

@@ -0,0 +1,9 @@
+### Features
+- Added custom buttons for shuffling the current queue and setting repeat mode (Android Auto)
+- Properly handling nested directory structures (Android Auto)
+- Add a toast when adding tracks to the playlist
+- Allow pinning when offline
+
+### Dependencies
+- Update koin
+- Update media3 to v1.1.0

fastlane/metadata/android/en-US/changelogs/129.txt

@@ -0,0 +1,12 @@
+### Fixes
+- Fix a bug in 4.7.0 that repeat mode was activated by default.
+
+### Features
+- Added custom buttons for shuffling the current queue and setting repeat mode (Android Auto)
+- Properly handling nested directory structures (Android Auto)
+- Add a toast when adding tracks to the playlist
+- Allow pinning when offline
+
+### Dependencies
+- Update koin
+- Update media3 to v1.1.0