Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.

Commit d0e9df5

Browse files
abs51295abs51295
committed
fix: fixes runtime permissions
1 parent 3f791c4 commit d0e9df5

File tree

10 files changed

+555
-244
lines changed

10 files changed

+555
-244
lines changed

‎app/app.iml

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -45,70 +44,87 @@
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5653
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5754
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5855
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6359
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6460
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6561
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7065
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7166
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7267
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7368
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7469
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7570
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7771
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7872
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.paolorotolo/appintro/1.4.0/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.5/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.5/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.3.1/jars" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.3.1/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.3.1/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.3.1/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.3.1/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.3.1/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.3.1/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.3.1/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.3.1/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.3.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.3.1/jars" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
9595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
98+
<excludeFolder url="jar://$MODULE_DIR$/build/intermediates/mockable-android-25.jar!/" />
10099
</content>
101-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
100+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
102101
<orderEntry type="sourceFolder" forTests="false" />
103-
<orderEntry type="library" exported="" name="appintro-1.4.0" level="project" />
104-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-23" level="project" />
105-
<orderEntry type="library" exported="" name="design-23.4.0" level="project" />
106-
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
107-
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
108-
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
109-
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
110-
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
111-
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
112-
<orderEntry type="library" exported="" name="android-android-23" level="project" />
102+
<orderEntry type="library" exported="" name="runner-0.5" level="project" />
103+
<orderEntry type="library" exported="" name="espresso-idling-resource-2.2.2" level="project" />
104+
<orderEntry type="library" exported="" name="hamcrest-library-1.3" level="project" />
105+
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
106+
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-25" level="project" />
107+
<orderEntry type="library" exported="" name="hamcrest-integration-1.3" level="project" />
108+
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
109+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
110+
<orderEntry type="library" exported="" name="jsr305-2.0.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
113+
<orderEntry type="library" exported="" name="espresso-core-2.2.2" level="project" />
114+
<orderEntry type="library" exported="" name="exposed-instrumentation-api-publish-0.5" level="project" />
115+
<orderEntry type="library" exported="" name="rules-0.5" level="project" />
116+
<orderEntry type="library" exported="" name="javax.annotation-api-1.2" level="project" />
117+
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
118+
<orderEntry type="library" exported="" name="javawriter-2.1.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
121+
<orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
122+
<orderEntry type="library" exported="" name="junit-4.12" level="project" />
123+
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
124+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
125+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
127+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
128+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
113129
</component>
114130
</module>

‎app/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.3'
66

77
defaultConfig {
88
applicationId "com.peacecorps.pcsa"
99
minSdkVersion 11
10-
targetSdkVersion 22
10+
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -31,9 +31,6 @@ dependencies {
3131
compile 'com.android.support:appcompat-v7:23.4.0'
3232
compile 'com.android.support:design:23.4.0'
3333
compile 'com.android.support:support-v4:23.4.0'
34-
35-
36-
3734
compile 'com.android.support.test.espresso:espresso-core:2.2.2'
3835
compile 'com.android.support.test:runner:0.5'
3936
}

‎app/src/main/java/com/peacecorps/pcsa/Constants.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44
* Stores all the constants used in the project.
55
*/
66
public class Constants {
7+
public static final String TAG_LOCATION = "#LOC#";
8+
public static final String TAG_LOCATION_URL = "#LOC_URL#";
9+
public static final String LOCATION_URL = "http://maps.google.com/?q=LAT,LON";
10+
711
public static final class SmsConstants {
812
public static final String COME_GET_ME = "Come get me";
913
public static final String CALL_NEED_INTERRUPTION = "Call I need an interruption";
1014
public static final String NEED_TO_TALK = "I need to talk";
1115
public static final String SMS_REPORT = "SMS report";
1216
}
1317

14-
public static final String TAG_LOCATION = "#LOC#";
15-
public static final String TAG_LOCATION_URL = "#LOC_URL#";
16-
public static final String LOCATION_URL = "http://maps.google.com/?q=LAT,LON";
18+
public static final class PermissionConstants {
19+
public static final int PERMISSION_CALLBACK = 100;
20+
}
1721
}

0 commit comments

Comments
 (0)