Skip to content

Commit

Permalink
Revert key modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rawa
Rawa committed Aug 7, 2024
1 parent 27f00c9 commit 12b4322
Show file tree
Hide file tree
Showing 22 changed files with 911 additions and 933 deletions.
116 changes: 49 additions & 67 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,33 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<!-- https://developer.android.com/guide/components/fg-service-types#system-exempted -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature
android:name="android.hardware.faketouch"
android:required="false" />
<uses-feature
android:name="android.hardware.screen.portrait"
android:required="false" />
<uses-feature
android:name="android.hardware.screen.landscape"
android:required="false" />
<uses-feature
android:name="android.software.leanback"
android:required="false" />
<uses-feature
android:glEsVersion="0x00020000"
android:required="false" />

<application
android:name=".MullvadApplication"
android:allowBackup="false"
android:banner="@drawable/banner"
android:extractNativeLibs="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
android:theme="@style/Theme.App.Starting"
tools:ignore="GoogleAppIndexingWarning">
<uses-feature android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature android:name="android.hardware.faketouch"
android:required="false" />
<uses-feature android:name="android.hardware.screen.portrait"
android:required="false" />
<uses-feature android:name="android.hardware.screen.landscape"
android:required="false" />
<uses-feature android:name="android.software.leanback"
android:required="false" />
<uses-feature android:glEsVersion="0x00020000"
android:required="false" />
<application android:name=".MullvadApplication"
android:allowBackup="false"
android:banner="@drawable/banner"
android:extractNativeLibs="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
android:theme="@style/Theme.App.Starting"
tools:ignore="GoogleAppIndexingWarning">
<!--
MainActivity
Must be exported in order to be launchable.
Expand All @@ -46,18 +36,16 @@
This can be disregarded when the minimum supported version is 28 or higher
since after that it has been patched on a OS level.
-->
<activity
android:name="net.mullvad.mullvadvpn.ui.MainActivity"
android:configChanges="orientation|screenSize|screenLayout"
android:exported="true"
android:launchMode="singleInstance"
android:screenOrientation="fullUser"
android:windowSoftInputMode="adjustResize"
android:enableOnBackInvokedCallback="true"
tools:ignore="DiscouragedApi,UnusedAttribute">
<activity android:name="net.mullvad.mullvadvpn.ui.MainActivity"
android:configChanges="orientation|screenSize|screenLayout"
android:exported="true"
android:launchMode="singleInstance"
android:screenOrientation="fullUser"
android:windowSoftInputMode="adjustResize"
android:enableOnBackInvokedCallback="true"
tools:ignore="DiscouragedApi,UnusedAttribute">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
Expand All @@ -78,13 +66,12 @@
foregroundServiceType="systemExempted" is required in Android 14+
https://developer.android.com/guide/components/fg-service-types#system-exempted
-->
<service
android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
android:exported="true"
android:foregroundServiceType="systemExempted"
android:permission="android.permission.BIND_VPN_SERVICE"
android:stopWithTask="false"
tools:ignore="ForegroundServicePermission">
<service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
android:exported="true"
android:foregroundServiceType="systemExempted"
android:permission="android.permission.BIND_VPN_SERVICE"
android:stopWithTask="false"
tools:ignore="ForegroundServicePermission">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
Expand All @@ -103,32 +90,27 @@
Tile services must be exported and protected by the bind tile permission
(android.permission.BIND_QUICK_SETTINGS_TILE).
-->
<service
android:name="net.mullvad.mullvadvpn.tile.MullvadTileService"
android:exported="true"
android:icon="@drawable/small_logo_black"
android:label="@string/toggle_vpn"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<service android:name="net.mullvad.mullvadvpn.tile.MullvadTileService"
android:exported="true"
android:icon="@drawable/small_logo_black"
android:label="@string/toggle_vpn"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</service>
<provider
android:name="net.mullvad.mullvadvpn.provider.MullvadFileProvider"
android:authorities="${applicationId}.FileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
<provider android:name="net.mullvad.mullvadvpn.provider.MullvadFileProvider"
android:authorities="${applicationId}.FileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
<receiver
android:name=".broadcastreceiver.LocaleChangedBroadcastReceiver"
android:exported="false">
<receiver android:name=".broadcastreceiver.LocaleChangedBroadcastReceiver"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.LOCALE_CHANGED" />
</intent-filter>

