From 7f2f67f27c834c7be9d4dcd5b4dda5a8b93b0320 Mon Sep 17 00:00:00 2001 From: Lucas Liu Date: Wed, 16 Mar 2016 13:22:53 +0800 Subject: [PATCH] Fix crash when cancel qrcode scan. --- .../scala/com/github/shadowsocks/ProfileManagerActivity.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala index 06f32d75..10b7bbec 100644 --- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala @@ -13,7 +13,7 @@ import android.support.v7.widget.helper.ItemTouchHelper import android.support.v7.widget.helper.ItemTouchHelper.SimpleCallback import android.support.v7.widget.{DefaultItemAnimator, LinearLayoutManager, RecyclerView, Toolbar} import android.text.style.TextAppearanceSpan -import android.text.{SpannableStringBuilder, Spanned} +import android.text.{TextUtils, SpannableStringBuilder, Spanned} import android.view.{LayoutInflater, MenuItem, View, ViewGroup} import android.widget.{CheckedTextView, ImageView, LinearLayout, Toast} import com.github.shadowsocks.aidl.IShadowsocksServiceCallback @@ -239,7 +239,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe override def onActivityResult(requestCode: Int, resultCode: Int, data: Intent) { val scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) - if (scanResult != null) + if (scanResult != null && !TextUtils.isEmpty(scanResult.getContents)) Parser.findAll(scanResult.getContents).foreach(ShadowsocksApplication.profileManager.createProfile) }