Commit 0b3ee8b7 authored by Mygod's avatar Mygod

Refine #735

It's impolite to ask for permission over and over again.
parent ba8efb96
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
<string name="add_profile_methods_manual_settings">Настройка вручную</string> <string name="add_profile_methods_manual_settings">Настройка вручную</string>
<string name="add_profile_nfc_hint_title">Использовать Android Beam (NFC) для добавления профиля</string> <string name="add_profile_nfc_hint_title">Использовать Android Beam (NFC) для добавления профиля</string>
<string name="add_profile_nfc_hint">Оставьте экран включённым на обоих устройствах, на втором устойстве нажмите кнопку профиля "поделиться", поднисите устройства друг к другу (тыльными сторонами).\nТак же Вы можете сканировать nfc метку.</string> <string name="add_profile_nfc_hint">Оставьте экран включённым на обоих устройствах, на втором устойстве нажмите кнопку профиля "поделиться", поднисите устройства друг к другу (тыльными сторонами).\nТак же Вы можете сканировать nfc метку.</string>
<string name="add_profile_scanner_permission_required">Разрешение камеры требуется для сканирования QR код.</string>
<string name="copy_url">Копировать URL</string> <string name="copy_url">Копировать URL</string>
<plurals name="removed"> <plurals name="removed">
<item quantity="one">Удалён</item> <item quantity="one">Удалён</item>
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
<string name="add_profile_methods_manual_settings">手动设置</string> <string name="add_profile_methods_manual_settings">手动设置</string>
<string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 来添加配置</string> <string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 来添加配置</string>
<string name="add_profile_nfc_hint">保持两台设备的屏幕亮起,在另外一台设备上,点击配置文件的分享按钮,将它们靠在一起(背靠背)。\n你也可以扫描 NFC 标签。</string> <string name="add_profile_nfc_hint">保持两台设备的屏幕亮起,在另外一台设备上,点击配置文件的分享按钮,将它们靠在一起(背靠背)。\n你也可以扫描 NFC 标签。</string>
<string name="add_profile_scanner_permission_required">扫描二维码需要相机权限。</string>
<string-array name="route_entry"> <string-array name="route_entry">
<item>全局</item> <item>全局</item>
......
...@@ -100,6 +100,10 @@ ...@@ -100,6 +100,10 @@
<string name="add_profile_dialog">為 Shadowsocks 新增此設定檔?</string> <string name="add_profile_dialog">為 Shadowsocks 新增此設定檔?</string>
<string name="add_profile_methods_scan_qr_code">掃描 QR 碼</string> <string name="add_profile_methods_scan_qr_code">掃描 QR 碼</string>
<string name="add_profile_methods_manual_settings">手動設定</string> <string name="add_profile_methods_manual_settings">手動設定</string>
<string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 來新增設定檔</string>
<string name="add_profile_nfc_hint">
保持兩台設備的屏幕亮起,在另外一台設備上,點擊設定檔的分享按鈕,將它們靠在一起(背靠背)。\n你也可以掃描 NFC 標籤。</string>
<string name="add_profile_scanner_permission_required">掃描 QR 碼需要相機權限。</string>
<string-array name="route_entry"> <string-array name="route_entry">
<item>全域</item> <item>全域</item>
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
<string name="add_profile_methods_manual_settings">Manual Settings</string> <string name="add_profile_methods_manual_settings">Manual Settings</string>
<string name="add_profile_nfc_hint_title">Use Android Beam (NFC) to add profile</string> <string name="add_profile_nfc_hint_title">Use Android Beam (NFC) to add profile</string>
<string name="add_profile_nfc_hint">Keep both devices screen on, on the other device, click profile\'s share button, bring them together (back to back).\nYou also can scan a nfc tag.</string> <string name="add_profile_nfc_hint">Keep both devices screen on, on the other device, click profile\'s share button, bring them together (back to back).\nYou also can scan a nfc tag.</string>
<string name="add_profile_scanner_permission_required">Camera permission is required for scanning QR code.</string>
<string name="copy_url">Copy URL</string> <string name="copy_url">Copy URL</string>
<plurals name="removed"> <plurals name="removed">
<item quantity="one">Removed</item> <item quantity="one">Removed</item>
......
...@@ -15,6 +15,7 @@ import android.support.v7.widget.Toolbar ...@@ -15,6 +15,7 @@ import android.support.v7.widget.Toolbar
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Toast
import com.google.zxing.Result import com.google.zxing.Result
...@@ -36,6 +37,9 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand ...@@ -36,6 +37,9 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
&& grantResults(0) == PackageManager.PERMISSION_GRANTED) { && grantResults(0) == PackageManager.PERMISSION_GRANTED) {
scannerView.setResultHandler(this) scannerView.setResultHandler(this)
scannerView.startCamera() scannerView.startCamera()
} else {
Toast.makeText(this, R.string.add_profile_scanner_permission_required, Toast.LENGTH_SHORT).show()
finish()
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment