added runtime permissions

commonsguy · Jan 7, 2017 · c3ef152 · c3ef152
1 parent df7977d
commit c3ef152
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 25 deletions.
diff --git a/Files/FilesEditor/app/build.gradle b/Files/FilesEditor/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile 'io.karim:materialtabs:2.0.2'
-    compile 'com.android.support:support-v13:22.2.1'
+    compile 'com.android.support:support-v13:25.1.0'
 }
 
 android {
-  compileSdkVersion 22
+  compileSdkVersion 25
-  buildToolsVersion "22.0.1"
+  buildToolsVersion "25.0.2"
 
 	defaultConfig {
       minSdkVersion 15
-      targetSdkVersion 18
+      targetSdkVersion 25
 	}
 }
diff --git a/Files/FilesEditor/app/src/main/AndroidManifest.xml b/Files/FilesEditor/app/src/main/AndroidManifest.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0"?>
 <manifest package="com.commonsware.android.fileseditor"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="1"
+  android:versionCode="1"
-          android:versionName="1.0">
+  android:versionName="1.0">
 
-  <uses-permission
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-    android:maxSdkVersion="18"/>
 
   <supports-screens
     android:anyDensity="true"
     android:largeScreens="true"
     android:normalScreens="true"
-    android:smallScreens="true"/>
+    android:smallScreens="true" />
 
   <application
     android:icon="@drawable/ic_launcher"
-    android:theme="@style/Theme.Apptheme"
+    android:label="@string/app_name"
-    android:label="@string/app_name">
+    android:theme="@style/Theme.Apptheme">
     <activity
       android:name=".MainActivity"
       android:label="@string/app_name">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
+        <action android:name="android.intent.action.MAIN" />
 
-        <category android:name="android.intent.category.LAUNCHER"/>
+        <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
   </application>

diff --git a/Files/FilesEditor/app/src/main/java/com/commonsware/android/fileseditor/MainActivity.java b/Files/FilesEditor/app/src/main/java/com/commonsware/android/fileseditor/MainActivity.java
@@ -1,5 +1,5 @@
 /***
-  Copyright (c) 2012-2015 CommonsWare, LLC
+  Copyright (c) 2012-2017 CommonsWare, LLC
   Licensed under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License. You may obtain a copy
   of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
@@ -14,15 +14,28 @@
 
 package com.commonsware.android.fileseditor;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+import android.widget.Toast;
 import io.karim.MaterialTabs;
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 
-public class MainActivity extends Activity  {
+public class MainActivity extends AbstractPermissionActivity  {
   @Override
-  public void onCreate(Bundle savedInstanceState) {
+  protected String[] getDesiredPermissions() {
-    super.onCreate(savedInstanceState);
+    return(new String[]{WRITE_EXTERNAL_STORAGE});
+  }
+
+  @Override
+  protected void onPermissionDenied() {
+    Toast
+      .makeText(this, R.string.msg_sorry, Toast.LENGTH_LONG)
+      .show();
+    finish();
+  }
+
+  @Override
+  protected void onReady(Bundle savedInstanceState) {
     setContentView(R.layout.main);
 
     ViewPager pager=(ViewPager)findViewById(R.id.pager);

diff --git a/Files/FilesEditor/app/src/main/java/com/commonsware/android/fileseditor/SampleAdapter.java b/Files/FilesEditor/app/src/main/java/com/commonsware/android/fileseditor/SampleAdapter.java
@@ -38,10 +38,6 @@ public SampleAdapter(Context ctxt, FragmentManager mgr) {
 
   @Override
   public int getCount() {
-    if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.KITKAT) {
-      return(2);
-    }
-
     return(3);
   }
 

diff --git a/Files/FilesEditor/app/src/main/res/values/strings.xml b/Files/FilesEditor/app/src/main/res/values/strings.xml
@@ -4,5 +4,6 @@
 	<string name="internal">Internal</string>
 	<string name="external">External</string>
 	<string name="pub">Public</string>
+	<string name="msg_sorry">Sorry, but we need permission to continue!</string>
 
 </resources>
diff --git a/Files/FilesEditor/build.gradle b/Files/FilesEditor/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files