Use Toolbar and new BaseActivity

1 files changed, 6 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 497486a5e..297a35eb5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -44,7 +44,7 @@ import org.sufficientlysecure.keychain.util.Log;
 /**
  * Sends the selected public key to a keyserver
  */
-public class UploadKeyActivity extends ActionBarActivity {
+public class UploadKeyActivity extends BaseActivity {
     private View mUploadButton;
     private Spinner mKeyServerSpinner;
 
@@ -54,8 +54,6 @@ public class UploadKeyActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.upload_key_activity);
-
         mUploadButton = findViewById(R.id.upload_key_action_upload);
         mKeyServerSpinner = (Spinner) findViewById(R.id.upload_key_keyserver);
 
@@ -86,6 +84,11 @@ public class UploadKeyActivity extends ActionBarActivity {
         }
     }
 
+    @Override
+    protected int getLayoutResource() {
+        return R.layout.upload_key_activity;
+    }
+
     private void uploadKey() {
         // Send all information needed to service to upload key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);