[android][sdk] Move Android7RootCertificateWorkaround into sdk package

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-06-30 18:55:51 +02:00
committed by Konstantin Pastbin
parent 3920988ef4
commit 07420a3f19
11 changed files with 6 additions and 7 deletions

View File

@@ -15,7 +15,6 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import app.organicmaps.background.OsmUploadWork; import app.organicmaps.background.OsmUploadWork;
import app.organicmaps.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.downloader.DownloaderNotifier; import app.organicmaps.downloader.DownloaderNotifier;
import app.organicmaps.location.TrackRecordingService; import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.routing.NavigationService; import app.organicmaps.routing.NavigationService;
@@ -123,8 +122,6 @@ public class MwmApplication extends Application implements Application.ActivityL
LogsManager.INSTANCE.initFileLogging(this); LogsManager.INSTANCE.initFileLogging(this);
Android7RootCertificateWorkaround.initializeIfNeeded(this);
ConnectionState.INSTANCE.initialize(this); ConnectionState.INSTANCE.initialize(this);
DownloaderNotifier.createNotificationChannel(this); DownloaderNotifier.createNotificationChannel(this);

View File

@@ -8,6 +8,7 @@ import androidx.lifecycle.ProcessLifecycleOwner;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.routing.RoutingController; import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.SensorHelper; import app.organicmaps.sdk.location.SensorHelper;
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
@@ -82,6 +83,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
Config.init(mContext); Config.init(mContext);
Android7RootCertificateWorkaround.initializeIfNeeded(mContext);
mSensorHelper = new SensorHelper(mContext); mSensorHelper = new SensorHelper(mContext);
mLocationHelper = new LocationHelper(mContext, mSensorHelper); mLocationHelper = new LocationHelper(mContext, mSensorHelper);
mIsolinesManager = new IsolinesManager(mContext); mIsolinesManager = new IsolinesManager(mContext);

View File

@@ -1,8 +1,8 @@
package app.organicmaps.downloader; package app.organicmaps.sdk.downloader;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import app.organicmaps.R; import app.organicmaps.sdk.R;
import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.sdk.util.log.Logger;
import java.io.InputStream; import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;

View File

@@ -3,7 +3,6 @@ package app.organicmaps.sdk.downloader;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Base64; import android.util.Base64;
import androidx.annotation.Keep; import androidx.annotation.Keep;
import app.organicmaps.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.sdk.util.Constants; import app.organicmaps.sdk.util.Constants;
import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.Utils; import app.organicmaps.sdk.util.Utils;

View File

@@ -27,7 +27,7 @@ package app.organicmaps.sdk.util;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.Keep; import androidx.annotation.Keep;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import app.organicmaps.downloader.Android7RootCertificateWorkaround; import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.sdk.util.log.Logger;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;