From 583b427336d9ed16c6eaedb165bb3d0b4c2006a0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 22 Jan 2018 15:39:18 +0100
Subject: [PATCH] Upgrade to Java 8

---
 OpenKeychain/build.gradle                                     | 4 ++--
 .../keychain/ui/RetryUploadDialogActivity.java                | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index d5276364e..dd0d65569 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -167,8 +167,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     testOptions.unitTests.all {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
index 33c407477..f8f4fcfe9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RetryUploadDialogActivity.java
@@ -21,6 +21,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
@@ -74,7 +75,7 @@ public class RetryUploadDialogActivity extends FragmentActivity {
                 public void onClick(DialogInterface dialog, int which) {
                     Intent intent = new Intent();
                     intent.putExtra(RESULT_CRYPTO_INPUT, getActivity()
-                            .getIntent().getParcelableExtra(EXTRA_CRYPTO_INPUT));
+                            .getIntent().<Parcelable>getParcelableExtra(EXTRA_CRYPTO_INPUT));
                     getActivity().setResult(RESULT_OK, intent);
                     getActivity().finish();
                 }