narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fixe scan in OmemoActivities

Browse source
This commit is contained in:
Daniel Gultsch 2018-02-26 12:44:03 +01:00
parent 9a76aff8f9
commit 89bfae14b1
3 changed files with 234 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
View file

@ -1,6 +1,7 @@
package eu.siacs.conversations.ui; package eu.siacs.conversations.ui;
import android.databinding.DataBindingUtil; import android.databinding.DataBindingUtil;
import android.net.Uri;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@ -35,7 +36,7 @@ public abstract class OmemoActivity extends XmppActivity {
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu,v,menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
Object account = v.getTag(R.id.TAG_ACCOUNT); Object account = v.getTag(R.id.TAG_ACCOUNT);
Object fingerprint = v.getTag(R.id.TAG_FINGERPRINT); Object fingerprint = v.getTag(R.id.TAG_FINGERPRINT);
Object fingerprintStatus = v.getTag(R.id.TAG_FINGERPRINT_STATUS); Object fingerprintStatus = v.getTag(R.id.TAG_FINGERPRINT_STATUS);
@ -67,13 +68,13 @@ public abstract class OmemoActivity extends XmppActivity {
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.distrust_key: case R.id.distrust_key:
showPurgeKeyDialog(mSelectedAccount,mSelectedFingerprint); showPurgeKeyDialog(mSelectedAccount, mSelectedFingerprint);
break; break;
case R.id.copy_omemo_key: case R.id.copy_omemo_key:
copyOmemoFingerprint(mSelectedFingerprint); copyOmemoFingerprint(mSelectedFingerprint);
break; break;
case R.id.verify_scan: case R.id.verify_scan:
//new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE")); ScanActivity.scan(this);
break; break;
} }
return true; return true;
@ -81,16 +82,16 @@ public abstract class OmemoActivity extends XmppActivity {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent intent) { public void onActivityResult(int requestCode, int resultCode, Intent intent) {
/*IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); super.onActivityResult(requestCode, requestCode, intent);
if (scanResult != null && scanResult.getFormatName() != null) { if (requestCode == ScanActivity.REQUEST_SCAN_QR_CODE && resultCode == RESULT_OK) {
String data = scanResult.getContents(); String result = intent.getStringExtra(ScanActivity.INTENT_EXTRA_RESULT);
XmppUri uri = new XmppUri(data); XmppUri uri = new XmppUri(result == null ? "" : result);
if (xmppConnectionServiceBound) { if (xmppConnectionServiceBound) {
processFingerprintVerification(uri); processFingerprintVerification(uri);
} else { } else {
this.mPendingFingerprintVerificationUri =uri; this.mPendingFingerprintVerificationUri = uri;
}
} }
}*/
} }
protected abstract void processFingerprintVerification(XmppUri uri); protected abstract void processFingerprintVerification(XmppUri uri);
@ -125,21 +126,21 @@ public abstract class OmemoActivity extends XmppActivity {
boolean undecidedNeedEnablement, boolean undecidedNeedEnablement,
CompoundButton.OnCheckedChangeListener CompoundButton.OnCheckedChangeListener
onCheckedChangeListener) { onCheckedChangeListener) {
ContactKeyBinding binding = DataBindingUtil.inflate(getLayoutInflater(),R.layout.contact_key,keys,true); ContactKeyBinding binding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.contact_key, keys, true);
if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) { if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) {
binding.key.setOnClickListener(v -> showX509Certificate(account,fingerprint)); binding.key.setOnClickListener(v -> showX509Certificate(account, fingerprint));
binding.keyType.setOnClickListener(v -> showX509Certificate(account,fingerprint)); binding.keyType.setOnClickListener(v -> showX509Certificate(account, fingerprint));
} }
binding.tglTrust.setVisibility(View.VISIBLE); binding.tglTrust.setVisibility(View.VISIBLE);
registerForContextMenu(binding.getRoot()); registerForContextMenu(binding.getRoot());
binding.getRoot().setTag(R.id.TAG_ACCOUNT,account); binding.getRoot().setTag(R.id.TAG_ACCOUNT, account);
binding.getRoot().setTag(R.id.TAG_FINGERPRINT,fingerprint); binding.getRoot().setTag(R.id.TAG_FINGERPRINT, fingerprint);
binding.getRoot().setTag(R.id.TAG_FINGERPRINT_STATUS,status); binding.getRoot().setTag(R.id.TAG_FINGERPRINT_STATUS, status);
boolean x509 = Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509; boolean x509 = Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509;
final View.OnClickListener toast; final View.OnClickListener toast;
binding.tglTrust.setChecked(status.isTrusted()); binding.tglTrust.setChecked(status.isTrusted());
if (status.isActive()){ if (status.isActive()) {
binding.key.setTextColor(getPrimaryTextColor()); binding.key.setTextColor(getPrimaryTextColor());
binding.keyType.setTextColor(getSecondaryTextColor()); binding.keyType.setTextColor(getSecondaryTextColor());
if (status.isVerified()) { if (status.isVerified()) {
@ -155,7 +156,7 @@ public abstract class OmemoActivity extends XmppActivity {
if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) { if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) {
binding.buttonEnableDevice.setVisibility(View.VISIBLE); binding.buttonEnableDevice.setVisibility(View.VISIBLE);
binding.buttonEnableDevice.setOnClickListener(v -> { binding.buttonEnableDevice.setOnClickListener(v -> {
account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false)); account.getAxolotlService().setFingerprintTrust(fingerprint, FingerprintStatus.createActive(false));
binding.buttonEnableDevice.setVisibility(View.GONE); binding.buttonEnableDevice.setVisibility(View.GONE);
binding.tglTrust.setVisibility(View.VISIBLE); binding.tglTrust.setVisibility(View.VISIBLE);
}); });
@ -218,7 +219,7 @@ public abstract class OmemoActivity extends XmppActivity {
if (x509Certificate != null) { if (x509Certificate != null) {
showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate)); showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate));
} else { } else {
Toast.makeText(this,R.string.certificate_not_found, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.certificate_not_found, Toast.LENGTH_SHORT).show();
} }
} }
@ -243,4 +244,9 @@ public abstract class OmemoActivity extends XmppActivity {
builder.setPositiveButton(R.string.ok, null); builder.setPositiveButton(R.string.ok, null);
builder.create().show(); builder.create().show();
} }
@Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
ScanActivity.onRequestPermissionResult(this, requestCode, grantResults);
}
} }

