diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 23:21:50 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-13 23:21:50 +0200 |
| commit | 0be385fec3caee21a5eab3b9ca2c659749b4a1aa (patch) | |
| tree | 875110c00ebf646a21a89846f7e6428d452d9d6a /src/main/java/de/pixart/messenger/ui | |
| parent | 1b6bf807de1b442687ec5f9982e551bb16923f04 (diff) | |
some OTR hints
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 1 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index 6f5135d9e..06fab28c4 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -118,7 +118,6 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat Toast.makeText(this, R.string.please_wait_for_keys_to_be_fetched, Toast.LENGTH_SHORT).show(); } else { ScanActivity.scan(this); - //new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE")); return true; } } diff --git a/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java b/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java index 2bdbbae97..d31c9aa60 100644 --- a/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java +++ b/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; +import android.util.Log; import android.view.Menu; import android.view.View; import android.widget.Button; @@ -16,6 +17,7 @@ import android.widget.Toast; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; +import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Contact; @@ -204,9 +206,10 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer return false; } this.mode = intent.getIntExtra("mode", MODE_MANUAL_VERIFICATION); + // todo scan OTR fingerprint if (this.mode == MODE_SCAN_FINGERPRINT) { - // todo scan OTR fingerprint - // new IntentIntegrator(this).initiateScan(); + Log.d(Config.LOGTAG, "Scan OTR fingerprint is not implemented in this version"); + //new IntentIntegrator(this).initiateScan(); return false; } return true; @@ -217,7 +220,8 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer @Override public void onActivityResult(int requestCode, int resultCode, Intent intent) { - // todo onActivityResult OTR + // todo onActivityResult for OTR scan + Log.d(Config.LOGTAG, "Scan OTR fingerprint result is not implemented in this version"); /*if ((requestCode & 0xFFFF) == IntentIntegrator.REQUEST_CODE) { IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); if (scanResult != null && scanResult.getFormatName() != null) { |