Log revision

app/src/main/java/eu/faircode/email/ActivityBase.java

@@ -87,7 +87,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         EntityLog.log(this, "Activity create " + this.getClass().getName() +
-                " version=" + BuildConfig.VERSION_NAME +
+                " version=" + BuildConfig.VERSION_NAME + BuildConfig.REVISION +
                 " process=" + android.os.Process.myPid());
         Intent intent = getIntent();
         if (intent != null)

app/src/main/java/eu/faircode/email/ApplicationEx.java

@@ -97,7 +97,7 @@ public class ApplicationEx extends Application
 
         long start = new Date().getTime();
         Log.i("App create" +
-                " version=" + BuildConfig.VERSION_NAME +
+                " version=" + BuildConfig.VERSION_NAME + BuildConfig.REVISION +
                 " process=" + android.os.Process.myPid());
         Log.logMemory(this, "App");
 

app/src/main/java/eu/faircode/email/Helper.java

@@ -835,7 +835,7 @@ public class Helper {
         return Uri.parse(SUPPORT_URI)
                 .buildUpon()
                 .appendQueryParameter("product", "fairemailsupport")
-                .appendQueryParameter("version", BuildConfig.VERSION_NAME)
+                .appendQueryParameter("version", BuildConfig.VERSION_NAME + BuildConfig.REVISION)
                 .appendQueryParameter("locale", slocale.toString())
                 .appendQueryParameter("language", language == null ? "" : language)
                 .appendQueryParameter("installed", Helper.hasValidFingerprint(context) ? "" : "Other")
@@ -844,7 +844,7 @@ public class Helper {
 
     static Intent getIntentIssue(Context context) {
         if (ActivityBilling.isPro(context)) {
-            String version = BuildConfig.VERSION_NAME + "/" +
+            String version = BuildConfig.VERSION_NAME + BuildConfig.REVISION + "/" +
                     (Helper.hasValidFingerprint(context) ? "1" : "3") +
                     (BuildConfig.PLAY_STORE_RELEASE ? "p" : "") +
                     (BuildConfig.DEBUG ? "d" : "") +

app/src/main/java/eu/faircode/email/Log.java

@@ -1512,7 +1512,7 @@ public class Log {
         Log.w("Writing exception to " + file);
 
         try (FileWriter out = new FileWriter(file, true)) {
-            out.write(BuildConfig.VERSION_NAME + " " + new Date() + "\r\n");
+            out.write(BuildConfig.VERSION_NAME + BuildConfig.REVISION + " " + new Date() + "\r\n");
             out.write(ex + "\r\n" + android.util.Log.getStackTraceString(ex) + "\r\n");
         } catch (IOException e) {
             Log.e(e);
@@ -1551,7 +1551,8 @@ public class Log {
             draft.msgid = EntityMessage.generateMessageId();
             draft.thread = draft.msgid;
             draft.to = new Address[]{myAddress()};
-            draft.subject = context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " debug info";
+            draft.subject = context.getString(R.string.app_name) + " " +
+                    BuildConfig.VERSION_NAME + BuildConfig.REVISION + " debug info";
             draft.received = new Date().getTime();
             draft.seen = true;
             draft.ui_seen = true;
@@ -1671,7 +1672,7 @@ public class Log {
                 context.getString(R.string.app_name),
                 BuildConfig.APPLICATION_ID,
                 installer,
-                BuildConfig.VERSION_NAME,
+                BuildConfig.VERSION_NAME + BuildConfig.REVISION,
                 Helper.hasValidFingerprint(context) ? "1" : "3",
                 BuildConfig.PLAY_STORE_RELEASE ? "p" : "",
                 Helper.hasPlayStore(context) ? "s" : "",

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -166,7 +166,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
     @Override
     public void onCreate() {
         EntityLog.log(this, "Service create" +
-                " version=" + BuildConfig.VERSION_NAME +
+                " version=" + BuildConfig.VERSION_NAME + BuildConfig.REVISION +
                 " process=" + android.os.Process.myPid());
         super.onCreate();