drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Fix additional SDK merge issues

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-07-24 20:08:39 +07:00
committed by Konstantin Pastbin
parent b465b95854
commit d8cdfb8080
10 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
View File

@@ -2,7 +2,7 @@
#include "map/gps_tracker.hpp"
#include "app/organicmaps/core/jni_helper.hpp"
#include "app/organicmaps/sdk/core/jni_helper.hpp"
#include <chrono>

2
android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
View File

@@ -324,7 +324,7 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv
JNIEXPORT jobject JNICALL
Java_app_organicmaps_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
{
TimeTableSet tts = NativeTimetableSet(env, jTts);
time_t const now = time(nullptr);

2
android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp
View File

@@ -10,7 +10,7 @@ GuiThread::GuiThread()
{
JNIEnv * env = jni::GetEnv();
m_class = GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread");
m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread");
ASSERT(m_class, ());
m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V");

2
android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
View File

@@ -2,7 +2,7 @@
#include "app/organicmaps/sdk/core/jni_helper.hpp"
#include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp"
#include "app/organicmaps/util/Distance.hpp"
#include "app/organicmaps/sdk/util/Distance.hpp"
#include "map/routing_manager.hpp"

2
android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
View File

@@ -2,7 +2,7 @@
#include "platform/settings.hpp"
#include "app/organicmaps/core/jni_helper.hpp"
#include "app/organicmaps/sdk/core/jni_helper.hpp"
extern "C"
{

6
android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
View File

@@ -2,7 +2,7 @@ package app.organicmaps.backup;
import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
import static app.organicmaps.util.StorageUtils.isFolderWritable;
import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
import android.app.Activity;
import android.content.Context;
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Locale;
import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.sdk.util.log.Logger;
public class BackupUtils
{

18
android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
View File

@@ -2,8 +2,8 @@ package app.organicmaps.backup;
import static app.organicmaps.backup.BackupUtils.getBackupName;
import static app.organicmaps.backup.BackupUtils.getBackupFolders;
import static app.organicmaps.util.StorageUtils.copyFileToDocumentFile;
import static app.organicmaps.util.StorageUtils.deleteDirectoryRecursive;
import static app.organicmaps.sdk.util.StorageUtils.copyFileToDocumentFile;
import static app.organicmaps.sdk.util.StorageUtils.deleteDirectoryRecursive;
import android.app.Activity;
import android.net.Uri;
@@ -17,13 +17,13 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.bookmarks.data.KmlFileType;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
public class LocalBackupManager implements BookmarkManager.BookmarksSharingListener
{

4
android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
View File

@@ -5,14 +5,14 @@ import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY;
import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY;
import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY;
import static app.organicmaps.util.StorageUtils.isFolderWritable;
import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
import android.app.Activity;
import android.content.SharedPreferences;
import androidx.preference.PreferenceManager;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
public class PeriodicBackupRunner
{

1
android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
View File

@@ -4,6 +4,7 @@ import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.editor.OhState;
import app.organicmaps.sdk.editor.data.Timespan;
import app.organicmaps.sdk.editor.data.Timetable;

4
android/app/src/main/java/app/organicmaps/settings/BackupSettingsFragment.java
View File

@@ -3,7 +3,7 @@ package app.organicmaps.settings;
import static app.organicmaps.backup.BackupUtils.formatReadableFolderPath;
import static app.organicmaps.backup.BackupUtils.getMaxBackups;
import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
import static app.organicmaps.util.StorageUtils.isFolderWritable;
import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
import android.app.Activity;
import android.content.Intent;
@@ -27,7 +27,7 @@ import java.text.DateFormat;
import app.organicmaps.R;
import app.organicmaps.backup.LocalBackupManager;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
public class BackupSettingsFragment