Commit 49a3cfdc authored by Lucas Liu's avatar Lucas Liu

NFC state check

parent 82325ecd
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
<string name="flushing">刷新中……</string> <string name="flushing">刷新中……</string>
<string name="share">分享</string> <string name="share">分享</string>
<string name="share_message">扫描二维码或者使用 NFC(Android Beam)</string> <string name="share_message">扫描二维码或者使用 NFC(Android Beam)</string>
<string name="share_message_without_nfc">扫描二维码</string>
<string name="share_message_nfc_disabled">扫描二维码,NFC(Android Beam)被禁用</string>
<string name="turn_on_nfc">打开 NFC &amp; Android Beam</string>
<string name="add_profile">添加配置文件</string> <string name="add_profile">添加配置文件</string>
<string name="nat">NAT 模式 (仅限调试)</string> <string name="nat">NAT 模式 (仅限调试)</string>
......
...@@ -93,6 +93,9 @@ ...@@ -93,6 +93,9 @@
<string name="about_title">Shadowsocks %s</string> <string name="about_title">Shadowsocks %s</string>
<string name="share">Share</string> <string name="share">Share</string>
<string name="share_message">Scan QRCode or Use NFC (Android Beam)</string> <string name="share_message">Scan QRCode or Use NFC (Android Beam)</string>
<string name="share_message_without_nfc">Scan QRCode</string>
<string name="share_message_nfc_disabled">Scan QRCode, NFC (Android Beam) is disabled</string>
<string name="turn_on_nfc">Turn on NFC &amp; Android Beam</string>
<string name="flush_dnscache">Flush DNS cache</string> <string name="flush_dnscache">Flush DNS cache</string>
<string name="flush_dnscache_summary">Only useful in NAT mode</string> <string name="flush_dnscache_summary">Only useful in NAT mode</string>
<string name="flush_dnscache_summary_root">Only useful in NAT mode. Requires ROOT permission.</string> <string name="flush_dnscache_summary_root">Only useful in NAT mode. Requires ROOT permission.</string>
......
...@@ -5,7 +5,8 @@ import java.nio.charset.Charset ...@@ -5,7 +5,8 @@ import java.nio.charset.Charset
import android.content._ import android.content._
import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.nfc.NfcAdapter.CreateNdefMessageCallback
import android.nfc.{NdefMessage, NdefRecord, NfcAdapter, NfcEvent} import android.nfc.{NdefMessage, NdefRecord, NfcAdapter, NfcEvent}
import android.os.{Bundle, Handler} import android.os.{Build, Bundle, Handler}
import android.provider.Settings
import android.support.v7.app.{AlertDialog, AppCompatActivity} import android.support.v7.app.{AlertDialog, AppCompatActivity}
import android.support.v7.widget.RecyclerView.ViewHolder import android.support.v7.widget.RecyclerView.ViewHolder
import android.support.v7.widget.Toolbar.OnMenuItemClickListener import android.support.v7.widget.Toolbar.OnMenuItemClickListener
...@@ -36,8 +37,8 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe ...@@ -36,8 +37,8 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
val shareBtn = itemView.findViewById(R.id.share) val shareBtn = itemView.findViewById(R.id.share)
shareBtn.setOnClickListener(_ => { shareBtn.setOnClickListener(_ => {
val url = item.toString val url = item.toString
if (nfcAdapter != null && nfcAdapter.isEnabled) { if (nfcBeamEnable) {
nfcAdapter.setNdefPushMessageCallback(ProfileManagerActivity.this, ProfileManagerActivity.this) nfcAdapter.setNdefPushMessageCallback(ProfileManagerActivity.this,ProfileManagerActivity.this)
nfcShareItem = url.getBytes(Charset.forName("UTF-8")) nfcShareItem = url.getBytes(Charset.forName("UTF-8"))
} }
val image = new ImageView(ProfileManagerActivity.this) val image = new ImageView(ProfileManagerActivity.this)
...@@ -53,11 +54,26 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe ...@@ -53,11 +54,26 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
.setNegativeButton(R.string.copy_url, ((_, _) => .setNegativeButton(R.string.copy_url, ((_, _) =>
clipboard.setPrimaryClip(ClipData.newPlainText(null, url))): DialogInterface.OnClickListener) clipboard.setPrimaryClip(ClipData.newPlainText(null, url))): DialogInterface.OnClickListener)
.setView(image) .setView(image)
.setMessage(R.string.share_message)
.setTitle(R.string.share) .setTitle(R.string.share)
.create() .create()
dialog.setOnDismissListener(_ => if (nfcAdapter != null && nfcAdapter.isEnabled) if (!nfcAvailable){
nfcAdapter.setNdefPushMessageCallback(null, ProfileManagerActivity.this)) dialog.setMessage(getString(R.string.share_message_without_nfc))
} else {
if (!nfcBeamEnable) {
dialog.setMessage(getString(R.string.share_message_nfc_disabled))
dialog.setButton(DialogInterface.BUTTON_NEUTRAL, getString(R.string.turn_on_nfc), ((_, _) =>
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
startActivity(new Intent(Settings.ACTION_NFC_SETTINGS))
} else {
startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS))
}
): DialogInterface.OnClickListener)
} else {
dialog.setMessage(getString(R.string.share_message))
dialog.setOnDismissListener(_ =>
nfcAdapter.setNdefPushMessageCallback(null, ProfileManagerActivity.this))
}
}
dialog.show() dialog.show()
}) })
shareBtn.setOnLongClickListener(_ => { shareBtn.setOnLongClickListener(_ => {
...@@ -158,8 +174,12 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe ...@@ -158,8 +174,12 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
private var undoManager: UndoSnackbarManager[Profile] = _ private var undoManager: UndoSnackbarManager[Profile] = _
private lazy val clipboard = getSystemService(Context.CLIPBOARD_SERVICE).asInstanceOf[ClipboardManager] private lazy val clipboard = getSystemService(Context.CLIPBOARD_SERVICE).asInstanceOf[ClipboardManager]
private var nfcAdapter: NfcAdapter = _
private var nfcAdapter : NfcAdapter = _
private var nfcShareItem: Array[Byte] = _ private var nfcShareItem: Array[Byte] = _
private var nfcAvailable = false
private var nfcEnable = false
private var nfcBeamEnable = false
override def onCreate(savedInstanceState: Bundle) { override def onCreate(savedInstanceState: Bundle) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
...@@ -175,10 +195,6 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe ...@@ -175,10 +195,6 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
toolbar.inflateMenu(R.menu.profile_manager_menu) toolbar.inflateMenu(R.menu.profile_manager_menu)
toolbar.setOnMenuItemClickListener(this) toolbar.setOnMenuItemClickListener(this)
nfcAdapter = NfcAdapter.getDefaultAdapter(this)
if (nfcAdapter != null && nfcAdapter.isEnabled)
nfcAdapter.setNdefPushMessageCallback(null, ProfileManagerActivity.this)
ShadowsocksApplication.profileManager.setProfileAddedListener(profilesAdapter.add) ShadowsocksApplication.profileManager.setProfileAddedListener(profilesAdapter.add)
val profilesList = findViewById(R.id.profilesList).asInstanceOf[RecyclerView] val profilesList = findViewById(R.id.profilesList).asInstanceOf[RecyclerView]
val layoutManager = new LinearLayoutManager(this) val layoutManager = new LinearLayoutManager(this)
...@@ -215,6 +231,31 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe ...@@ -215,6 +231,31 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
} }
} }
override def onResume() {
super.onResume()
nfcAdapter = NfcAdapter.getDefaultAdapter(this)
if (nfcAdapter != null){
nfcAvailable = true
if (nfcAdapter.isEnabled) {
nfcEnable = true
if (nfcAdapter.isNdefPushEnabled) {
nfcBeamEnable = true
nfcAdapter.setNdefPushMessageCallback(null, ProfileManagerActivity.this)
} else {
nfcBeamEnable = false
}
} else{
nfcEnable = false
nfcBeamEnable = false
}
} else {
nfcAvailable = false
nfcEnable = false
nfcBeamEnable = false
}
}
override def onStart() { override def onStart() {
super.onStart() super.onStart()
registerCallback registerCallback
......
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