Google OAuth: fix manifest merging so that intent-filter for OAuth callback is included again (#367)

app/build.gradle

@@ -60,9 +60,10 @@ android {
     // Java namespace for our classes (not to be confused with Android package ID)
     namespace 'at.bitfire.davdroid'
 
-    flavorDimensions "distribution"
+    flavorDimensions = [ "distribution" ]
     productFlavors {
         ose {
+            dimension "distribution"
             versionNameSuffix "-ose"
         }
     }

app/src/main/AndroidManifest.xml

@@ -64,9 +64,9 @@
 
         <service android:name=".ForegroundService"/>
 
-        <!-- Remove the node added by AppAuth -->
+        <!-- Remove the node added by AppAuth (remove only from net.openid.appauth library, not from our flavor manifest files) -->
         <activity android:name="net.openid.appauth.RedirectUriReceiverActivity"
-            tools:node="remove"/>
+            tools:node="remove" tools:selector="net.openid.appauth"/>
 
         <activity android:name=".ui.intro.IntroActivity" android:theme="@style/AppTheme.NoActionBar" />
         <activity

app/src/ose/AndroidManifest.xml

@@ -2,16 +2,14 @@
   ~ Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
         <!-- AppAuth login flow redirect -->
         <activity
             android:name="net.openid.appauth.RedirectUriReceiverActivity"
-            android:exported="true"
-            tools:node="replace">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>