Merge "Make VpnService synchronous API." into honeycomb
This commit is contained in:
Hung-ying Tyan
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
71196f0cb3
|
Before Width: | Height: | Size: 757 B After Width: | Height: | Size: 757 B |
|
Before Width: | Height: | Size: 717 B After Width: | Height: | Size: 717 B |
BIN
core/res/res/drawable-ldpi/vpn_connected.png
Normal file
BIN
core/res/res/drawable-ldpi/vpn_connected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
BIN
core/res/res/drawable-ldpi/vpn_disconnected.png
Normal file
BIN
core/res/res/drawable-ldpi/vpn_disconnected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 717 B |
BIN
core/res/res/drawable-mdpi/vpn_connected.png
Normal file
BIN
core/res/res/drawable-mdpi/vpn_connected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
BIN
core/res/res/drawable-mdpi/vpn_disconnected.png
Normal file
BIN
core/res/res/drawable-mdpi/vpn_disconnected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 717 B |
@ -2677,4 +2677,11 @@
|
||||
<string name="sync_undo_deletes">Undo the deletes.</string>
|
||||
<!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
|
||||
<string name="sync_do_nothing">Do nothing for now.</string>
|
||||
|
||||
<!-- Title of the VPN service notification: VPN connected [CHAR LIMIT=NONE] -->
|
||||
<string name="vpn_notification_title_connected"><xliff:g id="profilename" example="Home PPTP">%s</xliff:g> VPN connected</string>
|
||||
<!-- Title of the VPN service notification: VPN disconnected [CHAR LIMIT=NONE] -->
|
||||
<string name="vpn_notification_title_disconnected"><xliff:g id="profilename" example="Home PPTP">%s</xliff:g> VPN disconnected</string>
|
||||
<!-- Message of the VPN service notification: Hint to reconnect VPN [CHAR LIMIT=NONE] -->
|
||||
<string name="vpn_notification_hint_disconnected">Touch to reconnect to a VPN.</string>
|
||||
</resources>
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-subdir-java-files)
|
||||
|
||||
LOCAL_JAVA_LIBRARIES :=
|
||||
|
||||
LOCAL_PACKAGE_NAME := VpnServices
|
||||
LOCAL_CERTIFICATE := platform
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
########################
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.server.vpn"
|
||||
android:sharedUserId="android.uid.system"
|
||||
>
|
||||
<application android:label="@string/app_label">
|
||||
|
||||
<service android:name=".VpnServiceBinder" android:process=":remote">
|
||||
<intent-filter>
|
||||
<!-- These are the interfaces supported by the service, which
|
||||
you can bind to. -->
|
||||
<action android:name="android.net.vpn.IVpnService" />
|
||||
<!-- This is an action code you can use to select the service
|
||||
without explicitly supplying the implementation class. -->
|
||||
<action android:name="android.net.vpn.SERVICE" />
|
||||
</intent-filter>
|
||||
</service>
|
||||
|
||||
</application>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
|
||||
</manifest>
|
||||
@ -1,190 +0,0 @@
|
||||
|
||||
Copyright (c) 2005-2008, The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"خدمات الشبكة الظاهرية الخاصة (VPN)"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"تم توصيل الشبكة الظاهرية الخاصة (VPN) لـ <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"تم فصل الشبكة الظاهرية الخاصة (VPN) لـ <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"يمكنك اللمس لإعادة الاتصال بالشبكة الظاهرية الخاصة (VPN)."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN услуги"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Връзката с VPN <xliff:g id="PROFILENAME">%s</xliff:g> бе установена"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Връзката с VPN <xliff:g id="PROFILENAME">%s</xliff:g> бе прекъсната"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Докоснете за повторно свързване с VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Serveis VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> connectada"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> desconnectada"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Toqueu-ho per tornar-vos a connectar a una VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Služby VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Síť VPN <xliff:g id="PROFILENAME">%s</xliff:g> je připojena"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Síť VPN <xliff:g id="PROFILENAME">%s</xliff:g> odpojena"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Dotykem se znovu připojíte k síti VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-tjenester"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN forbundet"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN afbrudt"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Tryk for at oprette forbindelse til et VPN igen."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-Dienste"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> mit VPN verbunden"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> von VPN getrennt"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Zur Wiederherstellung der Verbindung mit einem VPN berühren"</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Υπηρεσίες VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Το VPN <xliff:g id="PROFILENAME">%s</xliff:g> συνδέθηκε"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Το VPN <xliff:g id="PROFILENAME">%s</xliff:g> αποσυνδέθηκε"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Πατήστε για να επανασυνδεθείτε σε ένα VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN Services"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN connected"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN disconnected"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Touch to reconnect to a VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Servicios VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN conectados"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN desconectada"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Tocar para volver a conectarse a una VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Servicios VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> conectada"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> desconectada"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Toca para volver a conectarte a una red VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"سرویس های VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN وصل شد"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN قطع شد"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"برای اتصال مجدد به VPN لمس کنید."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-palvelut"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g>: VPN-yhteys muodostettu"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g>: VPN-yhteys katkaistu"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Yhdistä VPN-verkkoon uudelleen koskettamalla."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Services VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> connecté"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> déconnecté"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Touchez l\'écran pour vous reconnecter à un VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN usluge"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN priključen"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN je isključen"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Dotaknite za ponovno povezivanje s VPN-om."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-szolgáltatások"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Kapcsolódva a(z) <xliff:g id="PROFILENAME">%s</xliff:g> virtuális magánhálózathoz"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Kapcsolat bontva a(z) <xliff:g id="PROFILENAME">%s</xliff:g> virtuális magánhálózattal"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Érintse meg az újracsatlakozáshoz."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Layanan VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> terhubung"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> terputus"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Sentuh untuk terhubung kembali ke suatu VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Servizi VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> collegata"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> scollegata"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Tocca per riconnetterti a una rete VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"שירותי VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN של <xliff:g id="PROFILENAME">%s</xliff:g> מחובר"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN של <xliff:g id="PROFILENAME">%s</xliff:g> נותק"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"גע כדי להתחבר שוב ל-VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPNサービス"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPNが接続されました"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPNが切断されました"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"タップしてVPNに再接続してください。"</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN 서비스"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 연결됨"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 연결 끊김"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"VPN에 다시 연결하려면 터치하세요."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPT paslaugos"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPT prijungtas"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPT atjungtas"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Palieskite, kad būtų iš naujo sujungta su VPT."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN pakalpojumi"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN ir savienots"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN ir atvienots"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Pieskarieties, lai atkārtoti izveidotu savienojumu ar VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-tjenester"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Koblet til VPNet <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Koblet fra VPNet <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Trykk for å koble til et VPN på nytt"</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-services"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> verbonden via VPN"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN-verbinding met <xliff:g id="PROFILENAME">%s</xliff:g> verbroken"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Raak aan om opnieuw verbinding te maken met een VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Usługi VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Połączono z siecią VPN <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Rozłączono z siecią VPN <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Dotknij, aby ponownie połączyć się z siecią VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Serviços VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> ligado"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> desligado"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Toque para voltar a ligar a uma VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Serviços de VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN de <xliff:g id="PROFILENAME">%s</xliff:g> conectada"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN de <xliff:g id="PROFILENAME">%s</xliff:g> desconectada"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Toque para reconectar-se a uma VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Servetschs VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> connectà"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> deconnectà"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Tutgar per reconnectar ad in VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Servicii VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> conectat"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> deconectat"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Atingeţi pentru a vă reconecta la o reţea VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Службы VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Сеть VPN (<xliff:g id="PROFILENAME">%s</xliff:g>) подключена"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Сеть VPN (<xliff:g id="PROFILENAME">%s</xliff:g>) отключена"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Нажмите, чтобы повторно подключиться к VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Služby VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Sieť VPN <xliff:g id="PROFILENAME">%s</xliff:g> je pripojená"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Sieť VPN <xliff:g id="PROFILENAME">%s</xliff:g> odpojená"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Dotykom sa znova pripojíte k sieti VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Storitve VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN profila <xliff:g id="PROFILENAME">%s</xliff:g> je povezan"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN profila <xliff:g id="PROFILENAME">%s</xliff:g> je izklopljen"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Dotaknite se, če želite preklopiti v navidezno zasebno omrežje."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN услуге"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN веза је успостављена"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN веза је прекинута"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Додирните да бисте се поново повезали са VPN-ом."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN-tjänster"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN anslutet"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN frånkopplat"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Tryck här om du vill återansluta till ett VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"บริการ VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> เชื่อมต่อ VPN แล้ว"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> ตัดการเชื่อมต่อ VPN แล้ว"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"แตะเพื่อเชื่อมต่อกับ VPN อีกครั้ง"</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Mga serbisyo ng VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Hindi konektado ang <xliff:g id="PROFILENAME">%s</xliff:g> VPN"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Hindi konektado ang <xliff:g id="PROFILENAME">%s</xliff:g> VPN"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Galawin upang muling kumonekta sa VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN Hizmetleri"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN bağlandı"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN bağlantısı kesildi"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Bir VPN\'ye tekrar bağlanmak için dokunun."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Служби VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> підключ. ч-з VPN"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> роз\'єднано"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Натисн. для повт. з\'єдн. з VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"Dịch vụ VPN"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"Đã kết nối VPN <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"Đã ngắt kết nối VPN <xliff:g id="PROFILENAME">%s</xliff:g>"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Chạm để kết nối lại với VPN."</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"虚拟专用网服务"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN“<xliff:g id="PROFILENAME">%s</xliff:g>”已连接"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN“<xliff:g id="PROFILENAME">%s</xliff:g>”连接已断开"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"轻触可重新连接到虚拟专用网。"</string>
|
||||
</resources>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_label" msgid="4589592829302498102">"VPN 服務"</string>
|
||||
<string name="vpn_notification_title_connected" msgid="8598654486956133580">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 已連線"</string>
|
||||
<string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"<xliff:g id="PROFILENAME">%s</xliff:g> VPN 已中斷連線"</string>
|
||||
<string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"輕觸即可重新連線至 VPN。"</string>
|
||||
</resources>
|
||||
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- Title for the VPN Services activity. -->
|
||||
<string name="app_label">VPN Services</string>
|
||||
|
||||
<string name="vpn_notification_title_connected"><xliff:g id="profilename">%s</xliff:g> VPN connected</string>
|
||||
<string name="vpn_notification_title_disconnected"><xliff:g id="profilename">%s</xliff:g> VPN disconnected</string>
|
||||
<string name="vpn_notification_hint_disconnected">Touch to reconnect to a VPN.</string>
|
||||
</resources>
|
||||
|
||||
@ -1,188 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2009, The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.server.vpn;
|
||||
|
||||
import android.app.Service;
|
||||
import android.content.Intent;
|
||||
import android.net.vpn.IVpnService;
|
||||
import android.net.vpn.L2tpIpsecProfile;
|
||||
import android.net.vpn.L2tpIpsecPskProfile;
|
||||
import android.net.vpn.L2tpProfile;
|
||||
import android.net.vpn.PptpProfile;
|
||||
import android.net.vpn.VpnManager;
|
||||
import android.net.vpn.VpnProfile;
|
||||
import android.net.vpn.VpnState;
|
||||
import android.os.Environment;
|
||||
import android.os.IBinder;
|
||||
import android.os.SystemProperties;
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
|
||||
/**
|
||||
* The service class for managing a VPN connection. It implements the
|
||||
* {@link IVpnService} binder interface.
|
||||
*/
|
||||
public class VpnServiceBinder extends Service {
|
||||
private static final String TAG = VpnServiceBinder.class.getSimpleName();
|
||||
private static final boolean DBG = true;
|
||||
|
||||
private static final String STATES_FILE_RELATIVE_PATH = "/misc/vpn/.states";
|
||||
|
||||
// The actual implementation is delegated to the VpnService class.
|
||||
private VpnService<? extends VpnProfile> mService;
|
||||
|
||||
// TODO(oam): Test VPN when EFS is enabled (will do later)...
|
||||
private static String getStateFilePath() {
|
||||
// This call will return the correcu directory whether Encrypted FS is enabled or not
|
||||
// Disabled: /data/misc/vpn/.states Enabled: /data/secure/misc/vpn/.states
|
||||
return Environment.getSecureDataDirectory().getPath() + STATES_FILE_RELATIVE_PATH;
|
||||
}
|
||||
|
||||
private final IBinder mBinder = new IVpnService.Stub() {
|
||||
public boolean connect(VpnProfile p, String username, String password) {
|
||||
return VpnServiceBinder.this.connect(p, username, password);
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
VpnServiceBinder.this.disconnect();
|
||||
}
|
||||
|
||||
public void checkStatus(VpnProfile p) {
|
||||
VpnServiceBinder.this.checkStatus(p);
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
checkSavedStates();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onStart(Intent intent, int startId) {
|
||||
super.onStart(intent, startId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent intent) {
|
||||
return mBinder;
|
||||
}
|
||||
|
||||
void saveStates() throws IOException {
|
||||
if (DBG) Log.d("VpnServiceBinder", " saving states");
|
||||
ObjectOutputStream oos =
|
||||
new ObjectOutputStream(new FileOutputStream(getStateFilePath()));
|
||||
oos.writeObject(mService);
|
||||
oos.close();
|
||||
}
|
||||
|
||||
void removeStates() {
|
||||
try {
|
||||
File f = new File(getStateFilePath());
|
||||
if (f.exists()) f.delete();
|
||||
} catch (Throwable e) {
|
||||
if (DBG) Log.d("VpnServiceBinder", " remove states: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized boolean connect(final VpnProfile p,
|
||||
final String username, final String password) {
|
||||
if (mService != null) return false;
|
||||
final VpnService s = mService = createService(p);
|
||||
|
||||
new Thread(new Runnable() {
|
||||
public void run() {
|
||||
s.onConnect(username, password);
|
||||
}
|
||||
}).start();
|
||||
return true;
|
||||
}
|
||||
|
||||
private synchronized void disconnect() {
|
||||
if (mService == null) return;
|
||||
final VpnService s = mService;
|
||||
|
||||
new Thread(new Runnable() {
|
||||
public void run() {
|
||||
s.onDisconnect();
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
|
||||
private synchronized void checkStatus(VpnProfile p) {
|
||||
if ((mService == null)
|
||||
|| (!p.getName().equals(mService.mProfile.getName()))) {
|
||||
broadcastConnectivity(p.getName(), VpnState.IDLE);
|
||||
} else {
|
||||
broadcastConnectivity(p.getName(), mService.getState());
|
||||
}
|
||||
}
|
||||
|
||||
private void checkSavedStates() {
|
||||
try {
|
||||
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(
|
||||
getStateFilePath()));
|
||||
mService = (VpnService<? extends VpnProfile>) ois.readObject();
|
||||
mService.recover(this);
|
||||
ois.close();
|
||||
} catch (FileNotFoundException e) {
|
||||
// do nothing
|
||||
} catch (Throwable e) {
|
||||
Log.i("VpnServiceBinder", "recovery error, remove states: " + e);
|
||||
removeStates();
|
||||
}
|
||||
}
|
||||
|
||||
private VpnService<? extends VpnProfile> createService(VpnProfile p) {
|
||||
switch (p.getType()) {
|
||||
case L2TP:
|
||||
L2tpService l2tp = new L2tpService();
|
||||
l2tp.setContext(this, (L2tpProfile) p);
|
||||
return l2tp;
|
||||
|
||||
case PPTP:
|
||||
PptpService pptp = new PptpService();
|
||||
pptp.setContext(this, (PptpProfile) p);
|
||||
return pptp;
|
||||
|
||||
case L2TP_IPSEC_PSK:
|
||||
L2tpIpsecPskService psk = new L2tpIpsecPskService();
|
||||
psk.setContext(this, (L2tpIpsecPskProfile) p);
|
||||
return psk;
|
||||
|
||||
case L2TP_IPSEC:
|
||||
L2tpIpsecService l2tpIpsec = new L2tpIpsecService();
|
||||
l2tpIpsec.setContext(this, (L2tpIpsecProfile) p);
|
||||
return l2tpIpsec;
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private void broadcastConnectivity(String name, VpnState s) {
|
||||
new VpnManager(this).broadcastConnectivity(name, s);
|
||||
}
|
||||
}
|
||||
@ -32,6 +32,7 @@ import android.net.NetworkStateTracker;
|
||||
import android.net.NetworkUtils;
|
||||
import android.net.Proxy;
|
||||
import android.net.ProxyProperties;
|
||||
import android.net.vpn.VpnManager;
|
||||
import android.net.wifi.WifiStateTracker;
|
||||
import android.os.Binder;
|
||||
import android.os.Handler;
|
||||
@ -442,6 +443,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
||||
mSettingsObserver.observe(mContext);
|
||||
|
||||
loadGlobalProxy();
|
||||
|
||||
VpnManager.startVpnService(context);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -24,10 +24,11 @@ import android.net.vpn.VpnProfile;
|
||||
*/
|
||||
interface IVpnService {
|
||||
/**
|
||||
* Sets up the VPN connection.
|
||||
* Sets up a VPN connection.
|
||||
* @param profile the profile object
|
||||
* @param username the username for authentication
|
||||
* @param password the corresponding password for authentication
|
||||
* @return true if VPN is successfully connected
|
||||
*/
|
||||
boolean connect(in VpnProfile profile, String username, String password);
|
||||
|
||||
@ -37,7 +38,13 @@ interface IVpnService {
|
||||
void disconnect();
|
||||
|
||||
/**
|
||||
* Makes the service broadcast the connectivity state.
|
||||
* Gets the the current connection state.
|
||||
*/
|
||||
void checkStatus(in VpnProfile profile);
|
||||
String getState(in VpnProfile profile);
|
||||
|
||||
/**
|
||||
* Returns the idle state.
|
||||
* @return true if the system is not connecting/connected to a VPN
|
||||
*/
|
||||
boolean isIdle();
|
||||
}
|
||||
|
||||
@ -16,17 +16,19 @@
|
||||
|
||||
package android.net.vpn;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.ServiceConnection;
|
||||
import android.os.Environment;
|
||||
import android.os.IBinder;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.os.SystemProperties;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.server.vpn.VpnServiceBinder;
|
||||
|
||||
/**
|
||||
* The class provides interface to manage all VPN-related tasks, including:
|
||||
* <ul>
|
||||
@ -40,8 +42,6 @@ import android.util.Log;
|
||||
* {@hide}
|
||||
*/
|
||||
public class VpnManager {
|
||||
// Action for broadcasting a connectivity state.
|
||||
private static final String ACTION_VPN_CONNECTIVITY = "vpn.connectivity";
|
||||
/** Key to the profile name of a connectivity broadcast event. */
|
||||
public static final String BROADCAST_PROFILE_NAME = "profile_name";
|
||||
/** Key to the connectivity state of a connectivity broadcast event. */
|
||||
@ -74,8 +74,10 @@ public class VpnManager {
|
||||
private static final String PACKAGE_PREFIX =
|
||||
VpnManager.class.getPackage().getName() + ".";
|
||||
|
||||
// Action to start VPN service
|
||||
private static final String ACTION_VPN_SERVICE = PACKAGE_PREFIX + "SERVICE";
|
||||
// Action for broadcasting a connectivity state.
|
||||
private static final String ACTION_VPN_CONNECTIVITY = "vpn.connectivity";
|
||||
|
||||
private static final String VPN_SERVICE_NAME = "vpn";
|
||||
|
||||
// Action to start VPN settings
|
||||
private static final String ACTION_VPN_SETTINGS =
|
||||
@ -96,13 +98,76 @@ public class VpnManager {
|
||||
return VpnType.values();
|
||||
}
|
||||
|
||||
public static void startVpnService(Context c) {
|
||||
ServiceManager.addService(VPN_SERVICE_NAME, new VpnServiceBinder(c));
|
||||
}
|
||||
|
||||
private Context mContext;
|
||||
private IVpnService mVpnService;
|
||||
|
||||
/**
|
||||
* Creates a manager object with the specified context.
|
||||
*/
|
||||
public VpnManager(Context c) {
|
||||
mContext = c;
|
||||
createVpnServiceClient();
|
||||
}
|
||||
|
||||
private void createVpnServiceClient() {
|
||||
IBinder b = ServiceManager.getService(VPN_SERVICE_NAME);
|
||||
mVpnService = IVpnService.Stub.asInterface(b);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets up a VPN connection.
|
||||
* @param profile the profile object
|
||||
* @param username the username for authentication
|
||||
* @param password the corresponding password for authentication
|
||||
* @return true if VPN is successfully connected
|
||||
*/
|
||||
public boolean connect(VpnProfile p, String username, String password) {
|
||||
try {
|
||||
return mVpnService.connect(p, username, password);
|
||||
} catch (RemoteException e) {
|
||||
Log.e(TAG, "connect()", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tears down the VPN connection.
|
||||
*/
|
||||
public void disconnect() {
|
||||
try {
|
||||
mVpnService.disconnect();
|
||||
} catch (RemoteException e) {
|
||||
Log.e(TAG, "disconnect()", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the the current connection state.
|
||||
*/
|
||||
public VpnState getState(VpnProfile p) {
|
||||
try {
|
||||
return Enum.valueOf(VpnState.class, mVpnService.getState(p));
|
||||
} catch (RemoteException e) {
|
||||
Log.e(TAG, "getState()", e);
|
||||
return VpnState.IDLE;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the idle state.
|
||||
* @return true if the system is not connecting/connected to a VPN
|
||||
*/
|
||||
public boolean isIdle() {
|
||||
try {
|
||||
return mVpnService.isIdle();
|
||||
} catch (RemoteException e) {
|
||||
Log.e(TAG, "isIdle()", e);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -134,33 +199,6 @@ public class VpnManager {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the VPN service to establish VPN connection.
|
||||
*/
|
||||
public void startVpnService() {
|
||||
mContext.startService(new Intent(ACTION_VPN_SERVICE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Stops the VPN service.
|
||||
*/
|
||||
public void stopVpnService() {
|
||||
mContext.stopService(new Intent(ACTION_VPN_SERVICE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Binds the specified ServiceConnection with the VPN service.
|
||||
*/
|
||||
public boolean bindVpnService(ServiceConnection c) {
|
||||
if (!mContext.bindService(new Intent(ACTION_VPN_SERVICE), c, 0)) {
|
||||
Log.w(TAG, "failed to connect to VPN service");
|
||||
return false;
|
||||
} else {
|
||||
Log.d(TAG, "succeeded to connect to VPN service");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/** Broadcasts the connectivity state of the specified profile. */
|
||||
public void broadcastConnectivity(String profileName, VpnState s) {
|
||||
broadcastConnectivity(profileName, s, VPN_ERROR_NO_ERROR);
|
||||
|
||||
@ -27,8 +27,9 @@ import android.os.SystemProperties;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.R;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Serializable;
|
||||
import java.net.DatagramSocket;
|
||||
import java.net.InetAddress;
|
||||
import java.net.NetworkInterface;
|
||||
@ -37,8 +38,7 @@ import java.net.UnknownHostException;
|
||||
/**
|
||||
* The service base class for managing a type of VPN connection.
|
||||
*/
|
||||
abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
static final long serialVersionUID = 1L;
|
||||
abstract class VpnService<E extends VpnProfile> {
|
||||
private static final boolean DBG = true;
|
||||
private static final int NOTIFICATION_ID = 1;
|
||||
|
||||
@ -55,10 +55,8 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
|
||||
private final String TAG = VpnService.class.getSimpleName();
|
||||
|
||||
// FIXME: profile is only needed in connecting phase, so we can just save
|
||||
// the profile name and service class name for recovery
|
||||
E mProfile;
|
||||
transient VpnServiceBinder mContext;
|
||||
transient Context mContext;
|
||||
|
||||
private VpnState mState = VpnState.IDLE;
|
||||
private Throwable mError;
|
||||
@ -105,12 +103,8 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
return InetAddress.getByName(hostName).getHostAddress();
|
||||
}
|
||||
|
||||
void setContext(VpnServiceBinder context, E profile) {
|
||||
void setContext(Context context, E profile) {
|
||||
mProfile = profile;
|
||||
recover(context);
|
||||
}
|
||||
|
||||
void recover(VpnServiceBinder context) {
|
||||
mContext = context;
|
||||
mNotification = new NotificationHelper();
|
||||
|
||||
@ -124,6 +118,10 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
return mState;
|
||||
}
|
||||
|
||||
boolean isIdle() {
|
||||
return (mState == VpnState.IDLE);
|
||||
}
|
||||
|
||||
synchronized boolean onConnect(String username, String password) {
|
||||
try {
|
||||
setState(VpnState.CONNECTING);
|
||||
@ -216,21 +214,12 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
|
||||
mStartTime = System.currentTimeMillis();
|
||||
|
||||
// Correct order to make sure VpnService doesn't break when killed:
|
||||
// (1) set state to CONNECTED
|
||||
// (2) save states
|
||||
// (3) set DNS
|
||||
setState(VpnState.CONNECTED);
|
||||
saveSelf();
|
||||
setVpnDns();
|
||||
|
||||
startConnectivityMonitor();
|
||||
}
|
||||
|
||||
private void saveSelf() throws IOException {
|
||||
mContext.saveStates();
|
||||
}
|
||||
|
||||
private synchronized void onFinalCleanUp() {
|
||||
if (DBG) Log.d(TAG, "onFinalCleanUp()");
|
||||
|
||||
@ -243,10 +232,7 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
restoreOriginalDomainSuffices();
|
||||
setState(VpnState.IDLE);
|
||||
|
||||
// stop the service itself
|
||||
SystemProperties.set(VPN_STATUS, VPN_IS_DOWN);
|
||||
mContext.removeStates();
|
||||
mContext.stopSelf();
|
||||
}
|
||||
|
||||
private boolean anyError() {
|
||||
@ -413,9 +399,6 @@ abstract class VpnService<E extends VpnProfile> implements Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
private class DaemonHelper implements Serializable {
|
||||
}
|
||||
|
||||
// Helper class for showing, updating notification.
|
||||
private class NotificationHelper {
|
||||
private NotificationManager mNotificationManager = (NotificationManager)
|
||||
117
vpn/java/com/android/server/vpn/VpnServiceBinder.java
Normal file
117
vpn/java/com/android/server/vpn/VpnServiceBinder.java
Normal file
@ -0,0 +1,117 @@
|
||||
/*
|
||||
* Copyright (C) 2009, The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.server.vpn;
|
||||
|
||||
import android.app.Service;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.vpn.IVpnService;
|
||||
import android.net.vpn.L2tpIpsecProfile;
|
||||
import android.net.vpn.L2tpIpsecPskProfile;
|
||||
import android.net.vpn.L2tpProfile;
|
||||
import android.net.vpn.PptpProfile;
|
||||
import android.net.vpn.VpnManager;
|
||||
import android.net.vpn.VpnProfile;
|
||||
import android.net.vpn.VpnState;
|
||||
import android.util.Log;
|
||||
|
||||
/**
|
||||
* The service class for managing a VPN connection. It implements the
|
||||
* {@link IVpnService} binder interface.
|
||||
*/
|
||||
public class VpnServiceBinder extends IVpnService.Stub {
|
||||
private static final String TAG = VpnServiceBinder.class.getSimpleName();
|
||||
private static final boolean DBG = true;
|
||||
|
||||
// The actual implementation is delegated to the VpnService class.
|
||||
private VpnService<? extends VpnProfile> mService;
|
||||
|
||||
private Context mContext;
|
||||
|
||||
public VpnServiceBinder(Context context) {
|
||||
mContext = context;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean connect(VpnProfile p, final String username,
|
||||
final String password) {
|
||||
if ((mService != null) && !mService.isIdle()) return false;
|
||||
final VpnService s = mService = createService(p);
|
||||
|
||||
new Thread(new Runnable() {
|
||||
public void run() {
|
||||
s.onConnect(username, password);
|
||||
}
|
||||
}).start();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void disconnect() {
|
||||
if (mService == null) return;
|
||||
final VpnService s = mService;
|
||||
mService = null;
|
||||
|
||||
new Thread(new Runnable() {
|
||||
public void run() {
|
||||
s.onDisconnect();
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized String getState(VpnProfile p) {
|
||||
if ((mService == null)
|
||||
|| (!p.getName().equals(mService.mProfile.getName()))) {
|
||||
return VpnState.IDLE.toString();
|
||||
} else {
|
||||
return mService.getState().toString();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean isIdle() {
|
||||
return (mService == null || mService.isIdle());
|
||||
}
|
||||
|
||||
private VpnService<? extends VpnProfile> createService(VpnProfile p) {
|
||||
switch (p.getType()) {
|
||||
case L2TP:
|
||||
L2tpService l2tp = new L2tpService();
|
||||
l2tp.setContext(mContext, (L2tpProfile) p);
|
||||
return l2tp;
|
||||
|
||||
case PPTP:
|
||||
PptpService pptp = new PptpService();
|
||||
pptp.setContext(mContext, (PptpProfile) p);
|
||||
return pptp;
|
||||
|
||||
case L2TP_IPSEC_PSK:
|
||||
L2tpIpsecPskService psk = new L2tpIpsecPskService();
|
||||
psk.setContext(mContext, (L2tpIpsecPskProfile) p);
|
||||
return psk;
|
||||
|
||||
case L2TP_IPSEC:
|
||||
L2tpIpsecService l2tpIpsec = new L2tpIpsecService();
|
||||
l2tpIpsec.setContext(mContext, (L2tpIpsecProfile) p);
|
||||
return l2tpIpsec;
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user