arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 08:10:58 +00:00
Code Issues Releases Wiki Activity

BuildConfig: use build time instead of current time for timestamp

Browse Source
This commit is contained in:
Ricki Hirner 2015-11-27 14:04:24 +01:00
parent b63fc70cfb
commit 9dbc32d30b
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -20,7 +20,7 @@ android {
versionCode 86 versionCode 86
versionName "0.9.1.2" versionName "0.9.1.2"
buildConfigField "java.util.Date", "buildTime", "new java.util.Date()" buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
} }
buildTypes { buildTypes {

3
app/src/main/java/at/bitfire/davdroid/HttpClient.java
View File

@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.net.CookieManager; import java.net.CookieManager;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -40,7 +41,7 @@ public class HttpClient extends OkHttpClient {
static final String userAgent; static final String userAgent;
static { static {
String date = new SimpleDateFormat("yyyy/MM/dd", Locale.US).format(BuildConfig.buildTime); String date = new SimpleDateFormat("yyyy/MM/dd", Locale.US).format(new Date(BuildConfig.buildTime));
userAgent = "DAVdroid/" + BuildConfig.VERSION_NAME + " (" + date + "; dav4android) Android/" + Build.VERSION.RELEASE; userAgent = "DAVdroid/" + BuildConfig.VERSION_NAME + " (" + date + "; dav4android) Android/" + Build.VERSION.RELEASE;
} }

3
app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
View File

@ -34,6 +34,7 @@ import org.apache.commons.lang3.text.WordUtils;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.util.Date;
import at.bitfire.dav4android.exception.HttpException; import at.bitfire.dav4android.exception.HttpException;
import at.bitfire.davdroid.BuildConfig; import at.bitfire.davdroid.BuildConfig;
@ -191,7 +192,7 @@ public class DebugInfoActivity extends Activity implements LoaderManager.LoaderC
} catch(PackageManager.NameNotFoundException e) {} } catch(PackageManager.NameNotFoundException e) {}
report.append( report.append(
"SOFTWARE INFORMATION\n" + "SOFTWARE INFORMATION\n" +
"DAVdroid version: " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ") " + BuildConfig.buildTime.toString() + "\n" + "DAVdroid version: " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ") " + new Date(BuildConfig.buildTime) + "\n" +
"Installed from: " + installedFrom + "\n" + "Installed from: " + installedFrom + "\n" +
"JB Workaround installed: " + (workaroundInstalled ? "yes" : "no") + "\n\n" "JB Workaround installed: " + (workaroundInstalled ? "yes" : "no") + "\n\n"
); );