From c5772eef95f293901e1dfec037ba6cff5bce4926 Mon Sep 17 00:00:00 2001 From: roman Date: Wed, 31 Dec 2025 11:50:30 +0100 Subject: [PATCH] Correction bug, modernisation --- .idea/vcs.xml | 6 ++++++ app/build.gradle | 15 +++++++++++++++ .../com/example/boidelov3/DatabaseConnection.java | 7 ++++--- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 885025e..0000157 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,9 +2,19 @@ plugins { id 'com.android.application' } +// Load local.properties +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withInputStream { localProperties.load(it) } +} + android { namespace 'com.example.boidelov3' compileSdk 33 + buildFeatures { + buildConfig = true + } packagingOptions { resources.excludes.add("META-INF/*") } // This line is added to avoid the error: Duplicate files copied in APK META-INF/LICENSE.txt defaultConfig { applicationId "com.example.boidelov3" @@ -14,6 +24,11 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + // Inject database credentials into BuildConfig + buildConfigField "String", "DB_URL", "\"${localProperties.getProperty('db.url', '')}\"" + buildConfigField "String", "DB_USER", "\"${localProperties.getProperty('db.user', '')}\"" + buildConfigField "String", "DB_PASSWORD", "\"${localProperties.getProperty('db.password', '')}\"" } buildTypes { diff --git a/app/src/main/java/com/example/boidelov3/DatabaseConnection.java b/app/src/main/java/com/example/boidelov3/DatabaseConnection.java index 4e3db86..22f24de 100644 --- a/app/src/main/java/com/example/boidelov3/DatabaseConnection.java +++ b/app/src/main/java/com/example/boidelov3/DatabaseConnection.java @@ -1,6 +1,7 @@ package com.example.boidelov3; import android.os.AsyncTask; +import com.example.boidelov3.BuildConfig; import com.impossibl.postgres.api.jdbc.PGConnection; @@ -9,9 +10,9 @@ import java.sql.DriverManager; import java.sql.SQLException; public class DatabaseConnection extends AsyncTask { - private static final String DB_URL = "jdbc:postgresql://82.65.214.214:5432/boidelo"; - private static final String USER = "Tux2543"; - private static final String PASSWORD = "6wa*teCnuxsG#grAc5HzC!Rh%#@c&"; + private static final String DB_URL = BuildConfig.DB_URL; + private static final String USER = BuildConfig.DB_USER; + private static final String PASSWORD = BuildConfig.DB_PASSWORD; @Override protected PGConnection doInBackground(Void... params) {