mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Compile SDK 26, updated Firebase" 

This reverts commit 8043bc160f.
This commit is contained in:
M66B 2017-06-10 16:05:37 +02:00
parent 8043bc160f
commit 782de172ce
3 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/app.iml
View File

@ -50,13 +50,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
@ -65,6 +58,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/all/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
@ -146,33 +146,32 @@
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-core-ui-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="support-fragment-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-11.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="firebase-ads-11.0.0" level="project" />
<orderEntry type="library" exported="" name="firebase-iid-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-base-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-11.0.0" level="project" />
<orderEntry type="library" exported="" name="firebase-core-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-11.0.0" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-11.0.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="play-services-safetynet-11.0.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-11.0.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-impl-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-11.0.0" level="project" />
<orderEntry type="library" exported="" name="support-compat-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-26.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="firebase-common-11.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-10.2.6" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-10.2.6" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
<orderEntry type="library" exported="" name="firebase-iid-10.2.6" level="project" />
<orderEntry type="library" exported="" name="play-services-base-10.2.6" level="project" />
<orderEntry type="library" exported="" name="firebase-core-10.2.6" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-10.2.6" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-10.2.6" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.6" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-10.2.6" level="project" />
<orderEntry type="library" exported="" name="firebase-common-10.2.6" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-10.2.6" level="project" />
<orderEntry type="library" exported="" name="firebase-ads-10.2.6" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-10.2.6" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
</component>
</module>

13
app/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.model.application'
model {
android {
compileSdkVersion = 26
compileSdkVersion = 25
buildToolsVersion = "26.0.0"
defaultConfig {
@ -82,14 +82,11 @@ model {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:26.0.+'
compile 'com.android.support:recyclerview-v7:26.0.+'
compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:recyclerview-v7:25.+'
compile 'com.squareup.picasso:picasso:2.5.+'
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-ads:11.0.+'
// https://developer.android.com/topic/libraries/support-library/revisions.html
// https://mvnrepository.com/artifact/com.squareup.picasso/picasso
// https://firebase.google.com/docs/android/setup
compile 'com.google.firebase:firebase-core:10.2.+'
compile 'com.google.firebase:firebase-ads:10.2.+'
}
apply plugin: 'com.google.gms.google-services'

2
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -275,7 +275,7 @@ public class Util {
public static List<String> getDefaultDNS(Context context) {
String dns1 = null;
String dns2 = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Network an = cm.getActiveNetwork();
if (an != null) {