From c5ecc1a8876317219836edcb7428d93ec81ead22 Mon Sep 17 00:00:00 2001 From: Arno Welzel Date: Tue, 20 Dec 2016 05:09:56 +0100 Subject: [PATCH] Added annotations for onRequestPermissionsResult(), changed minimum API to level 9 (Android 2.3.3) and target to API level 25 (Android 7.1.1). --- app/build.gradle | 13 ++++++++----- .../arnowelzel/android/periodical/MainActivity.java | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3bb95519..cef8eb00 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { applicationId "de.arnowelzel.android.periodical" - minSdkVersion 8 - targetSdkVersion 23 + minSdkVersion 9 + targetSdkVersion 25 versionCode 30 versionName "0.30" } @@ -23,8 +23,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + return void } dependencies { - compile 'com.android.support:support-v4:23.4.0' + compile 'com.android.support:support-v4:25.1.0' + compile 'com.android.support:support-annotations:25.1.0' } diff --git a/app/src/main/java/de/arnowelzel/android/periodical/MainActivity.java b/app/src/main/java/de/arnowelzel/android/periodical/MainActivity.java index 1ab77ba4..e3ccd5fa 100644 --- a/app/src/main/java/de/arnowelzel/android/periodical/MainActivity.java +++ b/app/src/main/java/de/arnowelzel/android/periodical/MainActivity.java @@ -43,6 +43,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ViewFlipper; +import android.support.annotation.NonNull; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -450,7 +451,7 @@ public void onClick(DialogInterface dialog, int which) { * Handle permission request */ @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { final Context context = getApplicationContext(); // If the requested permission was granted by the user,