Unverified Commit b96ed8ff authored by Felix Förtsch's avatar Felix Förtsch
Browse files

replace ip-adress

parent 228df712
<?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="b139cea7-7fec-437e-b885-9f4e9b70259b">
<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>&quot;</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
<?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="b139cea7-7fec-437e-b885-9f4e9b70259b">
<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
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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>
......
......@@ -3,6 +3,7 @@
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="PROJECT" dialect="PostgreSQL" />
</component>
</project>
\ No newline at end of file
......@@ -21,7 +21,8 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.App.DayNight">
android:theme="@style/Theme.App.DayNight"
android:usesCleartextTraffic="true">
<activity
android:name=".ui.splash.SplashActivity"
......@@ -39,15 +40,15 @@
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="https"
android:host="app.luca-app.de"
android:scheme="http"
android:host="10.0.2.2"
android:pathPrefix="/webapp/" />
<!-- The Play Store is blocking releases that don't support HTTP for web intent-filters -->
<data
android:scheme="http"
android:host="app.luca-app.de"
android:host="10.0.2.2"
android:pathPrefix="/webapp/" />
</intent-filter>
......
......@@ -31,8 +31,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class NetworkManager extends Manager {
private static final String API_BASE_URL_PRODUCTION = "https://app.luca-app.de/api/v3/";
private static final String API_BASE_URL_STAGING = "https://staging.luca-app.de/api/v3/";
private static final String API_BASE_URL_PRODUCTION = "https://10.0.2.2/api/v3/";
private static final String API_BASE_URL_STAGING = "https://10.0.2.2/api/v3/";
public static final String API_BASE_URL = BuildConfig.DEBUG ? API_BASE_URL_STAGING : API_BASE_URL_PRODUCTION;
private static final String USER_AGENT = createUserAgent();
......@@ -82,7 +82,6 @@ public class NetworkManager extends Manager {
.build());
CertificatePinner certificatePinner = new CertificatePinner.Builder()
.add("**.luca-app.de", "sha256/wjD2X9ht0iXPN2sSXiXd2aF6ar5cxHOmXZnnkAiwVpU=") // CN=*.luca-app.de,O=neXenio GmbH,L=Berlin,ST=Berlin,C=DE,2.5.4.5=#130c43534d303233353532353339
.build();
OkHttpClient.Builder builder = new OkHttpClient.Builder()
......@@ -90,8 +89,7 @@ public class NetworkManager extends Manager {
.connectTimeout(10, TimeUnit.SECONDS)
.readTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.addInterceptor(userAgentInterceptor)
.certificatePinner(certificatePinner);
.addInterceptor(userAgentInterceptor);
if (BuildConfig.DEBUG) {
HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor();
......
......@@ -157,8 +157,7 @@ public class MeetingViewModel extends BaseViewModel {
private Single<String> generateQrCodeData(@NonNull UUID scannerId, @NonNull String additionalData) {
return Single.fromCallable(() -> new StringBuilder()
.append("https://")
.append(BuildConfig.DEBUG ? "staging" : "app")
.append(".luca-app.de/webapp/meeting/")
.append("10.0.2.2/webapp/meeting/")
.append(scannerId)
.append("#")
.append(additionalData)
......
......@@ -172,7 +172,7 @@ public class QrCodeFragment extends BaseFragment<QrCodeViewModel> {
try {
application.openUrl("market://details?id=" + BuildConfig.APPLICATION_ID.replace(".debug", ""));
} catch (android.content.ActivityNotFoundException e) {
application.openUrl("https://luca-app.de");
application.openUrl("https://10.0.2.2");
}
}));
dialogFragment.setCancelable(false);
......
......@@ -549,7 +549,7 @@ public class QrCodeViewModel extends BaseViewModel implements ImageAnalysis.Anal
}
private static boolean isDeepLink(@NonNull String data) {
return URLUtil.isHttpsUrl(data) && data.contains("luca-app.de");
return URLUtil.isHttpsUrl(data) && data.contains("10.0.2.2");
}
public LiveData<Bitmap> getQrCode() {
......
......@@ -513,10 +513,7 @@ public class RegistrationViewModel extends BaseViewModel {
}
public boolean isUsingTestingCredentials() {
return Objects.equals(firstName.getValue(), "John")
&& Objects.equals(lastName.getValue(), "Doe")
&& Objects.equals(phoneNumber.getValue(), "+4900000000000")
&& Objects.equals(email.getValue(), "john.doe@gmail.com");
return true;
}
boolean isSamePhoneNumber(String firstNumber, String secondNumber) {
......
......@@ -2,9 +2,9 @@
<!-- Global -->
<string name="unknown">Unbekannt</string>
<string name="feature_unavailable">Demnächst verfügbar</string>
<string name="url_terms_and_conditions">https://luca-app.de/app-terms-and-conditions</string>
<string name="url_privacy_policy">https://luca-app.de/app-privacy-policy</string>
<string name="url_imprint">https://luca-app.de/imprint</string>
<string name="url_terms_and_conditions">https://10.0.2.2/app-terms-and-conditions</string>
<string name="url_privacy_policy">https://10.0.2.2/app-privacy-policy</string>
<string name="url_imprint">https://10.0.2.2/imprint</string>
<string name="qr_code">QR Code</string>
<string name="qr_code_scanner">QR Code Scanner</string>
......@@ -71,9 +71,9 @@
<string name="welcome_app_slogan">Gemeinsam erleben.</string>
<string name="welcome_heading">Hallo</string>
<string name="welcome_description">luca hilft dir bei der sicheren und verschlüsselten Angabe deiner Kontaktdaten. Du musst dir keine Sorgen um deine Daten mehr machen, wenn du Veranstaltungen, Kulturstätten, Restaurants, Cafés oder Bars besuchst.</string>
<string name="welcome_terms_description"><a href="https://luca-app.de/app-terms-and-conditions">AGB</a> zustimmen</string>
<string name="welcome_terms_description"><a href="https://10.0.2.2/app-terms-and-conditions">AGB</a> zustimmen</string>
<string name="welcome_terms_checkbox_content_description">AGB</string>
<string name="welcome_privacy_description"><a href="https://luca-app.de/app-privacy-policy">Datenschutzbestimmungen</a> zustimmen</string>
<string name="welcome_privacy_description"><a href="https://10.0.2.2/app-privacy-policy">Datenschutzbestimmungen</a> zustimmen</string>
<string name="welcome_privacy_checkbox_content_description">Datenschutzerklärung</string>
<string name="welcome_action">Los geht\'s!</string>
......@@ -191,7 +191,7 @@
<string name="auto_checkout_info_title">Automatischer Check-out</string>
<string name="auto_checkout_info_description">Wenn du diese Funktion aktivierst, wirst du automatisch ausgecheckt, sobald du den Standort verlässt, bei dem du gerade eingecheckt bist.\n\nDazu muss luca auf deinen Standort zugreifen können. Sobald du ausgecheckt wirst, die Standortdienste deaktivierst oder dein Handy neu startest, wird diese Funktion deaktiviert.</string>
<string name="auto_checkout_location_access_title">Standortzugriff aktivieren</string>
<string name="auto_checkout_location_access_description">Die Funktion des automatischen Check-outs nutzt Geofencing. Wenn ein luca-Standort diese Funktion verwendet, kannst du durch die Nutzung der Standortdienste deines Handys automatisch auschecken, selbst wenn die App geschlossen ist. Dies erfolgt nur aufgrund deiner Einwilligung gem. Art. 6 (1) 1 a) DSGVO (mehr: <a href="https://www.luca-app.de/app-privacy-policy/">Datenschutz - App</a>. Natürlich kannst du dich auch jederzeit manuell auschecken.</string>
<string name="auto_checkout_location_access_description">Die Funktion des automatischen Check-outs nutzt Geofencing. Wenn ein luca-Standort diese Funktion verwendet, kannst du durch die Nutzung der Standortdienste deines Handys automatisch auschecken, selbst wenn die App geschlossen ist. Dies erfolgt nur aufgrund deiner Einwilligung gem. Art. 6 (1) 1 a) DSGVO (mehr: <a href="https://10.0.2.2/app-privacy-policy/">Datenschutz - App</a>. Natürlich kannst du dich auch jederzeit manuell auschecken.</string>
<string name="auto_checkout_background_location_access_title">@string/auto_checkout_location_access_title</string>
<string name="auto_checkout_background_location_access_description">Für die Funktion des automatischen Check-outs muss luca auf deinen Standort zugreifen können solange du eingecheckt bist, selbst wenn die App geschlossen ist. Aktiviere dafür bitte die folgende Option: <xliff:g example="Allow all the time" id="locationPermissionOption">%1$s</xliff:g></string>
<string name="auto_checkout_enable_location_title">Standortdienste aktivieren</string>
......@@ -208,7 +208,7 @@
<string name="history_time"><xliff:g example="18.08.2020 – 19:23" id="time">%1$s</xliff:g> Uhr</string>
<string name="history_share">Daten freigeben</string>
<string name="history_share_confirmation_title">@string/history_share</string>
<string name="history_share_confirmation_description">Möchtest du deine Historie der letzten 14&#160;Tage und deine Kontaktdaten für das Gesundheitsamt freigeben? Dies erfolgt nur aufgrund deiner freiwilligen Einwilligung gem. Art. 9 (2) a) DSGVO (mehr: <a href="https://www.luca-app.de/app-privacy-policy/">Datenschutz - App</a>).</string>
<string name="history_share_confirmation_description">Möchtest du deine Historie der letzten 14&#160;Tage und deine Kontaktdaten für das Gesundheitsamt freigeben? Dies erfolgt nur aufgrund deiner freiwilligen Einwilligung gem. Art. 9 (2) a) DSGVO (mehr: <a href="https://10.0.2.2/app-privacy-policy/">Datenschutz - App</a>).</string>
<string name="history_share_confirmation_action">Freigeben</string>
<string name="history_share_tan_title">@string/history_share</string>
<string name="history_share_tan_description">Bitte gib die folgende TAN an, sobald du vom Gesundheitsamt darum gebeten wirst:\n\n<xliff:g example="VU5S-86V6-H8FV" id="tan">%1$s</xliff:g></string>
......
......@@ -3,9 +3,9 @@
<string name="app_name" translatable="false">luca</string>
<string name="unknown">Unknown</string>
<string name="feature_unavailable">Available soon</string>
<string name="url_terms_and_conditions">https://luca-app.de/app-terms-and-conditions</string>
<string name="url_privacy_policy">https://luca-app.de/app-privacy-policy</string>
<string name="url_imprint">https://luca-app.de/imprint</string>
<string name="url_terms_and_conditions">https://10.0.2.2/app-terms-and-conditions</string>
<string name="url_privacy_policy">https://10.0.2.2/app-privacy-policy</string>
<string name="url_imprint">https://10.0.2.2/imprint</string>
<string name="qr_code">QR Code</string>
<string name="qr_code_scanner">QR Code Scanner</string>
......@@ -72,9 +72,9 @@
<string name="welcome_app_slogan">Experience life together.</string>
<string name="welcome_heading">Hello</string>
<string name="welcome_description">luca helps you encrypt and securely submit your contact data. With luca, you don\'t have to worry about your data when visiting events, restaurants, cafés or bars anymore.</string>
<string name="welcome_terms_description">Accept <a href="https://luca-app.de/app-terms-and-conditions">terms of use</a></string>
<string name="welcome_terms_description">Accept <a href="https://10.0.2.2/app-terms-and-conditions">terms of use</a></string>
<string name="welcome_terms_checkbox_content_description">Terms of Use</string>
<string name="welcome_privacy_description">Accept <a href="https://luca-app.de/app-privacy-policy">privacy policy</a></string>
<string name="welcome_privacy_description">Accept <a href="https://10.0.2.2/app-privacy-policy">privacy policy</a></string>
<string name="welcome_privacy_checkbox_content_description">Privacy Policy</string>
<string name="welcome_action">Get started!</string>
......@@ -192,7 +192,7 @@
<string name="auto_checkout_info_title">Automatic check-out</string>
<string name="auto_checkout_info_description">Activating this feature will check you out automatically as soon as you leave the location you\'re currently checked in at.\n\nLuca needs to have access to your location for this to work. Checking out, disabling location services or restarting your device will disable this feature.</string>
<string name="auto_checkout_location_access_title">Enable location access</string>
<string name="auto_checkout_location_access_description">This automatic checkout feature uses geofencing. If supported by a luca-location, you can check out automatically using you phone\'s location service, even when the app is closed. This is only done with your consent under art. 6 (1) 1 a) GDPR (more: <a href="https://www.luca-app.de/app-privacy-policy/">data privacy - app</a>). However, you can still check out manually at any time.</string>
<string name="auto_checkout_location_access_description">This automatic checkout feature uses geofencing. If supported by a luca-location, you can check out automatically using you phone\'s location service, even when the app is closed. This is only done with your consent under art. 6 (1) 1 a) GDPR (more: <a href="https://10.0.2.2/app-privacy-policy/">data privacy - app</a>). However, you can still check out manually at any time.</string>
<string name="auto_checkout_background_location_access_title">@string/auto_checkout_location_access_title</string>
<string name="auto_checkout_background_location_access_description">For the automatic check-out feature, luca needs to have access to your location while you\'re checked in, even when the app is closed. Please select the following option: <xliff:g example="Allow all the time" id="locationPermissionOption">%1$s</xliff:g></string>
<string name="auto_checkout_enable_location_title">Enable location services</string>
......@@ -210,7 +210,7 @@
<string name="history_time_merged" translatable="false"><xliff:g example="18.08.2020 – 19:23" id="startTime">%1$s</xliff:g> -\n<xliff:g example="18.08.2020 – 20:11" id="endTime">%2$s</xliff:g></string>
<string name="history_share">Share data</string>
<string name="history_share_confirmation_title">@string/history_share</string>
<string name="history_share_confirmation_description">Would you like to share your contact data and the last 14&#160;days of your history with the health department? This is only done with your voluntary consent in accordance with art. 9 (2) a) GDPR (more: <a href="https://www.luca-app.de/app-privacy-policy/">data privacy - app</a>).</string>
<string name="history_share_confirmation_description">Would you like to share your contact data and the last 14&#160;days of your history with the health department? This is only done with your voluntary consent in accordance with art. 9 (2) a) GDPR (more: <a href="https://10.0.2.2/app-privacy-policy/">data privacy - app</a>).</string>
<string name="history_share_confirmation_action">Share</string>
<string name="history_share_tan_title">@string/history_share</string>
<string name="history_share_tan_description">Please provide this TAN as soon as the health department asks you for it:\n\n<xliff:g example="VU5S-86V6-H8FV" id="tan">%1$s</xliff:g> </string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment