cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redesign request key into dialog

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-02-03 18:34:25 +01:00
parent 074be9e798
commit e06205ae55
9 changed files with 279 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
View File

@@ -18,138 +18,192 @@
package org.sufficientlysecure.keychain.remote.ui;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.ViewAnimator;
import org.openintents.openpgp.util.OpenPgpUtils.UserId;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.remote.ui.RequestKeyPermissionPresenter.RequestKeyPermissionMvpView;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
public class RequestKeyPermissionActivity extends BaseActivity {
public class RequestKeyPermissionActivity extends FragmentActivity {
public static final String EXTRA_PACKAGE_NAME = "package_name";
public static final String EXTRA_REQUESTED_KEY_IDS = "requested_key_ids";
private RequestKeyPermissionPresenter presenter;
private View keyInfoLayout;
private ViewAnimator viewAnimator;
private TextView titleText;
private ImageView iconClientApp;
private TextView keyUserIdView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setFullScreenDialogClose(
new View.OnClickListener() {
@Override
public void onClick(View v) {
presenter.onClickCancelDialog();
}
});
presenter = RequestKeyPermissionPresenter.createRequestKeyPermissionPresenter(getBaseContext());
if (savedInstanceState == null) {
RequestKeyPermissionFragment frag = new RequestKeyPermissionFragment();
frag.show(getSupportFragmentManager(), "requestKeyDialog");
}
}
@Override
protected void onStart() {
super.onStart();
Intent intent = getIntent();
String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
long[] keyIds = intent.getLongArrayExtra(EXTRA_REQUESTED_KEY_IDS);
presenter = RequestKeyPermissionPresenter.createRequestKeyPermissionPresenter(getBaseContext(), view);
presenter.setupFromIntentData(packageName, keyIds);
}
@Override
protected void initLayout() {
setContentView(R.layout.api_remote_request_key_permission);
public static class RequestKeyPermissionFragment extends DialogFragment {
private RequestKeyPermissionMvpView mvpView;
private RequestKeyPermissionPresenter presenter;
private Button buttonCancel;
private Button buttonAllow;
keyUserIdView = (TextView) findViewById(R.id.select_key_item_name);
iconClientApp = (ImageView) findViewById(R.id.icon_client_app);
titleText = (TextView) findViewById(R.id.select_identity_key_title);
viewAnimator = (ViewAnimator) findViewById(R.id.status_animator);
keyInfoLayout = findViewById(R.id.key_info_layout);
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Activity activity = getActivity();
findViewById(R.id.button_allow).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
presenter.onClickAllow();
ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(theme);
@SuppressLint("InflateParams")
View view = LayoutInflater.from(theme).inflate(R.layout.api_remote_request_key_permission, null, false);
alert.setView(view);
buttonAllow = (Button) view.findViewById(R.id.button_allow);
buttonCancel = (Button) view.findViewById(R.id.button_cancel);
setupListenersForPresenter();
mvpView = createMvpView(view);
return alert.create();
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
presenter = ((RequestKeyPermissionActivity) getActivity()).presenter;
presenter.setView(mvpView);
}
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
if (presenter != null) {
presenter.onCancel();
}
});
}
findViewById(R.id.button_deny).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
presenter.onClickDeny();
}
});
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
findViewById(R.id.display_key).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
presenter.onClickDisplayKey();
if (presenter != null) {
presenter.setView(null);
presenter = null;
}
});
}
@NonNull
private RequestKeyPermissionMvpView createMvpView(View view) {
final TextView titleText = (TextView) view.findViewById(R.id.select_identity_key_title);
final TextView keyUserIdView = (TextView) view.findViewById(R.id.select_key_item_name);
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final View keyUnavailableWarning = view.findViewById(R.id.requested_key_unavailable_warning);
final View keyInfoLayout = view.findViewById(R.id.key_info_layout);
return new RequestKeyPermissionMvpView() {
@Override
public void switchToLayoutRequestKeyChoice() {
keyInfoLayout.setVisibility(View.VISIBLE);
keyUnavailableWarning.setVisibility(View.GONE);
buttonAllow.setEnabled(true);
}
@Override
public void switchToLayoutNoSecret() {
keyInfoLayout.setVisibility(View.VISIBLE);
keyUnavailableWarning.setVisibility(View.VISIBLE);
buttonAllow.setEnabled(false);
}
@Override
public void displayKeyInfo(UserId userId) {
keyUserIdView.setText(userId.name);
}
@Override
public void finish() {
FragmentActivity activity = getActivity();
if (activity == null) {
return;
}
activity.setResult(Activity.RESULT_OK);
activity.finish();
}
@Override
public void finishAsCancelled() {
FragmentActivity activity = getActivity();
if (activity == null) {
return;
}
activity.setResult(Activity.RESULT_CANCELED);
activity.finish();
}
@Override
public void setTitleText(String text) {
titleText.setText(text);
}
@Override
public void setTitleClientIcon(Drawable drawable) {
iconClientApp.setImageDrawable(drawable);
}
};
}
private void setupListenersForPresenter() {
buttonAllow.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
presenter.onClickAllow();
}
});
buttonCancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
presenter.onClickCancel();
}
});
}
}
RequestKeyPermissionMvpView view = new RequestKeyPermissionMvpView() {
@Override
public void switchToLayoutRequestKeyChoice() {
keyInfoLayout.setVisibility(View.VISIBLE);
viewAnimator.setDisplayedChild(0);
}
@Override
public void switchToLayoutNoSecret() {
keyInfoLayout.setVisibility(View.VISIBLE);
viewAnimator.setDisplayedChild(1);
}
@Override
public void switchToLayoutUnknownKey() {
keyInfoLayout.setVisibility(View.GONE);
viewAnimator.setDisplayedChild(2);
}
@Override
public void displayKeyInfo(UserId userId) {
keyUserIdView.setText(userId.name);
}
@Override
public void finish() {
setResult(Activity.RESULT_OK);
RequestKeyPermissionActivity.this.finish();
}
@Override
public void finishAsCancelled() {
setResult(Activity.RESULT_CANCELED);
RequestKeyPermissionActivity.this.finish();
}
@Override
public void startActivity(Intent intent) {
RequestKeyPermissionActivity.this.startActivity(intent);
}
@Override
public void setTitleText(String text) {
titleText.setText(text);
}
@Override
public void setTitleClientIcon(Drawable drawable) {
iconClientApp.setImageDrawable(drawable);
}
};
}

