mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-30 12:32:17 -05:00
Remove code for sharing whole key via qr code
This commit is contained in:
Dominik Schürmann
parent
b771276611
commit
377edfb310
@ -201,8 +201,7 @@ public class ViewKeyShareFragment extends Fragment implements
|
||||
}
|
||||
|
||||
private void showQrCodeDialog() {
|
||||
ShareQrCodeDialogFragment dialog = ShareQrCodeDialogFragment.newInstance(mDataUri,
|
||||
true);
|
||||
ShareQrCodeDialogFragment dialog = ShareQrCodeDialogFragment.newInstance(mDataUri);
|
||||
dialog.show(ViewKeyShareFragment.this.getActivity().getSupportFragmentManager(), "shareQrCodeDialog");
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,6 @@ import android.os.Bundle;
|
||||
import android.support.v4.app.DialogFragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
@ -34,37 +33,26 @@ import com.devspark.appmsg.AppMsg;
|
||||
import org.sufficientlysecure.keychain.Constants;
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
|
||||
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||
import org.sufficientlysecure.keychain.util.Log;
|
||||
import org.sufficientlysecure.keychain.util.QrCodeUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class ShareQrCodeDialogFragment extends DialogFragment {
|
||||
private static final String ARG_KEY_URI = "uri";
|
||||
private static final String ARG_FINGERPRINT_ONLY = "fingerprint_only";
|
||||
|
||||
private ImageView mImage;
|
||||
private TextView mText;
|
||||
|
||||
private boolean mFingerprintOnly;
|
||||
|
||||
private ArrayList<String> mContentList;
|
||||
private int mCounter;
|
||||
|
||||
private static final int QR_CODE_SIZE = 1000;
|
||||
|
||||
/**
|
||||
* Creates new instance of this dialog fragment
|
||||
*/
|
||||
public static ShareQrCodeDialogFragment newInstance(Uri dataUri, boolean fingerprintOnly) {
|
||||
public static ShareQrCodeDialogFragment newInstance(Uri dataUri) {
|
||||
ShareQrCodeDialogFragment frag = new ShareQrCodeDialogFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putParcelable(ARG_KEY_URI, dataUri);
|
||||
args.putBoolean(ARG_FINGERPRINT_ONLY, fingerprintOnly);
|
||||
|
||||
frag.setArguments(args);
|
||||
|
||||
@ -79,7 +67,6 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
|
||||
final Activity activity = getActivity();
|
||||
|
||||
Uri dataUri = getArguments().getParcelable(ARG_KEY_URI);
|
||||
mFingerprintOnly = getArguments().getBoolean(ARG_FINGERPRINT_ONLY);
|
||||
|
||||
AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
|
||||
alert.setTitle(R.string.share_qr_code_dialog_title);
|
||||
@ -94,7 +81,6 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
|
||||
ProviderHelper providerHelper = new ProviderHelper(getActivity());
|
||||
String content;
|
||||
try {
|
||||
if (mFingerprintOnly) {
|
||||
alert.setPositiveButton(R.string.btn_okay, null);
|
||||
|
||||
byte[] blob = (byte[]) providerHelper.getGenericData(
|
||||
@ -110,29 +96,6 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
|
||||
mText.setText(getString(R.string.share_qr_code_dialog_fingerprint_text) + " " + fingerprint);
|
||||
content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
|
||||
setQrCode(content);
|
||||
} else {
|
||||
mText.setText(R.string.share_qr_code_dialog_start);
|
||||
|
||||
try {
|
||||
Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri);
|
||||
content = providerHelper.getKeyRingAsArmoredString(uri);
|
||||
} catch (IOException e) {
|
||||
Log.e(Constants.TAG, "error processing key!", e);
|
||||
AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_ALERT).show();
|
||||
return null;
|
||||
}
|
||||
|
||||
// OnClickListener are set in onResume to prevent automatic dismissing of Dialogs
|
||||
// http://bit.ly/O5vfaR
|
||||
alert.setPositiveButton(R.string.btn_next, null);
|
||||
alert.setNegativeButton(android.R.string.cancel, null);
|
||||
|
||||
mContentList = splitString(content, 1000);
|
||||
|
||||
// start with first
|
||||
mCounter = 0;
|
||||
updatePartsQrCode();
|
||||
}
|
||||
} catch (ProviderHelper.NotFoundException e) {
|
||||
Log.e(Constants.TAG, "key not found!", e);
|
||||
AppMsg.makeText(getActivity(), R.string.error_key_not_found, AppMsg.STYLE_ALERT).show();
|
||||
@ -142,83 +105,8 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
|
||||
return alert.create();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
|
||||
if (!mFingerprintOnly) {
|
||||
AlertDialog alertDialog = (AlertDialog) getDialog();
|
||||
final Button backButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
|
||||
final Button nextButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
|
||||
|
||||
backButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mCounter > 0) {
|
||||
mCounter--;
|
||||
updatePartsQrCode();
|
||||
updateDialog(backButton, nextButton);
|
||||
} else {
|
||||
dismiss();
|
||||
}
|
||||
}
|
||||
});
|
||||
nextButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
if (mCounter < mContentList.size() - 1) {
|
||||
mCounter++;
|
||||
updatePartsQrCode();
|
||||
updateDialog(backButton, nextButton);
|
||||
} else {
|
||||
dismiss();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void updatePartsQrCode() {
|
||||
// Content: <counter>,<size>,<content>
|
||||
setQrCode(mCounter + "," + mContentList.size() + "," + mContentList.get(mCounter));
|
||||
}
|
||||
|
||||
private void setQrCode(String data) {
|
||||
mImage.setImageBitmap(QrCodeUtils.getQRCodeBitmap(data, QR_CODE_SIZE));
|
||||
}
|
||||
|
||||
private void updateDialog(Button backButton, Button nextButton) {
|
||||
if (mCounter == 0) {
|
||||
backButton.setText(android.R.string.cancel);
|
||||
} else {
|
||||
backButton.setText(R.string.btn_back);
|
||||
}
|
||||
if (mCounter == mContentList.size() - 1) {
|
||||
nextButton.setText(android.R.string.ok);
|
||||
} else {
|
||||
nextButton.setText(R.string.btn_next);
|
||||
}
|
||||
|
||||
mText.setText(getResources().getString(R.string.share_qr_code_dialog_progress,
|
||||
mCounter + 1, mContentList.size()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Split String by number of characters
|
||||
*
|
||||
* @param text
|
||||
* @param size
|
||||
* @return
|
||||
*/
|
||||
private ArrayList<String> splitString(String text, int size) {
|
||||
ArrayList<String> strings = new ArrayList<String>();
|
||||
int index = 0;
|
||||
while (index < text.length()) {
|
||||
strings.add(text.substring(index, Math.min(index + size, text.length())));
|
||||
index += size;
|
||||
}
|
||||
|
||||
return strings;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user