AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[platform][ios][android] private dir

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-02-20 17:05:39 +03:00 • committed by Aleksandr Zatsepin
parent a532987071
commit 101a50ff73
9 changed files with 142 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/jni/com/mapswithme/maps/MwmApplication.cpp
View file

@ -18,12 +18,18 @@ extern "C"
android::Platform::Instance().SetSettingsDir(jni::ToNativeString(env, settingsPath));
}
// void nativeInitPlatform(String apkPath, String storagePath, String tmpPath, String obbGooglePath, String flavorName, String buildType, boolean isTablet);
// void nativeInitPlatform(String apkPath, String storagePath, String privatePath, String tmpPath,
// String obbGooglePath, String flavorName, String buildType, boolean isTablet);
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MwmApplication_nativeInitPlatform(JNIEnv * env, jobject thiz, jstring apkPath, jstring storagePath, jstring tmpPath,
jstring obbGooglePath, jstring flavorName, jstring buildType, jboolean isTablet)
Java_com_mapswithme_maps_MwmApplication_nativeInitPlatform(JNIEnv * env, jobject thiz,
jstring apkPath, jstring storagePath,
jstring privatePath, jstring tmpPath,
jstring obbGooglePath,
jstring flavorName, jstring buildType,
jboolean isTablet)
{
android::Platform::Instance().Initialize(env, thiz, apkPath, storagePath, tmpPath, obbGooglePath, flavorName, buildType, isTablet);
android::Platform::Instance().Initialize(env, thiz, apkPath, storagePath, privatePath, tmpPath,
obbGooglePath, flavorName, buildType, isTablet);
}
// static void nativeInitFramework();

