nutomic
/
ensichat
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always show QR code in UserInfoFragment

This commit is contained in:
Felix Ableitner 2016-09-25 15:31:55 +09:00
parent 0ccfd100d3
commit 858a2ac636
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/src/main/scala/com/nutomic/ensichat/fragments/ContactsFragment.scala
View File

@ -103,7 +103,6 @@ class ContactsFragment extends ListFragment with OnClickListener {
UserInfoFragment.ExtraAddress, ChatService.newCrypto(getActivity).localAddress.toString)
bundle.putString(
UserInfoFragment.ExtraUserName, prefs.getString(SettingsInterface.KeyUserName, ""))
bundle.putBoolean(UserInfoFragment.ExtraShowQr, true)
fragment.setArguments(bundle)
fragment.show(getFragmentManager, "dialog")
true

12
android/src/main/scala/com/nutomic/ensichat/fragments/UserInfoFragment.scala
View File

@ -17,7 +17,6 @@ import com.nutomic.ensichat.util.IdenticonGenerator
object UserInfoFragment {
val ExtraAddress = "address"
val ExtraUserName = "user_name"
val ExtraShowQr = "show_qr"
}
/**
@ -29,7 +28,6 @@ class UserInfoFragment extends DialogFragment with OnClickListener {
private lazy val address = new Address(getArguments.getString(UserInfoFragment.ExtraAddress))
private lazy val userName = getArguments.getString(UserInfoFragment.ExtraUserName)
private lazy val showQr = getArguments.getBoolean(UserInfoFragment.ExtraShowQr)
override def onCreateDialog(savedInstanceState: Bundle): Dialog = {
val view = LayoutInflater.from(getActivity).inflate(R.layout.fragment_identicon, null)
@ -42,12 +40,10 @@ class UserInfoFragment extends DialogFragment with OnClickListener {
addressTextView.setText(getString(R.string.address_colon, address.toString()))
addressTextView.setOnClickListener(this)
if (showQr) {
val matrix = new QRCodeWriter().encode(address.toString(), BarcodeFormat.QR_CODE, 150, 150)
view.findViewById(R.id.qr_code)
.asInstanceOf[ImageView]
.setImageBitmap(renderMatrix(matrix))
}
val matrix = new QRCodeWriter().encode(address.toString(), BarcodeFormat.QR_CODE, 150, 150)
view.findViewById(R.id.qr_code)
.asInstanceOf[ImageView]
.setImageBitmap(renderMatrix(matrix))
new AlertDialog.Builder(getActivity)
.setTitle(userName)