summaryrefslogtreecommitdiff
path: root/bitmask_android
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-09 01:41:35 +0200
committerParménides GV <parmegv@sdf.org>2014-04-09 01:41:35 +0200
commitc12319eb8ff27f41ae577aee19fd341d6191c3d7 (patch)
treed17a55f138db498964825c70be8366ce2857783b /bitmask_android
parenta097a3388137d6553dcf934d0cee49a876a688eb (diff)
Debug url files + Debug permissions
Diffstat (limited to 'bitmask_android')
-rw-r--r--bitmask_android/build.gradle6
-rw-r--r--bitmask_android/src/debug/AndroidManifest.xml27
-rw-r--r--bitmask_android/src/debug/assets/urls/cdev.bitmask.net.url3
-rw-r--r--bitmask_android/src/debug/assets/urls/dev.bitmask.net.url3
-rw-r--r--bitmask_android/src/main/AndroidManifest.xml7
5 files changed, 37 insertions, 9 deletions
diff --git a/bitmask_android/build.gradle b/bitmask_android/build.gradle
index 07ec7c1d..879a007d 100644
--- a/bitmask_android/build.gradle
+++ b/bitmask_android/build.gradle
@@ -45,11 +45,13 @@ android {
}
sourceSets {
- main
- {
+ main {
assets.srcDirs = ['assets', 'ovpnlibs/assets']
jniLibs.srcDirs = ['ovpnlibs/jniLibs']
jni.srcDirs = [] //disable automatic ndk-build
+ }
+ debug {
+ assets.srcDirs = ['src/debug/assets']
}
}
}
diff --git a/bitmask_android/src/debug/AndroidManifest.xml b/bitmask_android/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000..4c648a5f
--- /dev/null
+++ b/bitmask_android/src/debug/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2011 The Android Open Source Project
+
+ 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 by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- if you want to run test, this permissions are needed. Gradle will get rid of them once we implement it. -->
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
+</manifest>
diff --git a/bitmask_android/src/debug/assets/urls/cdev.bitmask.net.url b/bitmask_android/src/debug/assets/urls/cdev.bitmask.net.url
new file mode 100644
index 00000000..4ceca5ee
--- /dev/null
+++ b/bitmask_android/src/debug/assets/urls/cdev.bitmask.net.url
@@ -0,0 +1,3 @@
+{
+ "main_url" : "https://cdev.bitmask.net/"
+} \ No newline at end of file
diff --git a/bitmask_android/src/debug/assets/urls/dev.bitmask.net.url b/bitmask_android/src/debug/assets/urls/dev.bitmask.net.url
new file mode 100644
index 00000000..a1e53f69
--- /dev/null
+++ b/bitmask_android/src/debug/assets/urls/dev.bitmask.net.url
@@ -0,0 +1,3 @@
+{
+ "main_url" : "https://dev.bitmask.net/"
+} \ No newline at end of file
diff --git a/bitmask_android/src/main/AndroidManifest.xml b/bitmask_android/src/main/AndroidManifest.xml
index c1f13ba6..b2366b82 100644
--- a/bitmask_android/src/main/AndroidManifest.xml
+++ b/bitmask_android/src/main/AndroidManifest.xml
@@ -23,13 +23,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <!-- if you want to run test, this permissions are needed. Gradle will get rid of them once we implement it. -->
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
<uses-sdk