From c6f1f505bbed01ac91f614fc8fbd6d0a68ba267e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Sep 2015 12:17:25 +0200 Subject: linked: ditch create dns fragment (for now) --- .../ui/linked/LinkedIdCreateDnsStep1Fragment.java | 129 ---------------- .../ui/linked/LinkedIdCreateDnsStep2Fragment.java | 172 --------------------- 2 files changed, 301 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java deleted file mode 100644 index c54d0c948..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2014 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui.linked; - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Patterns; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.EditText; - -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.linked.resources.DnsResource; - -public class LinkedIdCreateDnsStep1Fragment extends Fragment { - - LinkedIdWizard mLinkedIdWizard; - - EditText mEditDns; - - /** - * Creates new instance of this fragment - */ - public static LinkedIdCreateDnsStep1Fragment newInstance() { - LinkedIdCreateDnsStep1Fragment frag = new LinkedIdCreateDnsStep1Fragment(); - - Bundle args = new Bundle(); - frag.setArguments(args); - - return frag; - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - mLinkedIdWizard = (LinkedIdWizard) getActivity(); - - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - final View view = inflater.inflate(R.layout.linked_create_dns_fragment_step1, container, false); - - view.findViewById(R.id.next_button).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - - String uri = mEditDns.getText().toString(); - - if (!checkUri(uri)) { - mEditDns.setError("Please enter a valid domain name!"); - return; - } - - String proofText = DnsResource.generateText( - mLinkedIdWizard.mFingerprint); - - LinkedIdCreateDnsStep2Fragment frag = - LinkedIdCreateDnsStep2Fragment.newInstance(uri, proofText); - - mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); - - } - }); - - view.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mLinkedIdWizard.loadFragment(null, null, LinkedIdWizard.FRAG_ACTION_TO_LEFT); - } - }); - - mEditDns = (EditText) view.findViewById(R.id.linked_create_dns_domain); - - mEditDns.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) { - } - - @Override - public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) { - } - - @Override - public void afterTextChanged(Editable editable) { - String uri = editable.toString(); - if (uri.length() > 0) { - if (checkUri(uri)) { - mEditDns.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.ic_stat_retyped_ok, 0); - } else { - mEditDns.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.ic_stat_retyped_bad, 0); - } - } else { - // remove drawable if email is empty - mEditDns.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - } - } - }); - - return view; - } - - private static boolean checkUri(String uri) { - return Patterns.DOMAIN_NAME.matcher(uri).matches(); - } - -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java deleted file mode 100644 index c9eca8882..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (C) 2014 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui.linked; - - -import java.io.FileNotFoundException; -import java.io.PrintWriter; - -import android.app.Activity; -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.TextView; - -import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.linked.LinkedTokenResource; -import org.sufficientlysecure.keychain.linked.resources.DnsResource; -import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; -import org.sufficientlysecure.keychain.ui.util.Notify; -import org.sufficientlysecure.keychain.ui.util.Notify.Style; - -public class LinkedIdCreateDnsStep2Fragment extends LinkedIdCreateFinalFragment { - - private static final int REQUEST_CODE_OUTPUT = 0x00007007; - - public static final String DOMAIN = "domain", TEXT = "text"; - - TextView mTextView; - - String mResourceDomain; - String mResourceString; - - public static LinkedIdCreateDnsStep2Fragment newInstance - (String uri, String proofText) { - - LinkedIdCreateDnsStep2Fragment frag = new LinkedIdCreateDnsStep2Fragment(); - - Bundle args = new Bundle(); - args.putString(DOMAIN, uri); - args.putString(TEXT, proofText); - frag.setArguments(args); - - return frag; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - mResourceDomain = getArguments().getString(DOMAIN); - mResourceString = getArguments().getString(TEXT); - - } - - @Override - protected View newView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.linked_create_dns_fragment_step2, container, false); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = super.onCreateView(inflater, container, savedInstanceState); - - if (view != null) { - - view.findViewById(R.id.button_send).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - proofSend(); - } - }); - - view.findViewById(R.id.button_save).setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - proofToClipboard(); - } - }); - - mTextView = (TextView) view.findViewById(R.id.linked_create_dns_text); - mTextView.setText(mResourceString); - - } - - return view; - } - - @Override - LinkedTokenResource getResource(OperationLog log) { - return DnsResource.createNew(mResourceDomain); - } - - private void proofSend () { - Intent sendIntent = new Intent(); - sendIntent.setAction(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_TEXT, mResourceString); - sendIntent.setType("text/plain"); - startActivity(sendIntent); - } - - private void proofToClipboard() { - Activity activity = getActivity(); - if (activity == null) { - return; - } - - ClipboardManager clipMan = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE); - if (clipMan == null) { - Notify.create(activity, R.string.error_clipboard_copy, Style.ERROR).show(); - return; - } - - ClipData clip = ClipData.newPlainText(Constants.CLIPBOARD_LABEL, mResourceString); - clipMan.setPrimaryClip(clip); - - Notify.create(getActivity(), R.string.linked_text_clipboard, Notify.Style.OK).show(); - } - - private void saveFile(Uri uri) { - try { - PrintWriter out = - new PrintWriter(getActivity().getContentResolver().openOutputStream(uri)); - out.print(mResourceString); - if (out.checkError()) { - Notify.create(getActivity(), "Error writing file!", Style.ERROR).show(); - } - } catch (FileNotFoundException e) { - Notify.create(getActivity(), "File could not be opened for writing!", Style.ERROR).show(); - e.printStackTrace(); - } - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - switch (requestCode) { - // For saving a file - case REQUEST_CODE_OUTPUT: - if (data == null) { - return; - } - Uri uri = data.getData(); - saveFile(uri); - break; - default: - super.onActivityResult(requestCode, resultCode, data); - } - } - -} -- cgit v1.2.3