Simplify API key loading

cryptomator · Oct 13, 2023 · 12311bf · 12311bf
1 parent 6db3a72
commit 12311bf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -53,3 +53,20 @@ allprojects {
 task clean(type: Delete) {
 	delete rootProject.buildDir
 }
+
+def getApiKey(key) {
+	return !liteFlavor() ? System.getenv().getOrDefault(key, getApiKeyLocal(key)) : ""
+}
+
+def liteFlavor() {
+	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
+}
+
+def getApiKeyLocal(key) {
+	if(!rootProject.file("local.properties").exists()) {
+		return ""
+	}
+	def localPropertyList = new Properties()
+	localPropertyList.load(new FileInputStream(rootProject.file("local.properties")))
+	return localPropertyList.getOrDefault(key, "")
+}
diff --git a/data/build.gradle b/data/build.gradle
@@ -224,14 +224,6 @@ configurations {
 	all*.exclude group: 'com.google.android', module: 'android'
 }
 
-def liteFlavor() {
-	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
-}
-
-def getApiKey(key) {
-	return !liteFlavor() ? System.getenv().getOrDefault(key, "") : ""
-}
-
 tasks.withType(Test) {
 	testLogging {
 		events "failed"

diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -274,19 +274,6 @@ def liteFlavor() {
 	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
 }
 
-def getApiKey(key) {
-	return !liteFlavor() ? System.getenv().getOrDefault(key, getApiKeyLocal(key)) : ""
-}
-
-def getApiKeyLocal(key) {
-	if(!rootProject.file("local.properties").exists()) {
-		return ""
-	}
-	def localPropertyList = new Properties()
-	localPropertyList.load(new FileInputStream(rootProject.file("local.properties")))
-	return localPropertyList.getOrDefault(key, "")
-}
-
 def getOnedriveApiKey() {
 	if (liteFlavor()) {
 		return ""

diff --git a/presentation/prebuild.gradle b/presentation/prebuild.gradle
@@ -29,8 +29,4 @@ task generateAppConfigurationFile() {
 	config_file.write(JsonOutput.prettyPrint(JsonOutput.toJson(jsonSlurper.parseText(jsonString))))
 }
 
-static def getApiKey(key) {
-	return System.getenv().getOrDefault(key, "")
-}
-
 build.dependsOn generateAppConfigurationFile