Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Felix Foertsch
Luca Android
Commits
be064e43
Unverified
Commit
be064e43
authored
Nov 05, 2021
by
Felix Förtsch
Browse files
remove validations, add route, add data source
parent
c9bb4068
Pipeline
#50522
failed with stage
Changes
14
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Luca/.idea/dataSources.local.xml
0 → 100644
View file @
be064e43
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"dataSourceStorageLocal"
created-in=
"IU-212.5457.46"
>
<data-source
name=
"luca-backend@localhost"
uuid=
"6ae6de39-aa48-40a3-b694-0b4d322029c0"
>
<database-info
product=
"PostgreSQL"
version=
"11.9"
jdbc-version=
"4.2"
driver-name=
"PostgreSQL JDBC Driver"
driver-version=
"42.2.22"
dbms=
"POSTGRES"
exact-version=
"11.9"
exact-driver-version=
"42.2"
>
<identifier-quote-string>
"
</identifier-quote-string>
</database-info>
<case-sensitivity
plain-identifiers=
"lower"
quoted-identifiers=
"exact"
/>
<secret-storage>
master_key
</secret-storage>
<user-name>
luca
</user-name>
<schema-mapping>
<introspection-scope>
<node
kind=
"database"
qname=
"@"
>
<node
kind=
"schema"
qname=
"@"
/>
</node>
</introspection-scope>
</schema-mapping>
</data-source>
</component>
</project>
\ No newline at end of file
Luca/.idea/dataSources.xml
0 → 100644
View file @
be064e43
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"DataSourceManagerImpl"
format=
"xml"
multifile-model=
"true"
>
<data-source
source=
"LOCAL"
name=
"luca-backend@localhost"
uuid=
"6ae6de39-aa48-40a3-b694-0b4d322029c0"
>
<driver-ref>
postgresql
</driver-ref>
<synchronize>
true
</synchronize>
<jdbc-driver>
org.postgresql.Driver
</jdbc-driver>
<jdbc-url>
jdbc:postgresql://localhost:5432/luca-backend
</jdbc-url>
<working-dir>
$ProjectFileDir$
</working-dir>
</data-source>
</component>
</project>
\ No newline at end of file
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0.xml
0 → 100644
View file @
be064e43
This diff is collapsed.
Click to expand it.
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0/storage_v2/_src_/database/luca-backend.bi6vHw.meta
0 → 100644
View file @
be064e43
#n:luca-backend
\ No newline at end of file
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0/storage_v2/_src_/database/luca-backend.bi6vHw/schema/information_schema.FNRwLQ.meta
0 → 100644
View file @
be064e43
#n:information_schema
!<md> [null, 0, null, null, -2147483648, -2147483648]
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0/storage_v2/_src_/database/luca-backend.bi6vHw/schema/pg_catalog.0S1ZNQ.meta
0 → 100644
View file @
be064e43
#n:pg_catalog
!<md> [null, 0, null, null, -2147483648, -2147483648]
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0/storage_v2/_src_/database/luca-backend.bi6vHw/schema/public.abK9xQ.meta
0 → 100644
View file @
be064e43
#n:public
!<md> [725, 0, null, null, -2147483648, -2147483648]
Luca/.idea/dataSources/6ae6de39-aa48-40a3-b694-0b4d322029c0/storage_v2/_src_/database/luca-backend.bi6vHw/schema/public.abK9xQ.zip
0 → 100644
View file @
be064e43
File added
Luca/.idea/misc.xml
View file @
be064e43
...
...
@@ -21,6 +21,9 @@
</map>
</option>
</component>
<component
name=
"FrameworkDetectionExcludesConfiguration"
>
<file
type=
"web"
url=
"file://$PROJECT_DIR$"
/>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
default=
"true"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
...
...
Luca/app/build.gradle
View file @
be064e43
...
...
@@ -38,7 +38,7 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android-optimize.txt'
),
'proguard-rules.pro'
signingConfig
signingConfigs
.
culture4life
matchingFallbacks
=
[
'release'
]
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http://10.0.2.2
:8080
"'
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http
s
://10.0.2.2"'
buildConfigField
"String"
,
"STAGING_API_USERNAME"
,
'""'
buildConfigField
"String"
,
"STAGING_API_PASSWORD"
,
'""'
buildConfigField
"String"
,
"COMMIT_HASH"
,
project
.
getProperties
().
getOrDefault
(
"COMMIT_HASH"
,
'"<commit hash>"'
)
...
...
@@ -46,11 +46,11 @@ android {
debug
{
debuggable
true
minifyEnabled
false
versionNameSuffix
" De
bug
"
versionNameSuffix
" De
v
"
applicationIdSuffix
".dev"
signingConfig
signingConfigs
.
debug
matchingFallbacks
=
[
'debug'
]
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http://10.0.2.2
:8001
"'
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http
s
://10.0.2.2"'
buildConfigField
"String"
,
"STAGING_API_USERNAME"
,
project
.
getProperties
().
getOrDefault
(
"STAGING_API_USERNAME"
,
'"<staging username>"'
)
buildConfigField
"String"
,
"STAGING_API_PASSWORD"
,
project
.
getProperties
().
getOrDefault
(
"STAGING_API_PASSWORD"
,
'"<staging password>"'
)
buildConfigField
"String"
,
"COMMIT_HASH"
,
project
.
getProperties
().
getOrDefault
(
"COMMIT_HASH"
,
'"<commit hash>"'
)
...
...
@@ -59,7 +59,7 @@ android {
initWith
debug
versionNameSuffix
" QS"
applicationIdSuffix
".qs"
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http://10.0.2.2
:8080
"'
buildConfigField
"String"
,
"API_BASE_URL"
,
'"http
s
://10.0.2.2"'
}
aqs
{
initWith
debug
...
...
Luca/app/src/debug/res/raw/ca_root.pem
deleted
100644 → 0
View file @
c9bb4068
-----BEGIN CERTIFICATE-----
MIIFijCCA3KgAwIBAgIUfDWvAnDw7TMLP8uueuGo8Y4FT/kwDQYJKoZIhvcNAQEN
BQAwXTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
bGluMREwDwYDVQQKEwhsdWNhIERldjEZMBcGA1UEAxMQbHVjYSBEZXYgUm9vdCBD
QTAeFw0yMTEwMjAxMjE3MDBaFw0yNjEwMTkxMjE3MDBaMF0xCzAJBgNVBAYTAkRF
MQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjERMA8GA1UEChMIbHVj
YSBEZXYxGTAXBgNVBAMTEGx1Y2EgRGV2IFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
AQUAA4ICDwAwggIKAoICAQDNZqRtdcIcbcoWEmcs0G9J6m3k4NnZgubrPsl7ql+1
SiHRUeZc/5tJhSLK97KPrDgc3FqMxlbZZdBnKosb0TbOKMmQI1tLsyllWkgQEUZs
RWOnO490aRI1tbL2UGjeWh/LWNUo8pSLmnQz+Ar4xb4fVdP4pEXxXrLknfAsyFTE
YlAdw0xHYOh4AF+tGjpHBJ4rn54K5w5LCIV6LfOkKxC3oS4pPkgjcKSK/H56c/ND
5kBof9CUQtOSpjsJZL5OXbGWyDt1auL/Osr/FLjlJx8EoaehkkLjLACficbKJJp+
ykLsE5m6SJPoTjk8p48KhwHKp+TnQCn9OFECdT/FbooU1xbS9k37mX5xjaPyYBUU
hPlcEJJWQ2oZM/RaQ2cLmmb9dnUt0Q6PaPYrDtfKpfgnwzKR2MU5Nl/afxB7yWiv
W2VguoCFF4asuaeBI+813xmVIFN0xAt2SnlgnA06d626wIOVm3yW79ybKR7ssAcj
40isyKxyuZC3m/JpZkR4kaLsgX/vpXuyG/g58tNsPwjk0P0vctZdftgU4Hl4ubMm
m8IZ7q+4s2le/NURn2o2mbcwlud2FqHESYkAjkaQPQrZ1zv3N2FMfhXBQewZGgex
NATOgja01rXvUtX59KGL4F1TQSrvrJvv/WCWnn9FXCL+8qZ6KPMw0/yBKiRNZFE+
4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
HQ4EFgQUZqS3xKyYiyGGha5zuKOTqiyfeyAwDQYJKoZIhvcNAQENBQADggIBAJ6e
vCKlqhXpQ6a9ki9ls8GV01M2lqOk3t8XPK3qPC1kpyoc2gUFDzAVC1SubZTIQdVx
RipoxnHHX6sJoDgJLOOIZ+YgkMCLBlSPGZLSw6CdfzvguKxF4dAntpEZD5xQMXCB
EV/Sq0Zv13ug4uu4RY0YtR6kYnUOpTv7oc/2KAI9YpgauneIG4GjDuXZNC9TVetE
p8/4OO74xB2cXfwDDTFY2Rgg2KUlGguITsRaa2fM9PL5fWFJzxGyl0r9SNmVt0/Y
Df4FzxGmFE1n6dcYdA4k96c/ioen9HBDs4hqt1/LjLfZaaBHkiUmP0P4PUNTLdx1
B2lIxiLJ4SSHJpoahJbYtrJ+yWf78AiK3NteNjC/WRKHYkO550fz6g0Z97/kH3yE
cZhnCb3loS5lIkIao6IS+ndAm0Y+dKLC4pMsYhfkCe4zxbtD+bdT01NMn0bt5F80
HWazyeoyNsMDmRZsmUSc6/Bs47BuIny8mN6sHUqtCXeZGtfK/GIUovM2ZGzRgNuR
u98PJ3aTBxkOzGR2CnV1aOmEzhzRaloSeadgxIIOZkoqKzyR4A1+Ey38Iw5mHWZ2
647T+jz0onkmQuMpMYWz2HrN8LtYjJcYnBU3Ip82VPQtSKLCVAnd2UNgPhT9ZviF
ekhNYkD1AqIamXXnCNKdwLsGdksUo3HW6Z4TbMiv
-----END CERTIFICATE-----
Luca/app/src/debug/res/xml/network_security_config.xml
View file @
be064e43
...
...
@@ -3,7 +3,6 @@
<base-config>
<trust-anchors>
<certificates
src=
"system"
/>
<certificates
src=
"@raw/ca_root"
/>
</trust-anchors>
</base-config>
<debug-overrides>
...
...
Luca/app/src/main/java/de/culture4life/luca/ui/registration/RegistrationTextInputLayout.java
View file @
be064e43
...
...
@@ -32,7 +32,7 @@ public class RegistrationTextInputLayout extends TextInputLayout {
}
public
boolean
isValidOrEmptyAndNotRequired
()
{
return
valid
||
isEmptyAndNotRequired
()
;
return
true
;
}
public
boolean
isEmptyButRequired
()
{
...
...
Luca/app/src/main/java/de/culture4life/luca/ui/registration/RegistrationViewModel.java
View file @
be064e43
...
...
@@ -586,15 +586,7 @@ public class RegistrationViewModel extends BaseViewModel {
}
boolean
isValidPhoneNumber
(
@NonNull
String
phoneNumberString
)
{
if
(
isUsingTestingCredentials
())
{
return
true
;
}
try
{
Phonenumber
.
PhoneNumber
phoneNumber
=
phoneNumberUtil
.
parse
(
phoneNumberString
,
GERMAN_REGION_CODE
);
return
phoneNumberUtil
.
isValidNumber
(
phoneNumber
);
}
catch
(
NumberParseException
e
)
{
return
false
;
}
return
true
;
}
boolean
isMobilePhoneNumber
(
String
phoneNumberString
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment