removed unnecessary permission stuff

commonsguy · Mar 20, 2017 · 7987761 · 7987761
1 parent 06eb686
commit 7987761
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 156 deletions.
diff --git a/Camera/FileProvider/app/build.gradle b/Camera/FileProvider/app/build.gradle
@@ -18,6 +18,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-v13:25.1.0'
+    compile 'com.android.support:support-v13:25.3.0'
     compile 'com.commonsware.cwac:provider:0.5.0'
 }
diff --git a/Camera/FileProvider/app/src/main/AndroidManifest.xml b/Camera/FileProvider/app/src/main/AndroidManifest.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.commonsware.android.camcon"
-	android:versionCode="1"
-	android:versionName="1.0">
+<manifest package="com.commonsware.android.camcon"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:versionCode="1"
+  android:versionName="1.0">
 
-	<uses-permission android:name="android.permission.CAMERA" />
+  <uses-feature android:name="android.hardware.camera.any" />
 
-	<supports-screens
-		android:largeScreens="true"
-		android:normalScreens="true"
-		android:smallScreens="true"/>
+  <supports-screens
+    android:largeScreens="true"
+    android:normalScreens="true"
+    android:smallScreens="true" />
 
-	<application
-		android:icon="@drawable/ic_launcher"
-		android:label="@string/app_name">
-		<activity
-			android:name=".MainActivity"
-			android:label="@string/app_name"
-			android:theme="@android:style/Theme.Translucent.NoTitleBar">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
+  <application
+    android:icon="@drawable/ic_launcher"
+    android:label="@string/app_name">
+    <activity
+      android:name=".MainActivity"
+      android:label="@string/app_name"
+      android:theme="@android:style/Theme.Translucent.NoTitleBar">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
 
-				<category android:name="android.intent.category.LAUNCHER"/>
-			</intent-filter>
-		</activity>
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
 
-		<provider
-			android:name="LegacyCompatFileProvider"
-			android:authorities="${applicationId}.provider"
-			android:exported="false"
-			android:grantUriPermissions="true">
-			<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/provider_paths"/>
-		</provider>
-	</application>
+    <provider
+      android:name="LegacyCompatFileProvider"
+      android:authorities="${applicationId}.provider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/provider_paths" />
+    </provider>
+  </application>
 
 </manifest>
diff --git a/...Provider/app/src/main/java/com/commonsware/android/camcon/AbstractPermissionActivity.java b/...Provider/app/src/main/java/com/commonsware/android/camcon/AbstractPermissionActivity.java
diff --git a/Camera/FileProvider/app/src/main/java/com/commonsware/android/camcon/MainActivity.java b/Camera/FileProvider/app/src/main/java/com/commonsware/android/camcon/MainActivity.java
@@ -15,6 +15,7 @@
 package com.commonsware.android.camcon;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.Intent;
@@ -29,7 +30,7 @@
 import java.io.File;
 import java.util.List;
 
-public class MainActivity extends AbstractPermissionActivity {
+public class MainActivity extends Activity {
   private static final String EXTRA_FILENAME=
     "com.commonsware.android.camcon.EXTRA_FILENAME";
   private static final String FILENAME="CameraContentDemo.jpeg";
@@ -40,20 +41,9 @@ public class MainActivity extends AbstractPermissionActivity {
   private File output=null;
 
   @Override
-  protected String[] getDesiredPermissions() {
-    return(new String[] {Manifest.permission.CAMERA});
-  }
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
 
-  @Override
-  protected void onPermissionDenied() {
-    Toast
-      .makeText(this, R.string.msg_sorry, Toast.LENGTH_LONG)
-      .show();
-    finish();
-  }
-
-  @Override
-  protected void onReady(Bundle savedInstanceState) {
     if (savedInstanceState==null) {
       output=new File(new File(getFilesDir(), PHOTOS), FILENAME);
 

diff --git a/Camera/FileProvider/build.gradle b/Camera/FileProvider/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Camera/FileProvider/gradle/wrapper/gradle-wrapper.properties b/Camera/FileProvider/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun May 01 08:50:39 EDT 2016
+#Sat Mar 18 18:22:38 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip