Skip to content

Commit 12b4322

Browse files
RawaRawa
committed
Revert key modifications
1 parent 27f00c9 commit 12b4322

22 files changed

+911
-933
lines changed

‎android/app/src/main/AndroidManifest.xml

+49-67
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,33 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools">
3-
2+
xmlns:tools="http://schemas.android.com/tools">
43
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
54
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
65
<uses-permission android:name="android.permission.INTERNET" />
76
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
87
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
98
<!-- https://developer.android.com/guide/components/fg-service-types#system-exempted -->
109
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
11-
12-
<uses-feature
13-
android:name="android.hardware.touchscreen"
14-
android:required="false" />
15-
<uses-feature
16-
android:name="android.hardware.faketouch"
17-
android:required="false" />
18-
<uses-feature
19-
android:name="android.hardware.screen.portrait"
20-
android:required="false" />
21-
<uses-feature
22-
android:name="android.hardware.screen.landscape"
23-
android:required="false" />
24-
<uses-feature
25-
android:name="android.software.leanback"
26-
android:required="false" />
27-
<uses-feature
28-
android:glEsVersion="0x00020000"
29-
android:required="false" />
30-
31-
<application
32-
android:name=".MullvadApplication"
33-
android:allowBackup="false"
34-
android:banner="@drawable/banner"
35-
android:extractNativeLibs="true"
36-
android:icon="@mipmap/ic_launcher"
37-
android:label="@string/app_name"
38-
android:roundIcon="@mipmap/ic_launcher"
39-
android:theme="@style/Theme.App.Starting"
40-
tools:ignore="GoogleAppIndexingWarning">
10+
<uses-feature android:name="android.hardware.touchscreen"
11+
android:required="false" />
12+
<uses-feature android:name="android.hardware.faketouch"
13+
android:required="false" />
14+
<uses-feature android:name="android.hardware.screen.portrait"
15+
android:required="false" />
16+
<uses-feature android:name="android.hardware.screen.landscape"
17+
android:required="false" />
18+
<uses-feature android:name="android.software.leanback"
19+
android:required="false" />
20+
<uses-feature android:glEsVersion="0x00020000"
21+
android:required="false" />
22+
<application android:name=".MullvadApplication"
23+
android:allowBackup="false"
24+
android:banner="@drawable/banner"
25+
android:extractNativeLibs="true"
26+
android:icon="@mipmap/ic_launcher"
27+
android:label="@string/app_name"
28+
android:roundIcon="@mipmap/ic_launcher"
29+
android:theme="@style/Theme.App.Starting"
30+
tools:ignore="GoogleAppIndexingWarning">
4131
<!--
4232
MainActivity
4333
Must be exported in order to be launchable.
@@ -46,18 +36,16 @@
4636
This can be disregarded when the minimum supported version is 28 or higher
4737
since after that it has been patched on a OS level.
4838
-->
49-
<activity
50-
android:name="net.mullvad.mullvadvpn.ui.MainActivity"
51-
android:configChanges="orientation|screenSize|screenLayout"
52-
android:exported="true"
53-
android:launchMode="singleInstance"
54-
android:screenOrientation="fullUser"
55-
android:windowSoftInputMode="adjustResize"
56-
android:enableOnBackInvokedCallback="true"
57-
tools:ignore="DiscouragedApi,UnusedAttribute">
39+
<activity android:name="net.mullvad.mullvadvpn.ui.MainActivity"
40+
android:configChanges="orientation|screenSize|screenLayout"
41+
android:exported="true"
42+
android:launchMode="singleInstance"
43+
android:screenOrientation="fullUser"
44+
android:windowSoftInputMode="adjustResize"
45+
android:enableOnBackInvokedCallback="true"
46+
tools:ignore="DiscouragedApi,UnusedAttribute">
5847
<intent-filter>
5948
<action android:name="android.intent.action.MAIN" />
60-
6149
<category android:name="android.intent.category.LAUNCHER" />
6250
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
6351
</intent-filter>
@@ -78,13 +66,12 @@
7866
foregroundServiceType="systemExempted" is required in Android 14+
7967
https://developer.android.com/guide/components/fg-service-types#system-exempted
8068
-->
81-
<service
82-
android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
83-
android:exported="true"
84-
android:foregroundServiceType="systemExempted"
85-
android:permission="android.permission.BIND_VPN_SERVICE"
86-
android:stopWithTask="false"
87-
tools:ignore="ForegroundServicePermission">
69+
<service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
70+
android:exported="true"
71+
android:foregroundServiceType="systemExempted"
72+
android:permission="android.permission.BIND_VPN_SERVICE"
73+
android:stopWithTask="false"
74+
tools:ignore="ForegroundServicePermission">
8875
<intent-filter>
8976
<action android:name="android.net.VpnService" />
9077
</intent-filter>
@@ -103,32 +90,27 @@
10390
Tile services must be exported and protected by the bind tile permission
10491
(android.permission.BIND_QUICK_SETTINGS_TILE).
10592
-->
106-
<service
107-
android:name="net.mullvad.mullvadvpn.tile.MullvadTileService"
108-
android:exported="true"
109-
android:icon="@drawable/small_logo_black"
110-
android:label="@string/toggle_vpn"
111-
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
93+
<service android:name="net.mullvad.mullvadvpn.tile.MullvadTileService"
94+
android:exported="true"
95+
android:icon="@drawable/small_logo_black"
96+
android:label="@string/toggle_vpn"
97+
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
11298
<intent-filter>
11399
<action android:name="android.service.quicksettings.action.QS_TILE" />
114100
</intent-filter>
115101
</service>
116-
<provider
117-
android:name="net.mullvad.mullvadvpn.provider.MullvadFileProvider"
118-
android:authorities="${applicationId}.FileProvider"
119-
android:exported="false"
120-
android:grantUriPermissions="true">
121-
<meta-data
122-
android:name="android.support.FILE_PROVIDER_PATHS"
123-
android:resource="@xml/provider_paths" />
102+
<provider android:name="net.mullvad.mullvadvpn.provider.MullvadFileProvider"
103+
android:authorities="${applicationId}.FileProvider"
104+
android:exported="false"
105+
android:grantUriPermissions="true">
106+
<meta-data android:name="android.support.FILE_PROVIDER_PATHS"
107+
android:resource="@xml/provider_paths" />
124108
</provider>
125-
<receiver
126-
android:name=".broadcastreceiver.LocaleChangedBroadcastReceiver"
127-
android:exported="false">
109+
<receiver android:name=".broadcastreceiver.LocaleChangedBroadcastReceiver"
110+
android:exported="false">
128111
<intent-filter>
129112
<action android:name="android.intent.action.LOCALE_CHANGED" />
130113
</intent-filter>
131-
132114
</receiver>
133115
</application>
134116
</manifest>

