From da1f1d06485a67b7062970249282999a4a120668 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Mar 2020 08:40:26 +0100
Subject: [PATCH] Small improvement

---
 .../java/eu/faircode/email/FragmentMessages.java     | 11 +----------
 app/src/main/java/eu/faircode/email/Helper.java      | 12 ++++++++++++
 app/src/main/java/eu/faircode/email/Log.java         |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 57fb934803..069c898171 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -31,7 +31,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.IntentSender;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -3243,15 +3242,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         long now = new Date().getTime();
         long later = prefs.getLong("review_later", -1);
         if (later < 0) {
-            long installed = 0;
-            try {
-                PackageInfo pi = pm.getPackageInfo(BuildConfig.APPLICATION_ID, 0);
-                if (pi != null)
-                    installed = pi.firstInstallTime;
-            } catch (Throwable ex) {
-                Log.e(ex);
-            }
-
+            long installed = Helper.getInstallTime(getContext());
             Log.i("Review installed=" + new Date(installed));
 
             if (installed + REVIEW_ASK_DELAY > now)
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 5ff99be2f4..9c3d7196b6 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -546,6 +546,18 @@ public class Helper {
         return intent;
     }
 
+    static long getInstallTime(Context context) {
+        try {
+            PackageManager pm = context.getPackageManager();
+            PackageInfo pi = pm.getPackageInfo(BuildConfig.APPLICATION_ID, 0);
+            if (pi != null)
+                return pi.firstInstallTime;
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+        return 0;
+    }
+
     // Graphics
 
     static int dp2pixels(Context context, int dp) {
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 829de9f74a..081fb08d56 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -988,7 +988,8 @@ public class Log {
 
         sb.append("\r\n");
 
-        sb.append(new Date().toString()).append("\r\n");
+        sb.append(new Date(Helper.getInstallTime(context))).append("\r\n");
+        sb.append(new Date()).append("\r\n");
 
         sb.append("\r\n");