From 3580eac0536bcf4fccbc6e1b6c6360b2971216ef Mon Sep 17 00:00:00 2001 From: cenochallenge Date: Tue, 29 Nov 2022 20:38:36 +0100 Subject: [PATCH] Provide default values for Ouinet so the projects can build Java project builds but does not work --- android/java/app/build.gradle | 10 +++++----- android/java/ouinet.default.properties | 19 +++++++++++++++++++ android/kotlin/app/build.gradle | 10 +++++----- android/kotlin/ouinet.default.properties | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 android/java/ouinet.default.properties create mode 100644 android/kotlin/ouinet.default.properties diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 6b3df85..0214dd9 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -2,8 +2,8 @@ plugins { id 'com.android.application' } -Properties localProperties = new Properties() -localProperties.load(rootProject.file('local.properties').newDataInputStream()) +Properties defaultOuinetProperties = new Properties() +defaultOuinetProperties.load(rootProject.file('ouinet.default.properties').newDataInputStream()) android { compileSdk 32 @@ -17,9 +17,9 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - buildConfigField "String", "CACHE_PUB_KEY", localProperties['CACHE_PUB_KEY'] - buildConfigField "String", "INJECTOR_CREDENTIALS", localProperties['INJECTOR_CREDENTIALS'] - buildConfigField "String", "INJECTOR_TLS_CERT", localProperties['INJECTOR_TLS_CERT'] + buildConfigField "String", "CACHE_PUB_KEY", defaultOuinetProperties['CACHE_PUB_KEY'] + buildConfigField "String", "INJECTOR_CREDENTIALS", defaultOuinetProperties['INJECTOR_CREDENTIALS'] + buildConfigField "String", "INJECTOR_TLS_CERT", defaultOuinetProperties['INJECTOR_TLS_CERT'] } buildTypes { diff --git a/android/java/ouinet.default.properties b/android/java/ouinet.default.properties new file mode 100644 index 0000000..becbed3 --- /dev/null +++ b/android/java/ouinet.default.properties @@ -0,0 +1,19 @@ +CACHE_PUB_KEY="zh6ylt6dghu6swhhje2j66icmjnonv53tstxxvj6acu64sc62fnq" +INJECTOR_CREDENTIALS="ouinet:160d79874a52c2cbcdec58db1a8160a9" +INJECTOR_TLS_CERT="-----BEGIN CERTIFICATE-----\\n\ +MIICyTCCAbGgAwIBAgIGAWwvE3jIMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNVBAMM\ +CWxvY2FsaG9zdDAeFw0xOTA3MjQxNjE4MjFaFw0zNDA3MjIxNjE4MjFaMBQxEjAQ\ +BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\ +AOQ6tX1fh1JQJGMEpgEaqFdVpl2Jz39s+3pFJAHRQMxvQa1a4pGwlc4smrhh8Y2Z\ +Kli8zhIzFPATZ3ipdBwnLBBUnDqpZWEqsKdBGGJghM+8EitXJwtSWjR2qqZcz3Xz\ +60MKt2S2IeL6L3/HtHM1bN93Xo3hQK/WYDQ6BEeLd6JSsns1mwwccTStu/kc3Y2E\ +IXPh1otQ624QXb9szIdwQw7vzi0saXONdaFFbpRyoa6KKCEC7iHHfUbEhCSRpL8Y\ +Mrl5z9mKqA8y+5tl3jzTHRtYE4SVG60pmd9nMQ33ue8m5ADq5Bd8Jg2qOmmg0KNF\ +V1RHB3pljMGco6eP9zmb3jsCAwEAAaMhMB8wHQYDVR0OBBYEFMCGT2KEmo4kM08C\ +E/rv/BbnmVfnMA0GCSqGSIb3DQEBCwUAA4IBAQBWxR7x1vADpkpVRzNxicLgd0CY\ +itmhEWtRQp9kE33O5BjRlHQ5TTA0WBp8Nc3c5ZZ1qAnQx3tXVZ7W1QY2XjiQpsPE\ +hFcPsAtFLP+kpDEFPi39iFv4gunR4M1zReCDTGTJ48bLtqONZ9XgJ7obW8r+TjuJ\ +yI/i11NWUwKldg0NevF1Bkddbhpt7PJHUpSSbwr3GJOKHfRw9ZaX6P86MVcJd0Ta\ +AzZPXqk+2eab43GbbD6keXRGIufMThKGyrRX+9aIaV3tx3uWAOfWVmlzf9w3gV3D\ +lmjPSOXmUsOLk0PFwoy7O7n9zJKNrUy1N2O+j0tH5HVXOnSjpS8aNrMtpfHS\ +\\n-----END CERTIFICATE-----" diff --git a/android/kotlin/app/build.gradle b/android/kotlin/app/build.gradle index 964f0bb..8da99a7 100644 --- a/android/kotlin/app/build.gradle +++ b/android/kotlin/app/build.gradle @@ -3,8 +3,8 @@ plugins { id 'kotlin-android' } -Properties localProperties = new Properties() -localProperties.load(rootProject.file('local.properties').newDataInputStream()) +Properties defaultOuinetProperties = new Properties() +defaultOuinetProperties.load(rootProject.file('ouinet.default.properties').newDataInputStream()) android { compileSdk 32 @@ -18,9 +18,9 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - buildConfigField "String", "CACHE_PUB_KEY", localProperties['CACHE_PUB_KEY'] - buildConfigField "String", "INJECTOR_CREDENTIALS", localProperties['INJECTOR_CREDENTIALS'] - buildConfigField "String", "INJECTOR_TLS_CERT", localProperties['INJECTOR_TLS_CERT'] + buildConfigField "String", "CACHE_PUB_KEY", defaultOuinetProperties['CACHE_PUB_KEY'] + buildConfigField "String", "INJECTOR_CREDENTIALS", defaultOuinetProperties['INJECTOR_CREDENTIALS'] + buildConfigField "String", "INJECTOR_TLS_CERT", defaultOuinetProperties['INJECTOR_TLS_CERT'] } buildTypes { diff --git a/android/kotlin/ouinet.default.properties b/android/kotlin/ouinet.default.properties new file mode 100644 index 0000000..becbed3 --- /dev/null +++ b/android/kotlin/ouinet.default.properties @@ -0,0 +1,19 @@ +CACHE_PUB_KEY="zh6ylt6dghu6swhhje2j66icmjnonv53tstxxvj6acu64sc62fnq" +INJECTOR_CREDENTIALS="ouinet:160d79874a52c2cbcdec58db1a8160a9" +INJECTOR_TLS_CERT="-----BEGIN CERTIFICATE-----\\n\ +MIICyTCCAbGgAwIBAgIGAWwvE3jIMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNVBAMM\ +CWxvY2FsaG9zdDAeFw0xOTA3MjQxNjE4MjFaFw0zNDA3MjIxNjE4MjFaMBQxEjAQ\ +BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\ +AOQ6tX1fh1JQJGMEpgEaqFdVpl2Jz39s+3pFJAHRQMxvQa1a4pGwlc4smrhh8Y2Z\ +Kli8zhIzFPATZ3ipdBwnLBBUnDqpZWEqsKdBGGJghM+8EitXJwtSWjR2qqZcz3Xz\ +60MKt2S2IeL6L3/HtHM1bN93Xo3hQK/WYDQ6BEeLd6JSsns1mwwccTStu/kc3Y2E\ +IXPh1otQ624QXb9szIdwQw7vzi0saXONdaFFbpRyoa6KKCEC7iHHfUbEhCSRpL8Y\ +Mrl5z9mKqA8y+5tl3jzTHRtYE4SVG60pmd9nMQ33ue8m5ADq5Bd8Jg2qOmmg0KNF\ +V1RHB3pljMGco6eP9zmb3jsCAwEAAaMhMB8wHQYDVR0OBBYEFMCGT2KEmo4kM08C\ +E/rv/BbnmVfnMA0GCSqGSIb3DQEBCwUAA4IBAQBWxR7x1vADpkpVRzNxicLgd0CY\ +itmhEWtRQp9kE33O5BjRlHQ5TTA0WBp8Nc3c5ZZ1qAnQx3tXVZ7W1QY2XjiQpsPE\ +hFcPsAtFLP+kpDEFPi39iFv4gunR4M1zReCDTGTJ48bLtqONZ9XgJ7obW8r+TjuJ\ +yI/i11NWUwKldg0NevF1Bkddbhpt7PJHUpSSbwr3GJOKHfRw9ZaX6P86MVcJd0Ta\ +AzZPXqk+2eab43GbbD6keXRGIufMThKGyrRX+9aIaV3tx3uWAOfWVmlzf9w3gV3D\ +lmjPSOXmUsOLk0PFwoy7O7n9zJKNrUy1N2O+j0tH5HVXOnSjpS8aNrMtpfHS\ +\\n-----END CERTIFICATE-----"