From 9cdb5ae0a9ae6cba86f895bc81462df3acb333e0 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 3 Feb 2017 18:52:42 +0100 Subject: [PATCH] move remoteregister logic into presenter --- .../keychain/remote/ApiPermissionHelper.java | 3 +- .../remote/ui/RemoteRegisterActivity.java | 101 +++++++++--------- .../remote/ui/RemoteRegisterPresenter.java | 49 +++++++++ 3 files changed, 102 insertions(+), 51 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterPresenter.java diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java index ff1e28ba9..a40296ef3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPermissionHelper.java @@ -104,8 +104,7 @@ public class ApiPermissionHelper { } Log.e(Constants.TAG, "Not allowed to use service! return PendingIntent for registration!"); - PendingIntent pi = piFactory.createRegisterPendingIntent(data, - packageName, packageCertificate); + PendingIntent pi = piFactory.createRegisterPendingIntent(data, packageName, packageCertificate); // return PendingIntent to be executed by client Intent result = new Intent(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterActivity.java index 0ce9e66c9..038cefc10 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterActivity.java @@ -22,14 +22,12 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; -import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.provider.ApiDataAccessObject; -import org.sufficientlysecure.keychain.remote.AppSettings; +import org.sufficientlysecure.keychain.remote.ui.RemoteRegisterPresenter.RemoteRegisterView; import org.sufficientlysecure.keychain.ui.base.BaseActivity; -import org.sufficientlysecure.keychain.util.Log; -public class RemoteRegisterActivity extends BaseActivity { + +public class RemoteRegisterActivity extends BaseActivity implements RemoteRegisterView { public static final String EXTRA_PACKAGE_NAME = "package_name"; public static final String EXTRA_PACKAGE_SIGNATURE = "package_signature"; @@ -37,54 +35,59 @@ public class RemoteRegisterActivity extends BaseActivity { public static final String EXTRA_DATA = "data"; private AppSettingsHeaderFragment mAppSettingsHeaderFragment; + private RemoteRegisterPresenter presenter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + this.presenter = new RemoteRegisterPresenter(getBaseContext()); + + Intent intent = getIntent(); + Intent resultData = intent.getParcelableExtra(EXTRA_DATA); + String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME); + byte[] packageSignature = intent.getByteArrayExtra(EXTRA_PACKAGE_SIGNATURE); + + presenter.setupFromIntent(resultData, packageName, packageSignature); + presenter.setView(this); + + mAppSettingsHeaderFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById( + R.id.api_app_settings_fragment); + // TODO unclean, fix later + mAppSettingsHeaderFragment.setAppSettings(presenter.appSettings); + + setFullScreenDialogTwoButtons( + R.string.api_register_allow, R.drawable.ic_check_white_24dp, + new View.OnClickListener() { + @Override + public void onClick(View v) { + presenter.onClickAllow(); + } + }, R.string.api_register_disallow, R.drawable.ic_close_white_24dp, + new View.OnClickListener() { + @Override + public void onClick(View v) { + presenter.onClickCancel(); + } + } + ); + } + + @Override + public void finishWithResult(Intent resultIntent) { + setResult(RESULT_OK, resultIntent); + finish(); + } + + @Override + public void finishAsCancelled() { + setResult(RESULT_CANCELED); + finish(); + } @Override protected void initLayout() { setContentView(R.layout.api_remote_register_app); } - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - final Bundle extras = getIntent().getExtras(); - - final String packageName = extras.getString(EXTRA_PACKAGE_NAME); - final byte[] packageSignature = extras.getByteArray(EXTRA_PACKAGE_SIGNATURE); - Log.d(Constants.TAG, "ACTION_REGISTER packageName: " + packageName); - - final ApiDataAccessObject apiDao = new ApiDataAccessObject(this); - - mAppSettingsHeaderFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById( - R.id.api_app_settings_fragment); - - AppSettings settings = new AppSettings(packageName, packageSignature); - mAppSettingsHeaderFragment.setAppSettings(settings); - - // Inflate a "Done"/"Cancel" custom action bar view - setFullScreenDialogTwoButtons( - R.string.api_register_allow, R.drawable.ic_check_white_24dp, - new View.OnClickListener() { - @Override - public void onClick(View v) { - // Allow - apiDao.insertApiApp(mAppSettingsHeaderFragment.getAppSettings()); - - // give data through for new service call - Intent resultData = extras.getParcelable(EXTRA_DATA); - RemoteRegisterActivity.this.setResult(RESULT_OK, resultData); - RemoteRegisterActivity.this.finish(); - } - }, R.string.api_register_disallow, R.drawable.ic_close_white_24dp, - new View.OnClickListener() { - @Override - public void onClick(View v) { - // Disallow - RemoteRegisterActivity.this.setResult(RESULT_CANCELED); - RemoteRegisterActivity.this.finish(); - } - } - ); - } - } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterPresenter.java new file mode 100644 index 000000000..3c6daca28 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteRegisterPresenter.java @@ -0,0 +1,49 @@ +package org.sufficientlysecure.keychain.remote.ui; + + +import android.content.Context; +import android.content.Intent; + +import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.provider.ApiDataAccessObject; +import org.sufficientlysecure.keychain.remote.AppSettings; +import org.sufficientlysecure.keychain.util.Log; + + +class RemoteRegisterPresenter { + private final ApiDataAccessObject apiDao; + + private RemoteRegisterView view; + private Intent resultData; + AppSettings appSettings; + + RemoteRegisterPresenter(Context context) { + apiDao = new ApiDataAccessObject(context); + } + + public void setView(RemoteRegisterView view) { + this.view = view; + } + + void setupFromIntent(Intent resultData, String packageName, byte[] packageSignature) { + this.appSettings = new AppSettings(packageName, packageSignature); + this.resultData = resultData; + + Log.d(Constants.TAG, "ACTION_REGISTER packageName: " + packageName); + } + + void onClickAllow() { + apiDao.insertApiApp(appSettings); + view.finishWithResult(resultData); + } + + void onClickCancel() { + view.finishAsCancelled(); + } + + interface RemoteRegisterView { + void finishWithResult(Intent resultData); + void finishAsCancelled(); + } +} +