‎android/lib/resource/src/main/res/xml-da/relay_locations.xml

+43-43
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<string name="Adelaide">Adelaide</string>
44
<string name="Albania">Albanien</string>
55
<string name="Amsterdam">Amsterdam</string>
6-
<string name="Ashburn_VA">Ashburn, VA</string>
6+
<string name="Ashburn, VA">Ashburn, VA</string>
77
<string name="Athens">Athen</string>
8-
<string name="Atlanta_GA">Atlanta, GA</string>
8+
<string name="Atlanta, GA">Atlanta, GA</string>
99
<string name="Auckland">Auckland</string>
1010
<string name="Australia">Australien</string>
1111
<string name="Austria">Østrig</string>
@@ -16,7 +16,7 @@
1616
<string name="Berlin">Berlin</string>
1717
<string name="Bogota">Bogota</string>
1818
<string name="Bordeaux">Bordeaux</string>
19-
<string name="Boston_MA">Boston, MA</string>
19+
<string name="Boston, MA">Boston, MA</string>
2020
<string name="Bratislava">Bratislava</string>
2121
<string name="Brazil">Brasilien</string>
2222
<string name="Brisbane">Brisbane</string>
@@ -27,19 +27,19 @@
2727
<string name="Calgary">Calgary</string>
2828
<string name="Canada">Canada</string>
2929
<string name="Canberra">Canberra</string>
30-
<string name="Charlotte_NC">Charlotte, NC</string>
31-
<string name="Chicago_IL">Chicago, IL</string>
30+
<string name="Charlotte, NC">Charlotte, NC</string>
31+
<string name="Chicago, IL">Chicago, IL</string>
3232
<string name="Chile">Chile</string>
3333
<string name="Chisinau">Chisinau</string>
34-
<string name="Cleveland_OH">Cleveland, OH</string>
34+
<string name="Cleveland, OH">Cleveland, OH</string>
3535
<string name="Colombia">Colombia</string>
3636
<string name="Copenhagen">København</string>
3737
<string name="Croatia">Kroatien</string>
38-
<string name="Czech_Republic">Tjekkiet</string>
39-
<string name="Dallas_TX">Dallas, TX</string>
38+
<string name="Czech Republic">Tjekkiet</string>
39+
<string name="Dallas, TX">Dallas, TX</string>
4040
<string name="Denmark">Danmark</string>
41-
<string name="Denver_CO">Denver, CO</string>
42-
<string name="Detroit_MI">Detroit, MI</string>
41+
<string name="Denver, CO">Denver, CO</string>
42+
<string name="Detroit, MI">Detroit, MI</string>
4343
<string name="Dubai">Dubai</string>
4444
<string name="Dublin">Dublin</string>
4545
<string name="Dusseldorf">Düsseldorf</string>
@@ -53,16 +53,16 @@
5353
<string name="Greece">Grækenland</string>
5454
<string name="Helsingborg">Helsingborg</string>
5555
<string name="Helsinki">Helsinki</string>
56-
<string name="Hong_Kong">Hongkong</string>
57-
<string name="Honolulu_HI">Honolulu, HI</string>
58-
<string name="Houston_TX">Houston, TX</string>
56+
<string name="Hong Kong">Hongkong</string>
57+
<string name="Honolulu, HI">Honolulu, HI</string>
58+
<string name="Houston, TX">Houston, TX</string>
5959
<string name="Hungary">Ungarn</string>
6060
<string name="India">Indien</string>
6161
<string name="Indonesia">Indonesien</string>
6262
<string name="Ireland">Irland</string>
6363
<string name="Israel">Israel</string>
6464
<string name="Italy">Italien</string>
65-
<string name="Jackson_MS">Jackson, MS</string>
65+
<string name="Jackson, MS">Jackson, MS</string>
6666
<string name="Jakarta">Jakarta</string>
6767
<string name="Japan">Japan</string>
6868
<string name="Johannesburg">Johannesburg</string>
@@ -72,86 +72,86 @@
7272
<string name="Lisbon">Lissabon</string>
7373
<string name="Ljubljana">Ljubljana</string>
7474
<string name="London">London</string>
75-
<string name="Los_Angeles_CA">Los Angeles, Californien</string>
76-
<string name="Louisville_KY">Louisville, KY</string>
75+
<string name="Los Angeles, CA">Los Angeles, Californien</string>
76+
<string name="Louisville, KY">Louisville, KY</string>
7777
<string name="Luxembourg">Luxembourg</string>
7878
<string name="Madrid">Madrid</string>
7979
<string name="Malmö">Malmø</string>
8080
<string name="Manchester">Manchester</string>
8181
<string name="Marseille">Marseille</string>
82-
<string name="McAllen_TX">McAllen, TX</string>
82+
<string name="McAllen, TX">McAllen, TX</string>
8383
<string name="Melbourne">Melbourne</string>
8484
<string name="Mexico">Mexico</string>
85-
<string name="Miami_FL">Miami, FL</string>
85+
<string name="Miami, FL">Miami, FL</string>
8686
<string name="Milan">Milano</string>
87-
<string name="Milwaukee_WI">Milwaukee, WI</string>
88-
<string name="Minneapolis_St._Paul_Apt_MN">Minneapolis/St. Paul Apt, MN</string>
87+
<string name="Milwaukee, WI">Milwaukee, WI</string>
88+
<string name="Minneapolis/St. Paul Apt, MN">Minneapolis/St. Paul Apt, MN</string>
8989
<string name="Moldova">Moldova</string>
9090
<string name="Montreal">Montreal</string>
9191
<string name="Netherlands">Holland</string>
92-
<string name="New_York_NY">New York, NY</string>
93-
<string name="New_Zealand">New Zealand</string>
92+
<string name="New York, NY">New York, NY</string>
93+
<string name="New Zealand">New Zealand</string>
9494
<string name="Nis">Nis</string>
95-
<string name="North_Macedonia">Nordmakedonien</string>
95+
<string name="North Macedonia">Nordmakedonien</string>
9696
<string name="Norway">Norge</string>
97-
<string name="Oklahoma_City_OK">Oklahoma City, OK</string>
97+
<string name="Oklahoma City, OK">Oklahoma City, OK</string>
9898
<string name="Osaka">Osaka</string>
9999
<string name="Oslo">Oslo</string>
100100
<string name="Palermo">Palermo</string>
101101
<string name="Paris">Paris</string>
102102
<string name="Perth">Perth</string>
103-
<string name="Philadelphia_PA">Philadelphia, PA</string>
104-
<string name="Phoenix_AZ">Phoenix, AZ</string>
105-
<string name="Piscataway_NJ">Piscataway, NJ</string>
103+
<string name="Philadelphia, PA">Philadelphia, PA</string>
104+
<string name="Phoenix, AZ">Phoenix, AZ</string>
105+
<string name="Piscataway, NJ">Piscataway, NJ</string>
106106
<string name="Poland">Polen</string>
107-
<string name="Portland_OR">Portland, OR</string>
107+
<string name="Portland, OR">Portland, OR</string>
108108
<string name="Portugal">Portugal</string>
109109
<string name="Prague">Prag</string>
110110
<string name="Pune">Pune</string>
111111
<string name="Queretaro">Queretaro</string>
112-
<string name="Raleigh_NC">Raleigh, NC</string>
113-
<string name="Richmond_VA">Richmond, VA</string>
112+
<string name="Raleigh, NC">Raleigh, NC</string>
113+
<string name="Richmond, VA">Richmond, VA</string>
114114
<string name="Riga">Riga</string>
115115
<string name="Romania">Rumænien</string>
116116
<string name="Rome">Rom</string>
117-
<string name="Salt_Lake_City_UT">Salt Lake City, UT</string>
118-
<string name="San_Francisco_CA">San Francisco, Californien</string>
119-
<string name="San_Jose_CA">San Jose, Californien</string>
117+
<string name="Salt Lake City, UT">Salt Lake City, UT</string>
118+
<string name="San Francisco, CA">San Francisco, Californien</string>
119+
<string name="San Jose, CA">San Jose, Californien</string>
120120
<string name="Santiago">Santiago</string>
121-
<string name="Sao_Paulo">Sao Paulo</string>
122-
<string name="Seattle_WA">Seattle, WA</string>
123-
<string name="Secaucus_NJ">Secaucus, NJ</string>
121+
<string name="Sao Paulo">Sao Paulo</string>
122+
<string name="Seattle, WA">Seattle, WA</string>
123+
<string name="Secaucus, NJ">Secaucus, NJ</string>
124124
<string name="Serbia">Serbien</string>
125125
<string name="Singapore">Singapore</string>
126-
<string name="Sioux_Falls_SD">Sioux Falls, SD</string>
126+
<string name="Sioux Falls, SD">Sioux Falls, SD</string>
127127
<string name="Skopje">Skopje</string>
128128
<string name="Slovakia">Slovakiet</string>
129129
<string name="Slovenia">Slovenien</string>
130130
<string name="Sofia">Sofia</string>
131-
<string name="South_Africa">Sydafrika</string>
131+
<string name="South Africa">Sydafrika</string>
132132
<string name="Spain">Spanien</string>
133-
<string name="St._Louis_MO">St. Louis, MO</string>
134-
<string name="Stamford_CT">Stamford, CT</string>
133+
<string name="St. Louis, MO">St. Louis, MO</string>
134+
<string name="Stamford, CT">Stamford, CT</string>
135135
<string name="Stavanger">Stavanger</string>
136136
<string name="Stockholm">Stockholm</string>
137137
<string name="Sweden">Sverige</string>
138138
<string name="Switzerland">Schweiz</string>
139139
<string name="Sydney">Sydney</string>
140140
<string name="Tallinn">Tallinn</string>
141-
<string name="Tel_Aviv">Tel Aviv</string>
141+
<string name="Tel Aviv">Tel Aviv</string>
142142
<string name="Thailand">Thailand</string>
143143
<string name="Tirana">Tirana</string>
144144
<string name="Tokyo">Tokyo</string>
145145
<string name="Toronto">Toronto</string>
146146
<string name="UK">UK</string>
147147
<string name="USA">USA</string>
148148
<string name="Ukraine">Ukraine</string>
149-
<string name="United_Arab_Emirates">Forenede Arabiske Emirater</string>
149+
<string name="United Arab Emirates">Forenede Arabiske Emirater</string>
150150
<string name="Valencia">Valencia</string>
151151
<string name="Vancouver">Vancouver</string>
152152
<string name="Vienna">Wien</string>
153153
<string name="Warsaw">Warszawa</string>
154-
<string name="Washington_DC">Washington DC</string>
154+
<string name="Washington DC">Washington DC</string>
155155
<string name="Wien">Wien</string>
156156
<string name="Zagreb">Zagreb</string>
157157
<string name="Zurich">Zürich</string>

0 commit comments

Comments
 (0)