isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace Config.java by Constants.kt

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-23 17:44:38 -06:00
parent 39d23424d6
commit b468325f64
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java
View File

@@ -27,13 +27,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.Config;
import org.isoron.uhabits.core.utils.*; import org.isoron.uhabits.core.utils.*;
import java.io.*; import java.io.*;
import java.text.*; import java.text.*;
import static org.isoron.uhabits.core.Config.DATABASE_VERSION; import static org.isoron.uhabits.core.ConstantsKt.*;
public abstract class DatabaseUtils public abstract class DatabaseUtils
{ {
@@ -55,7 +54,7 @@ public abstract class DatabaseUtils
@NonNull @NonNull
public static String getDatabaseFilename() public static String getDatabaseFilename()
{ {
String databaseFilename = Config.DATABASE_FILENAME; String databaseFilename = DATABASE_FILENAME;
if (HabitsApplication.Companion.isTestMode()) databaseFilename = "test.db"; if (HabitsApplication.Companion.isTestMode()) databaseFilename = "test.db";
return databaseFilename; return databaseFilename;
} }

9
android/uhabits-core/src/main/java/org/isoron/uhabits/core/Config.java → android/uhabits-core/src/main/java/org/isoron/uhabits/core/Constants.kt
View File

@@ -16,11 +16,8 @@
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.uhabits.core
package org.isoron.uhabits.core; const val DATABASE_FILENAME = "uhabits.db"
public class Config const val DATABASE_VERSION = 24
{
public static final String DATABASE_FILENAME = "uhabits.db";
public static int DATABASE_VERSION = 24;
}

4
android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java
View File

@@ -32,7 +32,7 @@ import java.util.*;
import javax.inject.*; import javax.inject.*;
import static org.isoron.uhabits.core.Config.*; import static org.isoron.uhabits.core.ConstantsKt.*;
/** /**
* Class that imports data from database files exported by Loop Habit Tracker. * Class that imports data from database files exported by Loop Habit Tracker.
@@ -132,7 +132,7 @@ public class LoopDBImporter extends AbstractImporter
{ {
Timestamp t = new Timestamp(r.timestamp); Timestamp t = new Timestamp(r.timestamp);
Repetition rep = habit.getRepetitions().getByTimestamp(t); Repetition rep = habit.getRepetitions().getByTimestamp(t);
if(rep == null || rep.getValue() != r.value) if (rep == null || rep.getValue() != r.value)
new CreateRepetitionCommand(habitList, habit, t, r.value).execute(); new CreateRepetitionCommand(habitList, habit, t, r.value).execute();
} }
} }

3
android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java
View File

@@ -38,6 +38,7 @@ import java.io.*;
import java.sql.*; import java.sql.*;
import java.util.*; import java.util.*;
import static org.isoron.uhabits.core.ConstantsKt.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
@@ -127,7 +128,7 @@ public class BaseUnitTest
DriverManager.getConnection("jdbc:sqlite::memory:")); DriverManager.getConnection("jdbc:sqlite::memory:"));
db.execute("pragma user_version=8;"); db.execute("pragma user_version=8;");
MigrationHelper helper = new MigrationHelper(db); MigrationHelper helper = new MigrationHelper(db);
helper.migrateTo(Config.DATABASE_VERSION); helper.migrateTo(DATABASE_VERSION);
return db; return db;
} }
catch (SQLException e) catch (SQLException e)