Merge branch 'develop' into release/1.6.0

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,95 @@
+name: Bug Report
+description: Create a report to help us improve
+labels: ["type:bug"]
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Please agree to the following
+      options:
+      - label: I have searched [existing issues](https://github.com/cryptomator/android/issues?q=) for duplicates
+        required: true
+      - label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/android/blob/develop/.github/CODE_OF_CONDUCT.md)
+        required: true
+  - type: input
+    id: summary
+    attributes:
+      label: Summary
+      placeholder: Please summarize your problem.
+    validations:
+      required: true
+  - type: textarea
+    id: software-versions
+    attributes:
+      label: System Setup
+      description: |
+        What software is involved? Please provide version numbers as well.
+      value: |
+          - Android: [Version shown in the settings of Android"]
+          - Cryptomator: [Version shown in the settings of Cryptomator]
+          - …
+      render: markdown
+    validations:
+      required: true
+  - type: dropdown
+    id: cloud-type
+    attributes:
+      label: Cloud Type
+      description: Where is your vault located?
+      multiple: true
+      options:
+        - Dropbox
+        - Google Drive
+        - OneDrive
+        - WebDAV
+        - pCloud
+        - S3
+        - Local storage
+    validations:
+      required: false
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Steps to Reproduce
+      value: |
+          1. [First Step]
+          2. [Second Step]
+          3. …
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected Behavior
+      placeholder: What you expect to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behaviour
+    attributes:
+      label: Actual Behavior
+      placeholder: What actually happens.
+    validations:
+      required: true
+  - type: dropdown
+    id: reproducibility
+    attributes:
+      label: Reproducibility
+      description: How often does the described behaviour occur?
+      options:
+        - Always
+        - Intermittent
+        - Only once
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Log Output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: further-info
+    attributes:
+      label: Anything else?
+      description: Links? References? Screenshots? Configurations? Any data that might be necessary to reproduce the issue?

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest an idea for this project
+labels: ["type:feature-request"]
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Please agree to the following
+      options:
+      - label: I have searched [existing issues](https://github.com/cryptomator/android/issues?q=) for duplicates
+        required: true
+      - label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/android/blob/develop/.github/CODE_OF_CONDUCT.md)
+        required: true
+  - type: input
+    id: summary
+    attributes:
+      label: Summary
+      placeholder: Please summarize your feature request.
+    validations:
+      required: true
+  - type: textarea
+    id: motivation
+    attributes:
+      label: Motivation
+      description: Who requires this feature? What problem does the user face? How would this feature solve the problem?
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Considered Alternatives
+      description: What current alternatives or workarounds have you considered? Is there a different way to solve the same problem?
+  - type: textarea
+    id: context
+    attributes:
+      label: Anything else?
+      description: Any context, suggestions, screenshots, or concepts you want to share?

README.md

@@ -45,43 +45,6 @@ Please make sure before creating a PR, to apply the code style by executing refo
 
 Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](.github/CODE_OF_CONDUCT.md).
 
-## Deployment
-
-Follow these steps to deploy a release:
-
-1. Check `TODO`/`FIXME` comments
-   - Create issue for or delete
-   - Regexp for "Find in Path": `\W(TODO|FIXME)(?! #[0-9]{1,4}:)`
-1. Merge translations
-1. Check latest dependencies
-1. Create release branch
-1. Test database migration
-1. Smoke-Test changed or added functionality
-1. Update version
-1. Create and commit release notes
-1. Merge in `main`
-1. Create tag and execute deploy app using Fastlane
-1. Close GitHub-issues or move them to next milestone
-1. Close milestone
-1. Update version on website ([cryptomator.org/android](https://cryptomator.org/android/))
-
-### Release Notes
-
-Before tagging the release, create and commit the release notes. For Playstore create [fastlane/metadata/android/de-DE/changelogs/default.txt](https://github.com/cryptomator/android/blob/develop/fastlane/metadata/android/de-DE/changelogs/default.txt), [fastlane/metadata/android/en-US/changelogs/default.txt](https://github.com/cryptomator/android/blob/develop/fastlane/metadata/android/en-US/changelogs/default.txt) and for the website create [fastlane/release-notes.html](https://github.com/cryptomator/android/blob/develop/fastlane/release-notes.html).
-
-### Deploy app using Fastlane
-
-Deploy production version to Google Play, Website/GitHub-Releases and F-Droid using `fastlane android deploy` or `bundle exec fastlane deploy`
-
-There are further targets and options like `beta`, see [fastlane/README.md](https://github.com/cryptomator/android/blob/develop/fastlane/README.md)
-
-### Initial setup Fastlane
-
-1. Make sure you copied `.default.env` to `.env` in the `fastlane` folder and filled out those variables.
-1. Install Ruby (depends on OS, Ubuntu): `sudo apt install ruby-dev`
-1. Install fastlane (depends on OS, Ubuntu): `gem install fastlane -N`
-1. Install `fdroidserver` using `apt`, `pacman`, ..., see https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/
-
 ## License
 
 This project is dual-licensed under the GPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to modify this application under different conditions, feel free to contact our support team.

fastlane/Fastfile

@@ -229,15 +229,15 @@ platform :android do |options|
 
     FileUtils.mkdir("unsigned")
 
-    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "unsigned/org.cryptomator_#{version}.apk")
+    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "unsigned/org.cryptomator_fdroid.apk")
 
     sh("ISSUEBOT_CURRENT_APPLICATION_ID=org.cryptomator ISSUEBOT_CURRENT_REPLY_FILE=current_result.json php iod-scan-apk.php")
 
     # clean up
     FileUtils.rm("libinfo.txt")
     FileUtils.rm("libsmali.txt")
     FileUtils.rm_r("unsigned")
-    FileUtils.rm_r("org.cryptomator_#{version}")
+    FileUtils.rm_r("org.cryptomator_fdroid")
 
     puts "Check if something changed in the APK regarding the dependencies"