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

Code cleanup

Browse Source
This commit is contained in:
Dominik Schürmann
2016-11-29 23:07:43 +01:00
parent 6fe0ba829c
commit 921575ff1e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -36,7 +36,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.databinding.ImportKeysListBasicItemBinding;
import org.sufficientlysecure.keychain.databinding.ImportKeysListFragmentBinding; import org.sufficientlysecure.keychain.databinding.ImportKeysListFragmentBinding;
import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
import org.sufficientlysecure.keychain.keyimport.processing.AsyncTaskResultWrapper; import org.sufficientlysecure.keychain.keyimport.processing.AsyncTaskResultWrapper;
@@ -70,7 +69,6 @@ public class ImportKeysListFragment extends Fragment implements
private ImportKeysListener mListener; private ImportKeysListener mListener;
private ImportKeysListFragmentBinding mBinding; private ImportKeysListFragmentBinding mBinding;
private ImportKeysListBasicItemBinding mBindingBasic;
private ParcelableProxy mParcelableProxy; private ParcelableProxy mParcelableProxy;
private ImportKeysAdapter mAdapter; private ImportKeysAdapter mAdapter;
@@ -138,7 +136,6 @@ public class ImportKeysListFragment extends Fragment implements
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
mBinding = DataBindingUtil.inflate(inflater, R.layout.import_keys_list_fragment, container, false); mBinding = DataBindingUtil.inflate(inflater, R.layout.import_keys_list_fragment, container, false);
mBinding.setStatus(STATUS_FIRST); mBinding.setStatus(STATUS_FIRST);
mBindingBasic = mBinding.basic;
View view = mBinding.getRoot(); View view = mBinding.getRoot();
mActivity = getActivity(); mActivity = getActivity();
@@ -148,7 +145,7 @@ public class ImportKeysListFragment extends Fragment implements
byte[] bytes = args.getByteArray(ARG_BYTES); byte[] bytes = args.getByteArray(ARG_BYTES);
String query = args.getString(ARG_SERVER_QUERY); String query = args.getString(ARG_SERVER_QUERY);
boolean nonInteractive = args.getBoolean(ARG_NON_INTERACTIVE, false); boolean nonInteractive = args.getBoolean(ARG_NON_INTERACTIVE, false);
mBindingBasic.setNonInteractive(nonInteractive); mBinding.basic.setNonInteractive(nonInteractive);
// Create an empty adapter we will use to display the loaded data. // Create an empty adapter we will use to display the loaded data.
mAdapter = new ImportKeysAdapter(mActivity, mListener, nonInteractive); mAdapter = new ImportKeysAdapter(mActivity, mListener, nonInteractive);
@@ -165,13 +162,13 @@ public class ImportKeysListFragment extends Fragment implements
loadState(new CloudLoaderState(query, cloudSearchPrefs)); loadState(new CloudLoaderState(query, cloudSearchPrefs));
} }
// mBinding.basic is only used for file import
mBinding.basic.importKeys.setOnClickListener(new OnClickListener() { mBinding.basic.importKeys.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
mListener.importKeys(mAdapter.getEntries()); mListener.importKeys(mAdapter.getEntries());
} }
}); });
mBinding.basic.listKeys.setOnClickListener(new OnClickListener() { mBinding.basic.listKeys.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/bindings/ImportKeysBindings.java
View File

@@ -38,8 +38,9 @@ public class ImportKeysBindings {
Context context = textView.getContext(); Context context = textView.getContext();
Resources resources = context.getResources(); Resources resources = context.getResources();
if (userId == null) if (userId == null) {
userId = resources.getString(R.string.user_id_no_name); userId = resources.getString(R.string.user_id_no_name);
}
if (secret) { if (secret) {
userId = resources.getString(R.string.secret_key) + " " + userId; userId = resources.getString(R.string.secret_key) + " " + userId;
@@ -61,8 +62,9 @@ public class ImportKeysBindings {
Context context = textView.getContext(); Context context = textView.getContext();
if (userEmail == null) if (userEmail == null) {
userEmail = ""; userEmail = "";
}
Highlighter highlighter = ImportKeysBindingsUtils.getHighlighter(context, query); Highlighter highlighter = ImportKeysBindingsUtils.getHighlighter(context, query);
textView.setText(highlighter.highlight(userEmail)); textView.setText(highlighter.highlight(userEmail));