Commit e48e577

committed

Preventing FreeOTPPlus to share token to itself

1 parent 5b8e4ea commit e48e577Copy full SHA for e48e577

File tree

-0

lines changed

app/src/main/java/org/fedorahosted/freeotp/ui
- MainActivity.kt
- TokenViewHolder.kt

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,11 @@ class MainActivity : AppCompatActivity() {`
`278`	`278`	`override fun onNewIntent(intent: Intent) {`
`279`	`279`	`super.onNewIntent(intent)`
`280`	`280`
	`281`	`+ if (packageName == intent.extras?.getString(SHARE_FROM_PACKAGE_NAME_INTENT_EXTRA)) {`
	`282`	`+ Log.i(TAG, "Intent shared from the same package name. Ignoring the intent and do not add the token")`
	`283`	`+ return`
	`284`	`+ }`
	`285`	`+`
`281`	`286`	`val uri = intent.data`
`282`	`287`	`if (uri != null) {`
`283`	`288`	`lifecycleScope.launch {`
`@@ -460,5 +465,6 @@ class MainActivity : AppCompatActivity() {`
`460`	`465`	`const val READ_KEY_URI_REQUEST_CODE = 44`
`461`	`466`	`const val WRITE_KEY_URI_REQUEST_CODE = 45`
`462`	`467`	`const val SCREENSHOT_MODE_EXTRA = "screenshot_mode"`
	`468`	`+ const val SHARE_FROM_PACKAGE_NAME_INTENT_EXTRA = "shareFromPackageName"`
`463`	`469`	`}`
`464`	`470`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ class TokenViewHolder(private val activity: Activity,`
`32`	`32`
`33`	`33`	`R.id.action_share -> {`
`34`	`34`	`val i = Intent(Intent.ACTION_VIEW, Uri.parse(OtpTokenFactory.toUri(token).toString()))`
	`35`	`+ i.putExtra(MainActivity.SHARE_FROM_PACKAGE_NAME_INTENT_EXTRA, activity.packageName)`
`35`	`36`	`activity.startActivity(Intent.createChooser(i, null))`
`36`	`37`	`}`
`37`	`38`

Comments

(0)