summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--README.md2
-rw-r--r--android/build.gradle6
-rw-r--r--android/src/main/play/contact-email.txt1
-rw-r--r--android/src/main/play/contact-website.txt1
-rw-r--r--android/src/main/play/default-language.txt1
-rw-r--r--android/src/main/play/listings/en-US/full-description.txt44
-rw-r--r--[-rwxr-xr-x]android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png (renamed from graphics/Android-feature-graphics.png)bin197879 -> 197879 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/icon/icon.pngbin0 -> 19582 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.pngbin0 -> 73841 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.pngbin0 -> 65910 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.pngbin0 -> 77371 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.pngbin0 -> 77378 bytes
-rw-r--r--android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.pngbin0 -> 58620 bytes
-rw-r--r--android/src/main/play/listings/en-US/short-description.txt1
-rw-r--r--android/src/main/play/listings/en-US/title.txt1
-rw-r--r--android/src/main/play/release-notes/en-US/beta.txt7
-rw-r--r--graphics/README.md19
-rw-r--r--graphics/icon-square.svg (renamed from graphics/icon-ios.svg)0
-rwxr-xr-xios/convert-assets.rb2
20 files changed, 84 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b235a6c73d..b6e4ca74d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
/windows/**/*.user
/android/keystore.properties
/android/local.properties
+/android/play-api-key.json
/wireguard/libwg/libwg.h
/wireguard/libwg/libwg.exp
/wireguard/libwg/exports.def
diff --git a/README.md b/README.md
index 973f805f02..adb237220d 100644
--- a/README.md
+++ b/README.md
@@ -584,7 +584,7 @@ Icons such as the logo and menubar icons are automatically generated. The source
|------|-------|
| `graphics/icon.svg` | The logo icon used for e.g. application icon and in app logo |
| `graphics/icon-mono.svg` | The logo icon used for the android notification icon |
-| `graphics/icon-ios.svg` | Logo icon used to generate the iOS application icon |
+| `graphics/icon-square.svg` | Logo icon used to generate the iOS application icon |
| `gui/assets/images/*.svg` | Icons used to generate iOS icons and used in the desktop app |
| `gui/assets/images/menubar icons/svg/*.svg` | The frames for the menubar icon |
diff --git a/android/build.gradle b/android/build.gradle
index 3abe125926..30f6a65b8a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
+apply plugin: 'com.github.triplet.play'
apply plugin: 'kotlin-android'
def repoRootPath = projectDir.absoluteFile.parentFile.absolutePath
@@ -69,6 +70,10 @@ android {
}
}
+play {
+ serviceAccountCredentials = file("play-api-key.json")
+}
+
repositories {
jcenter()
google()
@@ -94,6 +99,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.6.0'
+ classpath 'com.github.triplet.gradle:play-publisher:2.7.5'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20'
}
}
diff --git a/android/src/main/play/contact-email.txt b/android/src/main/play/contact-email.txt
new file mode 100644
index 0000000000..001a8c0cf1
--- /dev/null
+++ b/android/src/main/play/contact-email.txt
@@ -0,0 +1 @@
+support@mullvad.net
diff --git a/android/src/main/play/contact-website.txt b/android/src/main/play/contact-website.txt
new file mode 100644
index 0000000000..08ee598e0f
--- /dev/null
+++ b/android/src/main/play/contact-website.txt
@@ -0,0 +1 @@
+https://mullvad.net/
diff --git a/android/src/main/play/default-language.txt b/android/src/main/play/default-language.txt
new file mode 100644
index 0000000000..beb9970be0
--- /dev/null
+++ b/android/src/main/play/default-language.txt
@@ -0,0 +1 @@
+en-US
diff --git a/android/src/main/play/listings/en-US/full-description.txt b/android/src/main/play/listings/en-US/full-description.txt
new file mode 100644
index 0000000000..d76dc9fe7a
--- /dev/null
+++ b/android/src/main/play/listings/en-US/full-description.txt
@@ -0,0 +1,44 @@
+<b>Get started</b>
+
+1. Install the app.
+2. Click &ldquo;Create account&rdquo; to generate an account number.
+3. Add time to your account on our website. Just €5/month.
+
+<b>Why use Mullvad VPN?</b>
+
+Maintain your anonymity:
+
+&#8226;&#8195;Creating an account requires no personal info &mdash; not even an email address.
+&#8226;&#8195;We keep no activity logs.
+&#8226;&#8195;Pay anonymously with cash or cryptocurrency.
+
+Mitigate ISP blocking and throttling.
+
+Bypass geographical restrictions with our global network of VPN servers.
+
+Our Android app uses WireGuard, a superior VPN protocol that connects fast and doesn’t drain your
+battery.
+
+<b>How does Mullvad VPN work?</b>
+
+Mullvad VPN allows you to browse the web securely and privately.
+
+With Mullvad, your traffic travels through an encrypted tunnel to one of our VPN servers and then
+onward to the website you are visiting. In this way, websites will only see our server’s identity
+instead of yours. In addition, any information that your internet service provider (ISP) saves
+cannot be tied specifically to you.
+
+Using a VPN is a great first step toward protecting your privacy. We believe that privacy is a
+universal right.
+
+<b>For your right to privacy</b>
+
+Mullvad was founded in 2009 purely with the ambition of upholding the universal right to privacy
+&mdash; for you, for us, for everyone. And not only that, we want to make Internet censorship and
+mass surveillance ineffective.
+
+That's a tall order, but if you want to make a change, you've gotta start somewhere.
+
+Since our humble beginning, our VPN service has helped to keep users' online activity, identity, and
+location private. Over the years, we've been blazing a trail forward to provide the most secure and
+anonymous VPN out there for everyone, for us, for you.
diff --git a/graphics/Android-feature-graphics.png b/android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png
index 14504d0f5a..14504d0f5a 100755..100644
--- a/graphics/Android-feature-graphics.png
+++ b/android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/icon/icon.png b/android/src/main/play/listings/en-US/graphics/icon/icon.png
new file mode 100644
index 0000000000..23a1bb5fe3
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/icon/icon.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png b/android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png
new file mode 100644
index 0000000000..77e1011acd
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png b/android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png
new file mode 100644
index 0000000000..66112856cf
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png b/android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png
new file mode 100644
index 0000000000..3b39482ad1
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png b/android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png
new file mode 100644
index 0000000000..4f01b14a20
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png b/android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png
new file mode 100644
index 0000000000..85272d086a
--- /dev/null
+++ b/android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/short-description.txt b/android/src/main/play/listings/en-US/short-description.txt
new file mode 100644
index 0000000000..69cbdafac8
--- /dev/null
+++ b/android/src/main/play/listings/en-US/short-description.txt
@@ -0,0 +1 @@
+Protect your online privacy with a fast, trustworthy, and easy-to-use VPN.
diff --git a/android/src/main/play/listings/en-US/title.txt b/android/src/main/play/listings/en-US/title.txt
new file mode 100644
index 0000000000..ece3daab0a
--- /dev/null
+++ b/android/src/main/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Mullvad VPN: privacy is a universal right
diff --git a/android/src/main/play/release-notes/en-US/beta.txt b/android/src/main/play/release-notes/en-US/beta.txt
new file mode 100644
index 0000000000..79a74ebdb7
--- /dev/null
+++ b/android/src/main/play/release-notes/en-US/beta.txt
@@ -0,0 +1,7 @@
+- Fix many app crashes and bugs.
+- Add possibility to create account from the login screen.
+- Allow submitting voucher codes to add time to the account.
+- Move location of the account data (including the WireGuard keys), so that it isn't lost when the
+ system cache is cleaned.
+- Adjust the minimum supported Android version to correctly reflect the supported versions decided
+ in 2020.4-beta2. The app will now only install on Android 7 and later (API level 24).
diff --git a/graphics/README.md b/graphics/README.md
new file mode 100644
index 0000000000..8e3285d5d2
--- /dev/null
+++ b/graphics/README.md
@@ -0,0 +1,19 @@
+# Graphic assets
+
+This folder contains graphic assets that are used to generate assets for either the app or platforms
+where the app is distributed.
+
+## Android
+
+The `Android-feature-graphics.psd` file should be used to generate a PNG image to be used as the
+feature graphics in the app's Google Play Store listing. The PNG image should be placed in the
+`android/src/main/play/listings/en-US/graphics/feature-graphics/` directory.
+
+The `icon-square.svg` is used to generate Android's square icon used in the app's Google Play Store
+listing. The resulting 512x512 PNG image should be placed in the
+`android/src/main/play/listings/en-US/graphics/icon/` directory. The file can be generate with the
+following command:
+
+```
+rsvg-convert ./icon-square.svg -w 512 -h 512 -o ../android/src/main/play/listings/en-US/graphics/icon/icon.png
+```
diff --git a/graphics/icon-ios.svg b/graphics/icon-square.svg
index b07b29bdb1..b07b29bdb1 100644
--- a/graphics/icon-ios.svg
+++ b/graphics/icon-square.svg
diff --git a/ios/convert-assets.rb b/ios/convert-assets.rb
index c0238848f0..a082667e04 100755
--- a/ios/convert-assets.rb
+++ b/ios/convert-assets.rb
@@ -10,7 +10,7 @@ XCASSETS_DIR = File.join(SCRIPT_DIR, "MullvadVPN/Assets.xcassets")
XCASSETS_APPICON_DIR = File.join(XCASSETS_DIR, "AppIcon.appiconset")
# graphical assets sources
-APPICON_PATH = File.join(ROOT_DIR, "graphics/icon-ios.svg")
+APPICON_PATH = File.join(ROOT_DIR, "graphics/icon-square.svg")
GRAPHICAL_ASSETS_DIR = File.join(ROOT_DIR, "gui/assets/images")
ADDITIONAL_ASSETS_DIR = File.join(SCRIPT_DIR, "AdditionalAssets")