WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use java8 time API (#952)

This commit is contained in:
vvb2060 2021-08-20 02:00:02 +08:00 committed by GitHub
parent c77d122254
commit 70344ff9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/lsposed/manager/App.java
View File

@ -182,7 +182,7 @@ public class App extends Application {
@Override @Override
public void onFailure(@NonNull Call call, @NonNull IOException e) { public void onFailure(@NonNull Call call, @NonNull IOException e) {
Log.e(App.TAG, e.getMessage(), e); Log.e(App.TAG, "loadRemoteVersion: " + e.getMessage());
if (pref.getBoolean("checked", false)) return; if (pref.getBoolean("checked", false)) return;
pref.edit().putBoolean("checked", true).apply(); pref.edit().putBoolean("checked", true).apply();
} }

27
app/src/main/java/org/lsposed/manager/ui/activity/CrashReportActivity.java
View File

@ -36,10 +36,8 @@ import org.lsposed.manager.BuildConfig;
import org.lsposed.manager.R; import org.lsposed.manager.R;
import org.lsposed.manager.databinding.ActivityCrashReportBinding; import org.lsposed.manager.databinding.ActivityCrashReportBinding;
import java.text.DateFormat; import java.time.Instant;
import java.text.SimpleDateFormat; import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Locale;
public class CrashReportActivity extends AppCompatActivity { public class CrashReportActivity extends AppCompatActivity {
ActivityCrashReportBinding binding; ActivityCrashReportBinding binding;
@ -62,21 +60,16 @@ public class CrashReportActivity extends AppCompatActivity {
} }
public String getAllErrorDetailsFromIntent(@NonNull Intent intent) { public String getAllErrorDetailsFromIntent(@NonNull Intent intent) {
Date currentDate = new Date(); var dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US);
String versionName = String.format("%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE); String versionName = String.format("%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
String errorDetails = ""; return "Build version: " + versionName + " \n" +
"Current date: " + dateFormat.format(Instant.now()) + " \n" +
errorDetails += "Build version: " + versionName + " \n"; "Device: " + getDeviceModelName() + " \n" +
errorDetails += "Current date: " + dateFormat.format(currentDate) + " \n"; "Fingerprint: " + getFingerprint() + " \n \n" +
errorDetails += "Device: " + getDeviceModelName() + " \n"; "SDK: " + Build.VERSION.SDK_INT + " \n \n" +
errorDetails += "Fingerprint: " + getFingerprint() + " \n \n"; "Stack trace: \n" +
errorDetails += "SDK: " + Build.VERSION.SDK_INT + " \n \n"; getStackTraceFromIntent(intent);
errorDetails += "Stack trace: \n";
errorDetails += getStackTraceFromIntent(intent);
return errorDetails;
} }
private String getFingerprint() { private String getFingerprint() {

17
core/src/main/java/org/lsposed/lspd/util/ModuleLogger.java
View File

@ -23,22 +23,25 @@ package org.lsposed.lspd.util;
import android.app.ActivityThread; import android.app.ActivityThread;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.Process; import android.os.Process;
import android.os.SystemProperties;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.time.Instant;
import java.util.Date; import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone;
public class ModuleLogger { public class ModuleLogger {
static SimpleDateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss", Locale.getDefault()); private static DateTimeFormatter logDateFormat;
static ParcelFileDescriptor fd = null; private static ParcelFileDescriptor fd = null;
public static void initLogger(ParcelFileDescriptor fileDescriptor) { public static void initLogger(ParcelFileDescriptor fileDescriptor) {
if (fd == null && fileDescriptor != null) { if (fd == null && fileDescriptor != null) {
fd = fileDescriptor; fd = fileDescriptor;
logDateFormat.setTimeZone(TimeZone.getDefault()); var zone = ZoneId.of(SystemProperties.get("persist.sys.timezone"));
var pattern = "yyyy-MM-dd HH:mm:ss.SSS";
logDateFormat = DateTimeFormatter.ofPattern(pattern, Locale.ROOT).withZone(zone);
} }
} }
@ -50,7 +53,7 @@ public class ModuleLogger {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String processName = ActivityThread.currentProcessName(); String processName = ActivityThread.currentProcessName();
sb.append(logDateFormat.format(new Date())); sb.append(logDateFormat.format(Instant.now()));
sb.append(' '); sb.append(' ');
sb.append(isThrowable ? "E" : "I"); sb.append(isThrowable ? "E" : "I");
sb.append('/'); sb.append('/');