9
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -87,11 +87,9 @@ void Platform::SetGuiThread(unique_ptr<base::TaskLoop> guiThread)
namespace android
{
void Platform::Initialize(JNIEnv * env,
jobject functorProcessObject,
jstring apkPath, jstring storagePath,
jstring tmpPath, jstring obbGooglePath,
jstring flavorName, jstring buildType,
void Platform::Initialize(JNIEnv * env, jobject functorProcessObject, jstring apkPath,
jstring storagePath, jstring privatePath, jstring tmpPath,
jstring obbGooglePath, jstring flavorName, jstring buildType,
bool isTablet)
{
m_functorProcessObject = env->NewGlobalRef(functorProcessObject);
@ -119,6 +117,7 @@ void Platform::Initialize(JNIEnv * env,
m_isTablet = isTablet;
m_resourcesDir = jni::ToNativeString(env, apkPath);
m_privateDir = jni::ToNativeString(env, privatePath);
m_tmpDir = jni::ToNativeString(env, tmpPath);
m_writableDir = jni::ToNativeString(env, storagePath);

9
android/jni/com/mapswithme/platform/Platform.hpp
View file

@ -17,12 +17,9 @@ namespace android
class Platform : public ::Platform
{
public:
void Initialize(JNIEnv * env,
jobject functorProcessObject,
jstring apkPath, jstring storagePath,
jstring tmpPath, jstring obbGooglePath,
jstring flavorName, jstring buildType,
bool isTablet);
void Initialize(JNIEnv * env, jobject functorProcessObject, jstring apkPath, jstring storagePath,
jstring privatePath, jstring tmpPath, jstring obbGooglePath, jstring flavorName,
jstring buildType, bool isTablet);
~Platform() override;

3
android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
View file

@ -32,6 +32,7 @@ import com.mapswithme.maps.location.LocationListener;
import com.mapswithme.maps.search.SearchEngine;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Constants;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
@ -769,7 +770,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
final String ext = getExtensionFromMime(resolver.getType(mData));
if (ext != null)
{
final String filePath = MwmApplication.get().getTempPath() + "Attachment" + ext;
final String filePath = StorageUtils.getTempPath() + "Attachment" + ext;
File tmpFile = new File(filePath);
output = new FileOutputStream(tmpFile);

95
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -35,6 +35,7 @@ import com.mapswithme.util.Counters;
import com.mapswithme.util.CrashlyticsUtils;
import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.SharedPropertiesUtils;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
@ -202,21 +203,24 @@ public class MwmApplication extends Application
initTracker();
String settingsPath = getSettingsPath();
final String settingsPath = StorageUtils.getSettingsPath();
mLogger.d(TAG, "onCreate(), setting path = " + settingsPath);
String tempPath = getTempPath();
final String filesPath = StorageUtils.getFilesPath();
mLogger.d(TAG, "onCreate(), files path = " + filesPath);
final String tempPath = StorageUtils.getTempPath();
mLogger.d(TAG, "onCreate(), temp path = " + tempPath);
// If platform directories are not created it means that native part of app will not be able
// to work at all. So, we just ignore native part initialization in this case, e.g. when the
// external storage is damaged or not available (read-only).
if (!createPlatformDirectories(settingsPath, tempPath))
if (!createPlatformDirectories(settingsPath, filesPath, tempPath))
return;
// First we need initialize paths and platform to have access to settings and other components.
nativePreparePlatform(settingsPath);
nativeInitPlatform(getApkPath(), getStoragePath(settingsPath), getTempPath(), getObbGooglePath(),
BuildConfig.FLAVOR, BuildConfig.BUILD_TYPE, UiUtils.isTablet());
nativeInitPlatform(StorageUtils.getApkPath(), StorageUtils.getStoragePath(settingsPath),
filesPath, tempPath, StorageUtils.getObbGooglePath(), BuildConfig.FLAVOR,
BuildConfig.BUILD_TYPE, UiUtils.isTablet());
Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled());
@ -233,31 +237,15 @@ public class MwmApplication extends Application
mPlatformInitialized = true;
}
private boolean createPlatformDirectories(@NonNull String settingsPath, @NonNull String tempPath)
private boolean createPlatformDirectories(@NonNull String settingsPath, @NonNull String filesPath,
@NonNull String tempPath)
{
if (SharedPropertiesUtils.shouldEmulateBadExternalStorage())
return false;
return createPlatformDirectory(settingsPath) && createPlatformDirectory(tempPath);
}
private boolean createPlatformDirectory(@NonNull String path)
{
File directory = new File(path);
if (!directory.exists() && !directory.mkdirs())
{
boolean isPermissionGranted = PermissionsUtils.isExternalStorageGranted();
Throwable error = new IllegalStateException("Can't create directories for: " + path
+ " state = " + Environment.getExternalStorageState()
+ " isPermissionGranted = " + isPermissionGranted);
LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.STORAGE)
.e(TAG, "Can't create directories for: " + path
+ " state = " + Environment.getExternalStorageState()
+ " isPermissionGranted = " + isPermissionGranted);
CrashlyticsUtils.logException(error);
return false;
}
return true;
return StorageUtils.createDirectory(settingsPath) &&
StorageUtils.createDirectory(filesPath) &&
StorageUtils.createDirectory(tempPath);
}
private void initNativeFramework()
@ -329,56 +317,6 @@ public class MwmApplication extends Application
return mFrameworkInitialized && mPlatformInitialized;
}
public String getApkPath()
{
try
{
return getPackageManager().getApplicationInfo(BuildConfig.APPLICATION_ID, 0).sourceDir;
} catch (final NameNotFoundException e)
{
mLogger.e(TAG, "Can't get apk path from PackageManager", e);
return "";
}
}
public static String getSettingsPath()
{
return Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.MWM_DIR_POSTFIX;
}
private static String getStoragePath(String settingsPath)
{
String path = Config.getStoragePath();
if (!TextUtils.isEmpty(path))
{
File f = new File(path);
if (f.exists() && f.isDirectory())
return path;
path = new StoragePathManager().findMapsMeStorage(settingsPath);
Config.setStoragePath(path);
return path;
}
return settingsPath;
}
public String getTempPath()
{
final File cacheDir = getExternalCacheDir();
if (cacheDir != null)
return cacheDir.getAbsolutePath();
return Environment.getExternalStorageDirectory().getAbsolutePath() +
String.format(Constants.STORAGE_PATH, BuildConfig.APPLICATION_ID, Constants.CACHE_DIR);
}
private static String getObbGooglePath()
{
final String storagePath = Environment.getExternalStorageDirectory().getAbsolutePath();
return storagePath.concat(String.format(Constants.OBB_PATH, BuildConfig.APPLICATION_ID));
}
static
{
System.loadLibrary("mapswithme");
@ -462,8 +400,9 @@ public class MwmApplication extends Application
}
private static native void nativePreparePlatform(String settingsPath);
private native void nativeInitPlatform(String apkPath, String storagePath, String tmpPath, String obbGooglePath,
String flavorName, String buildType, boolean isTablet);
private native void nativeInitPlatform(String apkPath, String storagePath, String privatePath,
String tmpPath, String obbGooglePath, String flavorName,
String buildType, boolean isTablet);
private static native void nativeInitFramework();
private static native void nativeProcessTask(long taskPointer);

93
android/src/com/mapswithme/util/StorageUtils.java
View file

@ -1,18 +1,25 @@
package com.mapswithme.util;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.settings.StoragePathManager;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.io.File;
public class StorageUtils
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.STORAGE);
private final static String TAG = StorageUtils.class.getSimpleName();
private final static String LOGS_FOLDER = "logs";
/**
@ -84,6 +91,92 @@ public class StorageUtils
return file.isFile() && file.exists() ? zipFile : null;
}
@NonNull
public static String getApkPath()
{
try
{
return MwmApplication.get().getPackageManager().
getApplicationInfo(BuildConfig.APPLICATION_ID, 0).sourceDir;
}
catch (final PackageManager.NameNotFoundException e)
{
LOGGER.e(TAG, "Can't get apk path from PackageManager", e);
return "";
}
}
@NonNull
public static String getSettingsPath()
{
return Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.MWM_DIR_POSTFIX;
}
@NonNull
public static String getStoragePath(@NonNull String settingsPath)
{
String path = Config.getStoragePath();
if (!TextUtils.isEmpty(path))
{
File f = new File(path);
if (f.exists() && f.isDirectory())
return path;
path = new StoragePathManager().findMapsMeStorage(settingsPath);
Config.setStoragePath(path);
return path;
}
return settingsPath;
}
@NonNull
public static String getFilesPath()
{
final File filesDir = MwmApplication.get().getExternalFilesDir(null);
if (filesDir != null)
return filesDir.getAbsolutePath();
return Environment.getExternalStorageDirectory().getAbsolutePath() +
String.format(Constants.STORAGE_PATH, BuildConfig.APPLICATION_ID, Constants.FILES_DIR);
}
@NonNull
public static String getTempPath()
{
final File cacheDir = MwmApplication.get().getExternalCacheDir();
if (cacheDir != null)
return cacheDir.getAbsolutePath();
return Environment.getExternalStorageDirectory().getAbsolutePath() +
String.format(Constants.STORAGE_PATH, BuildConfig.APPLICATION_ID, Constants.CACHE_DIR);
}
@NonNull
public static String getObbGooglePath()
{
final String storagePath = Environment.getExternalStorageDirectory().getAbsolutePath();
return storagePath.concat(String.format(Constants.OBB_PATH, BuildConfig.APPLICATION_ID));
}
public static boolean createDirectory(@NonNull String path)
{
File directory = new File(path);
if (!directory.exists() && !directory.mkdirs())
{
boolean isPermissionGranted = PermissionsUtils.isExternalStorageGranted();
Throwable error = new IllegalStateException("Can't create directories for: " + path
+ " state = " + Environment.getExternalStorageState()
+ " isPermissionGranted = " + isPermissionGranted);
LOGGER.e(TAG, "Can't create directories for: " + path
+ " state = " + Environment.getExternalStorageState()
+ " isPermissionGranted = " + isPermissionGranted);
CrashlyticsUtils.logException(error);
return false;
}
return true;
}
public static long getFileSize(@NonNull String path)
{
File file = new File(path);

4
android/src/com/mapswithme/util/sharing/SharingHelper.java
View file

@ -27,6 +27,8 @@ import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.concurrency.ThreadPool;
import com.mapswithme.util.concurrency.UiThread;
@ -215,7 +217,7 @@ public final class SharingHelper
public static void shareBookmarksCategory(Activity context, long id)
{
final String path = MwmApplication.get().getTempPath() + "/";
final String path = StorageUtils.getTempPath() + "/";
String name = BookmarkManager.INSTANCE.saveToKmzFile(id, path);
if (name == null)
return;

5
platform/platform.hpp
View file

@ -83,6 +83,8 @@ protected:
/// Writable directory to store downloaded map data
/// @note on some systems it can point to external ejectable storage
string m_writableDir;
/// Application private directory.
string m_privateDir;
/// Temporary directory, can be cleaned up by the system
string m_tmpDir;
/// Writable directory to store persistent application data
@ -167,6 +169,9 @@ public:
/// @return full path to file in the settings directory
string SettingsPathForFile(string const & file) const { return SettingsDir() + file; }
/// Returns application private directory.
string const & PrivateDir() const { return m_privateDir; }
/// @return reader for file decriptor.
/// @throws FileAbsentException
/// @param[in] file name or full path which we want to read

5
platform/platform_ios.mm
View file

@ -46,6 +46,11 @@ Platform::Platform()
m_writableDir += "/";
m_settingsDir = m_writableDir;
auto privatePaths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
NSUserDomainMask, YES);
m_privateDir = privatePaths.firstObject.UTF8String;
m_privateDir += "/";
NSString * tmpDir = NSTemporaryDirectory();
if (tmpDir)
m_tmpDir = tmpDir.UTF8String;