Provide default values for Ouinet so the projects can build

Java project builds but does not work
This commit is contained in:
ceno challenge 2022-11-29 20:38:36 +01:00
parent 401338d566
commit 3580eac053
4 changed files with 48 additions and 10 deletions

View File

@ -2,8 +2,8 @@ plugins {
id 'com.android.application' id 'com.android.application'
} }
Properties localProperties = new Properties() Properties defaultOuinetProperties = new Properties()
localProperties.load(rootProject.file('local.properties').newDataInputStream()) defaultOuinetProperties.load(rootProject.file('ouinet.default.properties').newDataInputStream())
android { android {
compileSdk 32 compileSdk 32
@ -17,9 +17,9 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "CACHE_PUB_KEY", localProperties['CACHE_PUB_KEY'] buildConfigField "String", "CACHE_PUB_KEY", defaultOuinetProperties['CACHE_PUB_KEY']
buildConfigField "String", "INJECTOR_CREDENTIALS", localProperties['INJECTOR_CREDENTIALS'] buildConfigField "String", "INJECTOR_CREDENTIALS", defaultOuinetProperties['INJECTOR_CREDENTIALS']
buildConfigField "String", "INJECTOR_TLS_CERT", localProperties['INJECTOR_TLS_CERT'] buildConfigField "String", "INJECTOR_TLS_CERT", defaultOuinetProperties['INJECTOR_TLS_CERT']
} }
buildTypes { buildTypes {

View File

@ -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-----"

View File

@ -3,8 +3,8 @@ plugins {
id 'kotlin-android' id 'kotlin-android'
} }
Properties localProperties = new Properties() Properties defaultOuinetProperties = new Properties()
localProperties.load(rootProject.file('local.properties').newDataInputStream()) defaultOuinetProperties.load(rootProject.file('ouinet.default.properties').newDataInputStream())
android { android {
compileSdk 32 compileSdk 32
@ -18,9 +18,9 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "CACHE_PUB_KEY", localProperties['CACHE_PUB_KEY'] buildConfigField "String", "CACHE_PUB_KEY", defaultOuinetProperties['CACHE_PUB_KEY']
buildConfigField "String", "INJECTOR_CREDENTIALS", localProperties['INJECTOR_CREDENTIALS'] buildConfigField "String", "INJECTOR_CREDENTIALS", defaultOuinetProperties['INJECTOR_CREDENTIALS']
buildConfigField "String", "INJECTOR_TLS_CERT", localProperties['INJECTOR_TLS_CERT'] buildConfigField "String", "INJECTOR_TLS_CERT", defaultOuinetProperties['INJECTOR_TLS_CERT']
} }
buildTypes { buildTypes {

View File

@ -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-----"