mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 21:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3882 from nextcloud/NPECheckScanner

Browse source 
Fix #3881 by checking for result being null
This commit is contained in:
Andy Scherzinger 2019-04-12 21:51:56 +02:00 committed by GitHub
commit 36937b2366
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -2415,7 +2415,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
String result = data.getStringExtra("com.blikoon.qrcodescanner.got_qr_scan_relult");
if (!result.startsWith(getString(R.string.login_data_own_scheme))) {
if (result == null || !result.startsWith(getString(R.string.login_data_own_scheme))) {
mServerStatusIcon = R.drawable.ic_alert;
mServerStatusText = "QR Code could not be read!";
showServerStatus();