29
src/main/java/eu/siacs/conversations/ui/ScanActivity.java
View file

@ -54,6 +54,7 @@ import android.view.TextureView;
import android.view.TextureView.SurfaceTextureListener; import android.view.TextureView.SurfaceTextureListener;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Toast;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
@ -67,6 +68,9 @@ import eu.siacs.conversations.ui.widget.ScannerView;
public final class ScanActivity extends Activity implements SurfaceTextureListener, ActivityCompat.OnRequestPermissionsResultCallback { public final class ScanActivity extends Activity implements SurfaceTextureListener, ActivityCompat.OnRequestPermissionsResultCallback {
public static final String INTENT_EXTRA_RESULT = "result"; public static final String INTENT_EXTRA_RESULT = "result";
public static final int REQUEST_SCAN_QR_CODE = 0x0987;
private static final int REQUEST_CAMERA_PERMISSIONS_TO_SCAN = 0x6789;
private static final long VIBRATE_DURATION = 50L; private static final long VIBRATE_DURATION = 50L;
private static final long AUTO_FOCUS_INTERVAL_MS = 2500L; private static final long AUTO_FOCUS_INTERVAL_MS = 2500L;
private static boolean DISABLE_CONTINUOUS_AUTOFOCUS = Build.MODEL.equals("GT-I9100") // Galaxy S2 private static boolean DISABLE_CONTINUOUS_AUTOFOCUS = Build.MODEL.equals("GT-I9100") // Galaxy S2
@ -263,7 +267,30 @@ public final class ScanActivity extends Activity implements SurfaceTextureListen
} }
private void postFinish() { private void postFinish() {
new Handler().postDelayed(() -> finish(), 50); new Handler().postDelayed(this::finish, 50);
}
public static void scan(Activity activity) {
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
Intent intent = new Intent(activity, ScanActivity.class);
activity.startActivityForResult(intent, REQUEST_SCAN_QR_CODE);
} else {
ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSIONS_TO_SCAN);
}
}
public static void onRequestPermissionResult(Activity activity, int requestCode, int[] grantResults) {
if (requestCode != REQUEST_CAMERA_PERMISSIONS_TO_SCAN) {
return;
}
if (grantResults.length > 0) {
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
scan(activity);
} else {
Toast.makeText(activity, R.string.qr_code_scanner_needs_access_to_camera, Toast.LENGTH_SHORT).show();
}
}
} }
private final class AutoFocusRunnable implements Runnable { private final class AutoFocusRunnable implements Runnable {

1
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
View file

@ -133,6 +133,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
if (hasPendingKeyFetches()) { if (hasPendingKeyFetches()) {
Toast.makeText(this, R.string.please_wait_for_keys_to_be_fetched, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.please_wait_for_keys_to_be_fetched, Toast.LENGTH_SHORT).show();
} else { } else {
ScanActivity.scan(this);
//new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE")); //new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE"));
return true; return true;
} }