From 72c18734ad2841bd57a91917c419d30cd97a4022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 9 Mar 2015 16:03:58 +0100
Subject: Redesign of encrypt activites finished

---
 .../keychain/ui/EncryptTextFragment.java           | 41 +++++++++++++---------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
index b13cb7837..5d9994c5c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
@@ -23,6 +23,7 @@ import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -33,8 +34,6 @@ public class EncryptTextFragment extends Fragment {
     public static final String ARG_TEXT = "text";
 
     private TextView mText;
-    private View mEncryptShare;
-    private View mEncryptClipboard;
 
     private EncryptActivityInterface mEncryptInterface;
 
@@ -72,24 +71,16 @@ public class EncryptTextFragment extends Fragment {
                 mEncryptInterface.setMessage(s.toString());
             }
         });
-        mEncryptClipboard = view.findViewById(R.id.action_encrypt_clipboard);
-        mEncryptShare = view.findViewById(R.id.action_encrypt_share);
-        mEncryptClipboard.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mEncryptInterface.startEncrypt(false);
-            }
-        });
-        mEncryptShare.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mEncryptInterface.startEncrypt(true);
-            }
-        });
 
         return view;
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(true);
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -100,4 +91,22 @@ public class EncryptTextFragment extends Fragment {
             mText.setText(text);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.encrypt_copy: {
+                mEncryptInterface.startEncrypt(false);
+                break;
+            }
+            case R.id.encrypt_share: {
+                mEncryptInterface.startEncrypt(true);
+                break;
+            }
+            default: {
+                return super.onOptionsItemSelected(item);
+            }
+        }
+        return true;
+    }
 }
-- 
cgit v1.2.3