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

[android] Disable default file logging for betas; add free space check and details to sys info

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2022-06-09 21:40:24 +03:00 • committed by Viktor Govako
parent ffb6a6979a
commit 3dfd54454d
5 changed files with 51 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/com/mapswithme/util/Utils.java
View file

@ -228,15 +228,6 @@ public class Utils
return Uri.parse(uriString);
}
public static String getFullDeviceModel()
{
String model = Build.MODEL;
if (!model.startsWith(Build.MANUFACTURER))
model = Build.MANUFACTURER + " " + model;
return model;
}
public static void openAppInMarket(Activity activity, String url)
{
final Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));

2
android/src/com/mapswithme/util/log/Logger.java
View file

@ -145,7 +145,7 @@ public final class Logger
if (!file.exists() || file.length() > MAX_SIZE)
{
fw = new FileWriter(file, false);
fw.write(LogsManager.INSTANCE.getSystemInformation()); //todo: write in a separate file and add a timestamp
fw.write(LogsManager.INSTANCE.getSystemInformation());
}
else
{

67
android/src/com/mapswithme/util/log/LogsManager.java
View file

@ -11,15 +11,18 @@ import android.os.Build;
import android.os.Debug;
import android.util.Log;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.util.Utils;
import net.jcip.annotations.ThreadSafe;
import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -62,9 +65,7 @@ public class LogsManager
mApplication = application;
final SharedPreferences prefs = MwmApplication.prefs(mApplication);
// File logging is enabled by default for beta builds.
mIsFileLoggingEnabled = prefs.getBoolean(mApplication.getString(R.string.pref_enable_logging),
BuildConfig.BUILD_TYPE.equals("beta"));
mIsFileLoggingEnabled = prefs.getBoolean(mApplication.getString(R.string.pref_enable_logging), false);
Log.i(TAG, "isFileLoggingEnabled preference: " + mIsFileLoggingEnabled);
mIsFileLoggingEnabled = mIsFileLoggingEnabled && ensureLogsFolder() != null;
@ -136,6 +137,11 @@ public class LogsManager
Log.e(TAG, "Can't write to a logs folder " + path);
return false;
}
if (dir.getUsableSpace() < 256)
{
Log.e(TAG, "There is no free space on storage with a logs folder " + path);
return false;
}
return true;
}
@ -154,6 +160,7 @@ public class LogsManager
private void switchFileLoggingEnabled(boolean enabled)
{
mIsFileLoggingEnabled = enabled;
// Only Debug builds log DEBUG level to Android system log.
nativeToggleCoreDebugLogs(enabled || BuildConfig.DEBUG);
MwmApplication.prefs(mApplication)
.edit()
@ -218,40 +225,56 @@ public class LogsManager
{
assertFileLoggingInit();
String res = "Android version: " + Build.VERSION.SDK_INT +
"\nDevice: " + Utils.getFullDeviceModel() +
"\nApp version: " + BuildConfig.APPLICATION_ID + " " + BuildConfig.VERSION_NAME +
"\nLocale: " + Locale.getDefault() +
"\nNetworks: ";
final DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.US);
final StringBuilder sb = new StringBuilder(512);
sb.append("Datetime: ").append(fmt.format(new Date()))
.append("\n\nAndroid version: ")
.append(Build.VERSION.CODENAME.equals("REL") ? Build.VERSION.RELEASE : Build.VERSION.CODENAME)
.append(" (API ").append(Build.VERSION.SDK_INT).append(')');
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
sb.append(", security patch level: ").append(Build.VERSION.SECURITY_PATCH);
sb.append(", os.version: " + System.getProperty("os.version", "N/A"))
.append("\nDevice: ");
if (!Build.MODEL.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()))
sb.append(Build.MANUFACTURER).append(' ');
sb.append(Build.MODEL).append(" (").append(Build.DEVICE).append(')');
sb.append("\nSupported ABIs:");
for (String abi : Build.SUPPORTED_ABIS)
sb.append(' ').append(abi);
sb.append("\nApp version: ").append(BuildConfig.APPLICATION_ID).append(' ').append(BuildConfig.VERSION_NAME)
.append("\nLocale: ").append(Locale.getDefault())
.append("\nNetworks: ");
final ConnectivityManager manager = (ConnectivityManager) mApplication.getSystemService(Context.CONNECTIVITY_SERVICE);
if (manager != null)
// TODO: getAllNetworkInfo() is deprecated, for alternatives check
// https://stackoverflow.com/questions/32547006/connectivitymanager-getnetworkinfoint-deprecated
for (NetworkInfo info : manager.getAllNetworkInfo())
res += "\n\t" + info.toString();
res += "\nLocation providers: ";
sb.append("\n\t").append(info.toString());
sb.append("\nLocation providers:");
final LocationManager locMngr = (android.location.LocationManager) mApplication.getSystemService(Context.LOCATION_SERVICE);
if (locMngr != null)
for (String provider : locMngr.getProviders(true))
res += provider + " ";
sb.append(' ').append(provider);
sb.append("\n\n");
return res + "\n\n";
return sb.toString();
}
// Called from JNI.
@SuppressWarnings("unused")
@NonNull
@Keep
public static String getMemoryInfo(@NonNull Context context)
{
final Debug.MemoryInfo debugMI = new Debug.MemoryInfo();
Debug.getMemoryInfo(debugMI);
final ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
final ActivityManager activityManager =
(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
activityManager.getMemoryInfo(mi);
StringBuilder log = new StringBuilder("Memory info: ");
log.append(" Debug.getNativeHeapSize() = ")
final StringBuilder log = new StringBuilder(256);
log.append("Memory info: ")
.append(" Debug.getNativeHeapSize() = ")
.append(Debug.getNativeHeapSize() / 1024)
.append("KB; Debug.getNativeHeapAllocatedSize() = ")
.append(Debug.getNativeHeapAllocatedSize() / 1024)
@ -266,11 +289,11 @@ public class LogsManager
.append("KB; mi.threshold = ")
.append(mi.threshold / 1024)
.append("KB; mi.lowMemory = ")
.append(mi.lowMemory);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
{
log.append(" mi.totalMem = ").append(mi.totalMem / 1024).append("KB;");
}
.append(mi.lowMemory)
.append("; mi.totalMem = ")
.append(mi.totalMem / 1024)
.append("KB;");
return log.toString();
}

8
android/src/com/mapswithme/util/log/ZipLogsTask.java
View file

@ -18,7 +18,6 @@ class ZipLogsTask implements Runnable
{
private static final String TAG = ZipLogsTask.class.getSimpleName();
private final static int BUFFER_SIZE = 2048;
@NonNull
private final String mLogsPath;
@NonNull
@ -77,17 +76,18 @@ class ZipLogsTask implements Runnable
}
else
{
byte[] data = new byte[BUFFER_SIZE];
final int bufSize = 8 * 1024;
byte[] data = new byte[bufSize];
String unmodifiedFilePath = file.getPath();
String relativePath = unmodifiedFilePath.substring(basePathLength);
try (
FileInputStream fi = new FileInputStream(unmodifiedFilePath);
BufferedInputStream origin = new BufferedInputStream(fi, BUFFER_SIZE))
BufferedInputStream origin = new BufferedInputStream(fi, bufSize))
{
ZipEntry entry = new ZipEntry(relativePath);
out.putNextEntry(entry);
int count;
while ((count = origin.read(data, 0, BUFFER_SIZE)) != -1)
while ((count = origin.read(data, 0, bufSize)) != -1)
{
out.write(data, 0, count);
}

2
platform/platform.hpp
View file

@ -270,7 +270,7 @@ public:
/// @return information about kinds of memory which are relevant for a platform.
/// This method is implemented for iOS and Android only.
/// @TODO Add implementation
/// @TODO remove as its not used anywhere?
std::string GetMemoryInfo() const;
static EConnectionType ConnectionStatus();