Commit 62cefe9d authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Allow user-added CA certificates in API >= 24 (fixes #14)

parent cba50d81

app/src/main/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="net.fabiszewski.ulogger">



    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -34,7 +35,9 @@ 
        android:icon="@mipmap/ic_launcher"

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/AppTheme">

        android:theme="@style/AppTheme"

        android:networkSecurityConfig="@xml/network_security_config"

        tools:ignore="UnusedAttribute">

        <activity android:name=".MainActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

app/src/main/res/xml/network_security_config.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (c) 2017 Bartek Fabiszewski

  ~ http://www.fabiszewski.net

  ~

  ~ This file is part of μlogger-android.

  ~ Licensed under GPL, either version 3, or any later.

  ~ See <http://www.gnu.org/licenses/>

  -->



<network-security-config>

    <base-config cleartextTrafficPermitted="true">

        <trust-anchors>

            <certificates src="system" />

            <certificates src="user" />

        </trust-anchors>

    </base-config>

</network-security-config>
 
 No newline at end of file