52
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionPresenter.java
View File

@@ -2,63 +2,62 @@ package org.sufficientlysecure.keychain.remote.ui;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.Drawable;
import com.android.annotations.VisibleForTesting;
import org.openintents.openpgp.util.OpenPgpUtils.UserId;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.provider.ApiDataAccessObject;
import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.remote.ApiPermissionHelper;
import org.sufficientlysecure.keychain.remote.ApiPermissionHelper.WrongPackageCertificateException;
import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
import org.sufficientlysecure.keychain.util.Log;
class RequestKeyPermissionPresenter {
private final Context context;
private final RequestKeyPermissionMvpView view;
private final PackageManager packageManager;
private final ApiDataAccessObject apiDataAccessObject;
private final ApiPermissionHelper apiPermissionHelper;
private RequestKeyPermissionMvpView view;
private String packageName;
private long masterKeyId;
static RequestKeyPermissionPresenter createRequestKeyPermissionPresenter(Context context,
RequestKeyPermissionMvpView view) {
static RequestKeyPermissionPresenter createRequestKeyPermissionPresenter(Context context) {
PackageManager packageManager = context.getPackageManager();
ApiDataAccessObject apiDataAccessObject = new ApiDataAccessObject(context);
ApiPermissionHelper apiPermissionHelper = new ApiPermissionHelper(context, apiDataAccessObject);
return new RequestKeyPermissionPresenter(
context, view, apiDataAccessObject, apiPermissionHelper, packageManager);
return new RequestKeyPermissionPresenter(context, apiDataAccessObject, apiPermissionHelper, packageManager);
}
@VisibleForTesting
RequestKeyPermissionPresenter(Context context, RequestKeyPermissionMvpView view,
ApiDataAccessObject apiDataAccessObject, ApiPermissionHelper apiPermissionHelper,
PackageManager packageManager) {
private RequestKeyPermissionPresenter(Context context, ApiDataAccessObject apiDataAccessObject,
ApiPermissionHelper apiPermissionHelper, PackageManager packageManager) {
this.context = context;
this.view = view;
this.apiDataAccessObject = apiDataAccessObject;
this.apiPermissionHelper = apiPermissionHelper;
this.packageManager = packageManager;
}
void setView(RequestKeyPermissionMvpView view) {
this.view = view;
}
void setupFromIntentData(String packageName, long[] requestedMasterKeyIds) {
checkPackageAllowed(packageName);
if (requestedMasterKeyIds.length < 1) {
view.finishAsCancelled();
}
try {
setPackageInfo(packageName);
} catch (NameNotFoundException e) {
@@ -69,7 +68,6 @@ class RequestKeyPermissionPresenter {
this.packageName = packageName;
this.masterKeyId = requestedMasterKeyIds[0];
// long masterKeyId = 4817915339785265755L;
try {
CachedPublicKeyRing cachedPublicKeyRing = new ProviderHelper(context).getCachedPublicKeyRing(masterKeyId);
@@ -82,21 +80,17 @@ class RequestKeyPermissionPresenter {
view.switchToLayoutNoSecret();
}
} catch (PgpKeyNotFoundException e) {
view.switchToLayoutUnknownKey();
view.finishAsCancelled();
}
}
private void setPackageInfo(String packageName) throws NameNotFoundException {
Drawable appIcon;
CharSequence appName;
ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
appIcon = packageManager.getApplicationIcon(applicationInfo);
appName = packageManager.getApplicationLabel(applicationInfo);
Drawable appIcon = packageManager.getApplicationIcon(applicationInfo);
CharSequence appName = packageManager.getApplicationLabel(applicationInfo);
view.setTitleClientIcon(appIcon);
view.setTitleText(context.getString(R.string.request_permission_title, appName));
view.setTitleText(context.getString(R.string.request_permission_msg, appName));
}
private void checkPackageAllowed(String packageName) {
@@ -116,23 +110,16 @@ class RequestKeyPermissionPresenter {
view.finish();
}
void onClickDeny() {
void onClickCancel() {
view.finishAsCancelled();
}
void onClickDisplayKey() {
Intent intent = new Intent(context, ViewKeyActivity.class);
intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId));
view.startActivity(intent);
}
void onClickCancelDialog() {
void onCancel() {
view.finishAsCancelled();
}
interface RequestKeyPermissionMvpView {
void switchToLayoutRequestKeyChoice();
void switchToLayoutUnknownKey();
void switchToLayoutNoSecret();
void setTitleText(String text);
@@ -142,6 +129,5 @@ class RequestKeyPermissionPresenter {
void finish();
void finishAsCancelled();
void startActivity(Intent intent);
}
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View File

@@ -293,7 +293,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
setupEditTextFocusNext(mCodeEditText);
setupEditTextSuccessListener(mCodeEditText);
mStatusAnimator = (ToolableViewAnimator) view.findViewById(R.id.status_animator);
mStatusAnimator = (ToolableViewAnimator) view.findViewById(R.id.button_bar_animator);
mTitleAnimator = (ToolableViewAnimator) view.findViewById(R.id.title_animator);
mCodeFieldsAnimator = (ToolableViewAnimator) view.findViewById(R.id.code_animator);