From 80001ffafad38e2d480ad01d2fdf8ecf72500395 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 28 Sep 2023 06:30:53 +0000 Subject: [PATCH] Update readmes and links --- PRIVACY.md | 7 +++---- README.md | 16 +++++++++++++--- .../main/java/io/xpipe/app/prefs/AboutComp.java | 14 +++++++------- .../main/java/io/xpipe/app/util/Hyperlinks.java | 1 + .../app/resources/lang/preferences_en.properties | 2 ++ 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index 9350ab1c..04a9fb4b 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -9,14 +9,13 @@ such as when you: * Download and use our application (XPipe) -**Questions or concerns?** Reading this privacy notice will help you understand your privacy rights and choices. If you -do not agree with our policies and practices, please do not use our Services. If you still have any questions or -concerns, please contact us at hello@xpipe.io. - **1\. WHAT INFORMATION DO WE COLLECT?** We do not process personal or sensitive information. +Note that there exist a separate privacy policy in case you choose to submit an issue report through the included issue reporter. +You can find the issue reporter privacy policy [here](/app/src/main/resources/io/xpipe/app/resources/misc/report_privacy_policy.md) in this repository, but it will also be shown within the issue reporter. + **2\. HOW CAN YOU CONTACT US ABOUT THIS NOTICE?** If you have questions or comments, you may contact us by email at hello@xpipe.io. diff --git a/README.md b/README.md index f839a03a..d8269d31 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you don't like installers, you can also use portable versions that are packag - [MacOS .dmg Portable (x86-64)](https://github.com/xpipe-io/xpipe/releases/latest/download/xpipe-portable-macos-x86_64.dmg) - [MacOS .dmg Portable (ARM 64)](https://github.com/xpipe-io/xpipe/releases/latest/download/xpipe-portable-macos-arm64.dmg) -### Install Script +### Command-line You can also install XPipe by pasting the installation command into your terminal. This will perform the full setup automatically. @@ -88,13 +88,23 @@ The script supports installation via `apt`, `rpm`, and `pacman` on Linux, plus a bash <(curl -sL https://raw.githubusercontent.com/xpipe-io/xpipe/master/get-xpipe.sh) ``` +Alternatively on arch, the [xpipe AUR package](https://aur.archlinux.org/packages/xpipe) can also be installed via `yay -S xpipe`. + ##### Windows +This script will automatically install the `.msi` for you. + ``` powershell -ExecutionPolicy Bypass -Command iwr "https://raw.githubusercontent.com/xpipe-io/xpipe/master/get-xpipe.ps1" -OutFile "$env:TEMP\get-xpipe.ps1" ";" "&" "$env:TEMP\get-xpipe.ps1" ``` -## Tiers +If you like chocolatey, you can also install the [xpipe choco package](https://community.chocolatey.org/packages/xpipe/1.6.0): + +``` +choco install xpipe +``` + +## Commercial usage Recently I decided to try to develop XPipe full-time. To finance this, there now is a professional tier intended for commercial users. The free community tier comes with the full feature set and no restrictions on anything as long you are using it for non-commercial purposes. For commercial usage, I would like to ask you to purchase an [XPipe professional license](https://buy.xpipe.io/checkout/buy/dbcd37b8-be94-40a5-8c1c-af61979e6537). You can try out XPipe as much as you want in a non-commercial setting or start a free trial if you want to test it in your commercial environments prior to purchasing a license. @@ -107,7 +117,7 @@ This mainly concerns the features only available in the professional tier and th ## Further information -You have more questions? Then check out the new [FAQ](/FAQ.md). +You have more questions? Then check out the [FAQ](/FAQ.md). For information about the security model of XPipe, see the [security page](/SECURITY.md). diff --git a/app/src/main/java/io/xpipe/app/prefs/AboutComp.java b/app/src/main/java/io/xpipe/app/prefs/AboutComp.java index c748952a..26363e0c 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AboutComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AboutComp.java @@ -36,13 +36,6 @@ public class AboutComp extends Comp> { }) .grow(true, false), null) - .addComp( - new TileButtonComp("github", "githubDescription", "mdi2g-github", e -> { - Hyperlinks.open(Hyperlinks.GITHUB); - e.consume(); - }) - .grow(true, false), - null) .addComp( new TileButtonComp("securityPolicy", "securityPolicyDescription", "mdrmz-security", e -> { Hyperlinks.open(Hyperlinks.SECURITY); @@ -69,6 +62,13 @@ public class AboutComp extends Comp> { }) .grow(true, false), null) + .addComp( + new TileButtonComp("termsOfService", "termsOfServiceDescription", "mdi2c-card-text-outline", e -> { + Hyperlinks.open(Hyperlinks.TOS); + e.consume(); + }) + .grow(true, false), + null) .buildComp(); } diff --git a/app/src/main/java/io/xpipe/app/util/Hyperlinks.java b/app/src/main/java/io/xpipe/app/util/Hyperlinks.java index 3e6f2b0f..b6f7c634 100644 --- a/app/src/main/java/io/xpipe/app/util/Hyperlinks.java +++ b/app/src/main/java/io/xpipe/app/util/Hyperlinks.java @@ -8,6 +8,7 @@ public class Hyperlinks { public static final String DOCUMENTATION = "https://docs.xpipe.io"; public static final String GITHUB = "https://github.com/xpipe-io/xpipe"; public static final String PRIVACY = "https://github.com/xpipe-io/xpipe/blob/master/PRIVACY.md"; + public static final String TOS = "https://github.com/xpipe-io/xpipe/blob/master/app/src/main/resources/io/xpipe/app/resources/misc/tos.md"; public static final String SECURITY = "https://github.com/xpipe-io/xpipe/blob/master/SECURITY.md"; public static final String DISCORD = "https://discord.gg/8y89vS8cRb"; public static final String SLACK = diff --git a/app/src/main/resources/io/xpipe/app/resources/lang/preferences_en.properties b/app/src/main/resources/io/xpipe/app/resources/lang/preferences_en.properties index 7f4c76c1..e6bc0bcf 100644 --- a/app/src/main/resources/io/xpipe/app/resources/lang/preferences_en.properties +++ b/app/src/main/resources/io/xpipe/app/resources/lang/preferences_en.properties @@ -18,6 +18,8 @@ selectAll=Select all command=Command advanced=Advanced thirdParty=Open source notices +termsOfService=Terms of service +termsOfServiceDescription=Read the terms of service for the XPipe application thirdPartyDescription=View the open source licenses of third-party libraries workspaceLock=Master passphrase enableGitStorage=Enable git storage