gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-24 21:25:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

linter

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
rapterjet2004 2025-07-11 10:46:53 -05:00
parent e643039488
commit 1918349c93
No known key found for this signature in database
GPG Key ID: 3AA5FDFED7944099
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt
View File

@ -150,28 +150,29 @@ class BrowserLoginActivity : BaseActivity() {
} }
} }
private val qrScanResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> private val qrScanResultLauncher =
if (result.resultCode == RESULT_OK) { registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
val data = result.data if (result.resultCode == RESULT_OK) {
val data = result.data
if (data == null) { if (data == null) {
return@registerForActivityResult return@registerForActivityResult
} }
val resultData = data.getStringExtra("com.blikoon.qrcodescanner.got_qr_scan_relult") val resultData = data.getStringExtra("com.blikoon.qrcodescanner.got_qr_scan_relult")
if (resultData == null || !resultData.startsWith("nc")) { if (resultData == null || !resultData.startsWith("nc")) {
Snackbar.make(binding.root, getString(R.string.qr_code_error), Snackbar.LENGTH_SHORT).show() Snackbar.make(binding.root, getString(R.string.qr_code_error), Snackbar.LENGTH_SHORT).show()
return@registerForActivityResult return@registerForActivityResult
} }
try { try {
parseLoginDataUrl(resultData) parseLoginDataUrl(resultData)
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
Log.e(TAG, "Error in scanning QR Code: $e") Log.e(TAG, "Error in scanning QR Code: $e")
}
} }
} }
}
private fun anonymouslyPostLoginRequest() { private fun anonymouslyPostLoginRequest() {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
@ -276,13 +277,13 @@ class BrowserLoginActivity : BaseActivity() {
*/ */
fun parseLoginDataUrl(dataString: String) { fun parseLoginDataUrl(dataString: String) {
if (!dataString.startsWith(PREFIX)) { if (!dataString.startsWith(PREFIX)) {
throw IllegalArgumentException("Invalid login URL detected" ) throw IllegalArgumentException("Invalid login URL detected")
} }
val data = dataString.removePrefix(PREFIX) val data = dataString.removePrefix(PREFIX)
val values = data.split('&') val values = data.split('&')
if(values.size !in 1..3) { if (values.size !in 1..MAX_ARGS) {
throw IllegalArgumentException("Illegal number of login URL elements detected: ${values.size}") throw IllegalArgumentException("Illegal number of login URL elements detected: ${values.size}")
} }
@ -293,9 +294,11 @@ class BrowserLoginActivity : BaseActivity() {
value.startsWith(USER_KEY) -> { value.startsWith(USER_KEY) -> {
loginData.username = URLDecoder.decode(value.removePrefix(USER_KEY), "UTF-8") loginData.username = URLDecoder.decode(value.removePrefix(USER_KEY), "UTF-8")
} }
value.startsWith(PASS_KEY) -> { value.startsWith(PASS_KEY) -> {
loginData.token = URLDecoder.decode(value.removePrefix(PASS_KEY), "UTF-8") loginData.token = URLDecoder.decode(value.removePrefix(PASS_KEY), "UTF-8")
} }
value.startsWith(SERVER_KEY) -> { value.startsWith(SERVER_KEY) -> {
loginData.serverUrl = URLDecoder.decode(value.removePrefix(SERVER_KEY), "UTF-8") loginData.serverUrl = URLDecoder.decode(value.removePrefix(SERVER_KEY), "UTF-8")
baseUrl = loginData.serverUrl baseUrl = loginData.serverUrl
@ -431,5 +434,6 @@ class BrowserLoginActivity : BaseActivity() {
private const val SERVER_KEY = "server:" private const val SERVER_KEY = "server:"
private const val PASS_KEY = "password:" private const val PASS_KEY = "password:"
private const val PREFIX = "nc://login/" private const val PREFIX = "nc://login/"
private const val MAX_ARGS = 3
} }
} }

11
app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt
View File

@ -396,12 +396,13 @@ class ServerSelectionActivity : BaseActivity() {
} }
} }
private val requestCameraPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean -> private val requestCameraPermissionLauncher =
if (isGranted) { registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
// Permission was granted if (isGranted) {
startQRScanner() // Permission was granted
startQRScanner()
}
} }
}
fun onScan() { fun onScan() {
if (PermissionUtil.isPermissionGranted(this, Manifest.permission.CAMERA)) { if (PermissionUtil.isPermissionGranted(this, Manifest.permission.CAMERA)) {