</receiver>
</application>
</manifest>
86 changes: 43 additions & 43 deletions android/lib/resource/src/main/res/xml-da/relay_locations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<string name="Adelaide">Adelaide</string>
<string name="Albania">Albanien</string>
<string name="Amsterdam">Amsterdam</string>
<string name="Ashburn_VA">Ashburn, VA</string>
<string name="Ashburn, VA">Ashburn, VA</string>
<string name="Athens">Athen</string>
<string name="Atlanta_GA">Atlanta, GA</string>
<string name="Atlanta, GA">Atlanta, GA</string>
<string name="Auckland">Auckland</string>
<string name="Australia">Australien</string>
<string name="Austria">Østrig</string>
Expand All @@ -16,7 +16,7 @@
<string name="Berlin">Berlin</string>
<string name="Bogota">Bogota</string>
<string name="Bordeaux">Bordeaux</string>
<string name="Boston_MA">Boston, MA</string>
<string name="Boston, MA">Boston, MA</string>
<string name="Bratislava">Bratislava</string>
<string name="Brazil">Brasilien</string>
<string name="Brisbane">Brisbane</string>
Expand All @@ -27,19 +27,19 @@
<string name="Calgary">Calgary</string>
<string name="Canada">Canada</string>
<string name="Canberra">Canberra</string>
<string name="Charlotte_NC">Charlotte, NC</string>
<string name="Chicago_IL">Chicago, IL</string>
<string name="Charlotte, NC">Charlotte, NC</string>
<string name="Chicago, IL">Chicago, IL</string>
<string name="Chile">Chile</string>
<string name="Chisinau">Chisinau</string>
<string name="Cleveland_OH">Cleveland, OH</string>
<string name="Cleveland, OH">Cleveland, OH</string>
<string name="Colombia">Colombia</string>
<string name="Copenhagen">København</string>
<string name="Croatia">Kroatien</string>
<string name="Czech_Republic">Tjekkiet</string>
<string name="Dallas_TX">Dallas, TX</string>
<string name="Czech Republic">Tjekkiet</string>
<string name="Dallas, TX">Dallas, TX</string>
<string name="Denmark">Danmark</string>
<string name="Denver_CO">Denver, CO</string>
<string name="Detroit_MI">Detroit, MI</string>
<string name="Denver, CO">Denver, CO</string>
<string name="Detroit, MI">Detroit, MI</string>
<string name="Dubai">Dubai</string>
<string name="Dublin">Dublin</string>
<string name="Dusseldorf">Düsseldorf</string>
Expand All @@ -53,16 +53,16 @@
<string name="Greece">Grækenland</string>
<string name="Helsingborg">Helsingborg</string>
<string name="Helsinki">Helsinki</string>
<string name="Hong_Kong">Hongkong</string>
<string name="Honolulu_HI">Honolulu, HI</string>
<string name="Houston_TX">Houston, TX</string>
<string name="Hong Kong">Hongkong</string>
<string name="Honolulu, HI">Honolulu, HI</string>
<string name="Houston, TX">Houston, TX</string>
<string name="Hungary">Ungarn</string>
<string name="India">Indien</string>
<string name="Indonesia">Indonesien</string>
<string name="Ireland">Irland</string>
<string name="Israel">Israel</string>
<string name="Italy">Italien</string>
<string name="Jackson_MS">Jackson, MS</string>
<string name="Jackson, MS">Jackson, MS</string>
<string name="Jakarta">Jakarta</string>
<string name="Japan">Japan</string>
<string name="Johannesburg">Johannesburg</string>
Expand All @@ -72,86 +72,86 @@
<string name="Lisbon">Lissabon</string>
<string name="Ljubljana">Ljubljana</string>
<string name="London">London</string>
<string name="Los_Angeles_CA">Los Angeles, Californien</string>
<string name="Louisville_KY">Louisville, KY</string>
<string name="Los Angeles, CA">Los Angeles, Californien</string>
<string name="Louisville, KY">Louisville, KY</string>
<string name="Luxembourg">Luxembourg</string>
<string name="Madrid">Madrid</string>
<string name="Malmö">Malmø</string>
<string name="Manchester">Manchester</string>
<string name="Marseille">Marseille</string>
<string name="McAllen_TX">McAllen, TX</string>
<string name="McAllen, TX">McAllen, TX</string>
<string name="Melbourne">Melbourne</string>
<string name="Mexico">Mexico</string>
<string name="Miami_FL">Miami, FL</string>
<string name="Miami, FL">Miami, FL</string>
<string name="Milan">Milano</string>
<string name="Milwaukee_WI">Milwaukee, WI</string>
<string name="Minneapolis_St._Paul_Apt_MN">Minneapolis/St. Paul Apt, MN</string>
<string name="Milwaukee, WI">Milwaukee, WI</string>
<string name="Minneapolis/St. Paul Apt, MN">Minneapolis/St. Paul Apt, MN</string>
<string name="Moldova">Moldova</string>
<string name="Montreal">Montreal</string>
<string name="Netherlands">Holland</string>
<string name="New_York_NY">New York, NY</string>
<string name="New_Zealand">New Zealand</string>
<string name="New York, NY">New York, NY</string>
<string name="New Zealand">New Zealand</string>
<string name="Nis">Nis</string>
<string name="North_Macedonia">Nordmakedonien</string>
<string name="North Macedonia">Nordmakedonien</string>
<string name="Norway">Norge</string>
<string name="Oklahoma_City_OK">Oklahoma City, OK</string>
<string name="Oklahoma City, OK">Oklahoma City, OK</string>
<string name="Osaka">Osaka</string>
<string name="Oslo">Oslo</string>
<string name="Palermo">Palermo</string>
<string name="Paris">Paris</string>
<string name="Perth">Perth</string>
<string name="Philadelphia_PA">Philadelphia, PA</string>
<string name="Phoenix_AZ">Phoenix, AZ</string>
<string name="Piscataway_NJ">Piscataway, NJ</string>
<string name="Philadelphia, PA">Philadelphia, PA</string>
<string name="Phoenix, AZ">Phoenix, AZ</string>
<string name="Piscataway, NJ">Piscataway, NJ</string>
<string name="Poland">Polen</string>
<string name="Portland_OR">Portland, OR</string>
<string name="Portland, OR">Portland, OR</string>
<string name="Portugal">Portugal</string>
<string name="Prague">Prag</string>
<string name="Pune">Pune</string>
<string name="Queretaro">Queretaro</string>
<string name="Raleigh_NC">Raleigh, NC</string>
<string name="Richmond_VA">Richmond, VA</string>
<string name="Raleigh, NC">Raleigh, NC</string>
<string name="Richmond, VA">Richmond, VA</string>
<string name="Riga">Riga</string>
<string name="Romania">Rumænien</string>
<string name="Rome">Rom</string>
<string name="Salt_Lake_City_UT">Salt Lake City, UT</string>
<string name="San_Francisco_CA">San Francisco, Californien</string>
<string name="San_Jose_CA">San Jose, Californien</string>
<string name="Salt Lake City, UT">Salt Lake City, UT</string>
<string name="San Francisco, CA">San Francisco, Californien</string>
<string name="San Jose, CA">San Jose, Californien</string>
<string name="Santiago">Santiago</string>
<string name="Sao_Paulo">Sao Paulo</string>
<string name="Seattle_WA">Seattle, WA</string>
<string name="Secaucus_NJ">Secaucus, NJ</string>
<string name="Sao Paulo">Sao Paulo</string>
<string name="Seattle, WA">Seattle, WA</string>
<string name="Secaucus, NJ">Secaucus, NJ</string>
<string name="Serbia">Serbien</string>
<string name="Singapore">Singapore</string>
<string name="Sioux_Falls_SD">Sioux Falls, SD</string>
<string name="Sioux Falls, SD">Sioux Falls, SD</string>
<string name="Skopje">Skopje</string>
<string name="Slovakia">Slovakiet</string>
<string name="Slovenia">Slovenien</string>
<string name="Sofia">Sofia</string>
<string name="South_Africa">Sydafrika</string>
<string name="South Africa">Sydafrika</string>
<string name="Spain">Spanien</string>
<string name="St._Louis_MO">St. Louis, MO</string>
<string name="Stamford_CT">Stamford, CT</string>
<string name="St. Louis, MO">St. Louis, MO</string>
<string name="Stamford, CT">Stamford, CT</string>
<string name="Stavanger">Stavanger</string>
<string name="Stockholm">Stockholm</string>
<string name="Sweden">Sverige</string>
<string name="Switzerland">Schweiz</string>
<string name="Sydney">Sydney</string>
<string name="Tallinn">Tallinn</string>
<string name="Tel_Aviv">Tel Aviv</string>
<string name="Tel Aviv">Tel Aviv</string>
<string name="Thailand">Thailand</string>
<string name="Tirana">Tirana</string>
<string name="Tokyo">Tokyo</string>
<string name="Toronto">Toronto</string>
<string name="UK">UK</string>
<string name="USA">USA</string>
<string name="Ukraine">Ukraine</string>
<string name="United_Arab_Emirates">Forenede Arabiske Emirater</string>
<string name="United Arab Emirates">Forenede Arabiske Emirater</string>
<string name="Valencia">Valencia</string>
<string name="Vancouver">Vancouver</string>
<string name="Vienna">Wien</string>
<string name="Warsaw">Warszawa</string>
<string name="Washington_DC">Washington DC</string>
<string name="Washington DC">Washington DC</string>
<string name="Wien">Wien</string>
<string name="Zagreb">Zagreb</string>
<string name="Zurich">Zürich</string>
Expand Down
Loading

0 comments on commit 12b4322

Please sign in to comment.