Parametrized namespace

This commit is contained in:
M66B 2022-11-22 15:27:57 +01:00
parent 6058706825
commit cd977705db
6 changed files with 17 additions and 60 deletions

View File

@ -28,6 +28,8 @@ android {
versionName "1." + getVersionCode() versionName "1." + getVersionCode()
archivesBaseName = "FairEmail-v$versionName" + getRevision() archivesBaseName = "FairEmail-v$versionName" + getRevision()
manifestPlaceholders = [namespace: applicationId.replace('.debug', '')]
buildConfigField "String", "REVISION", "\"" + getRevision() + "\"" buildConfigField "String", "REVISION", "\"" + getRevision() + "\""
buildConfigField "String", "RELEASE_NAME", "\"" + getReleaseName() + "\"" buildConfigField "String", "RELEASE_NAME", "\"" + getReleaseName() + "\""

View File

@ -255,7 +255,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="eu.faircode.email.search" /> <data android:scheme="${namespace}.search" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -469,16 +469,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email" /> <data android:scheme="${namespace}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email.debug" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -489,7 +480,7 @@
<data <data
android:host="auth" android:host="auth"
android:scheme="msauth.eu.faircode.email" /> android:scheme="msauth.${namespace}" />
</intent-filter> </intent-filter>
</activity> </activity>

View File

@ -261,7 +261,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="eu.faircode.email.search" /> <data android:scheme="${namespace}.search" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -475,16 +475,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email" /> <data android:scheme="${namespace}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email.debug" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -495,7 +486,7 @@
<data <data
android:host="auth" android:host="auth"
android:scheme="msauth.eu.faircode.email" /> android:scheme="msauth.${namespace}" />
</intent-filter> </intent-filter>
</activity> </activity>

View File

@ -261,7 +261,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="eu.faircode.email.search" /> <data android:scheme="${namespace}.search" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -475,16 +475,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email" /> <data android:scheme="${namespace}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email.debug" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -495,7 +486,7 @@
<data <data
android:host="auth" android:host="auth"
android:scheme="msauth.eu.faircode.email" /> android:scheme="msauth.${namespace}" />
</intent-filter> </intent-filter>
</activity> </activity>

View File

@ -254,7 +254,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="eu.faircode.email.search" /> <data android:scheme="${namespace}.search" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -467,16 +467,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email" /> <data android:scheme="${namespace}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email.debug" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -487,7 +478,7 @@
<data <data
android:host="auth" android:host="auth"
android:scheme="msauth.eu.faircode.email" /> android:scheme="msauth.${namespace}" />
</intent-filter> </intent-filter>
</activity> </activity>

View File

@ -255,7 +255,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="eu.faircode.email.search" /> <data android:scheme="${namespace}.search" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -469,16 +469,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email" /> <data android:scheme="${namespace}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="eu.faircode.email.debug" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@ -489,7 +480,7 @@
<data <data
android:host="auth" android:host="auth"
android:scheme="msauth.eu.faircode.email" /> android:scheme="msauth.${namespace}" />
</intent-filter> </intent-filter>
</activity> </activity>