Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement QR-code scanning for backup restoration

This commit is contained in:
Paul Schaub 2020-11-30 11:09:45 +01:00
parent eca4e6bdcb
commit adea44aaa1
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsActivity.java
View File

@ -8,10 +8,10 @@ import androidx.appcompat.widget.Toolbar;
import org.mercury_im.messenger.R;
import org.mercury_im.messenger.android.crypto.ikey.IkeyBackupCreationFragment;
import org.mercury_im.messenger.android.ui.base.MercuryActivity;
import org.mercury_im.messenger.android.ui.account.login.IkeyBackupRestoreOrSkipFragment;
import org.mercury_im.messenger.android.ui.account.login.IkeyKeyInfoFragment;
import org.mercury_im.messenger.android.ui.account.login.IkeySetupNavigator;
import org.mercury_im.messenger.android.ui.base.MercuryActivity;
import org.mercury_im.messenger.android.util.ArgumentUtils;
import java.util.UUID;

15
app/src/main/java/org/mercury_im/messenger/android/ui/account/detail/AccountDetailsFragment.java
View File

@ -150,7 +150,7 @@ public class AccountDetailsFragment extends Fragment {
}
private void observeViewModel() {
viewModel.getIkeyFingerprint().observe(getViewLifecycleOwner(), this::displayIkeyFingerprint);
viewModel.getIkeyFingerprint().observe(getViewLifecycleOwner(), this::displayIkeyFingerprintAndDecisionButton);
viewModel.getLocalFingerprint().observe(getViewLifecycleOwner(), this::displayLocalOxFingerprint);
viewModel.getRemoteFingerprints().observe(getViewLifecycleOwner(), this::displayOtherOxFingerprints);
@ -223,4 +223,17 @@ public class AccountDetailsFragment extends Fragment {
}
}
private void displayIkeyFingerprintAndDecisionButton(Optional<OpenPgpV4Fingerprint> fingerprint) {
displayIkeyFingerprint(fingerprint);
displayIkeyDecisionPublishButton(fingerprint);
}
private void displayIkeyDecisionPublishButton(Optional<OpenPgpV4Fingerprint> fingerprint) {
if (fingerprint.isPresent()) {
ikeySendDecisions.setVisibility(View.VISIBLE);
} else {
ikeySendDecisions.setVisibility(View.GONE);
}
}
}

38
app/src/main/java/org/mercury_im/messenger/android/ui/account/login/IkeyBackupRestoreOrSkipFragment.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.messenger.android.ui.account.login;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@ -21,6 +23,9 @@ import java.util.UUID;
import butterknife.BindView;
import butterknife.ButterKnife;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class IkeyBackupRestoreOrSkipFragment extends Fragment {
@BindView(R.id.btn_restore)
@ -69,6 +74,7 @@ public class IkeyBackupRestoreOrSkipFragment extends Fragment {
Toast.makeText(getContext(), opt.getItem(), Toast.LENGTH_SHORT).show();
}
});
scanButton.setOnClickListener(v -> startQrCodeScanIntent());
}
public void onRestore() {
@ -79,4 +85,36 @@ public class IkeyBackupRestoreOrSkipFragment extends Fragment {
}
}
public void startQrCodeScanIntent() {
try {
Intent intent = new Intent("com.google.zxing.client.android.SCAN");
intent.putExtra("SCAN_MODE", "QR_CODE_MODE"); // "PRODUCT_MODE for bar codes
startActivityForResult(intent, 0);
} catch (Exception e) {
Uri marketUri = Uri.parse("market://details?id=com.google.zxing.client.android");
Intent marketIntent = new Intent(Intent.ACTION_VIEW,marketUri);
startActivity(marketIntent);
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 0) {
if (resultCode == RESULT_OK) {
String contents = data.getStringExtra("SCAN_RESULT");
backupCodeEditText.setText(contents);
}
if(resultCode == RESULT_CANCELED){
//handle cancel
}
}
}
}