TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 08:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into shared-sender-keys

Browse Source
This commit is contained in:
nielsandriesse
2020-09-02 09:49:19 +10:00
parent 968177c012 a12d9b4d98
commit 239efa7fc2
11 changed files with 69 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
View File

@@ -95,7 +95,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
// linkedDevicesButton.setOnClickListener { showLinkedDevices() }
seedButton.setOnClickListener { showSeed() }
clearAllDataButton.setOnClickListener { clearAllData() }
versionTextView.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {