Show git hash in dev builds

jclehner · Nov 14, 2013 · 5b77a22 · 5b77a22
1 parent 4da9f16
commit 5b77a22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+src/main/res/values/version.xml ident
diff --git a/src/main/java/at/jclehner/rxdroid/Version.java b/src/main/java/at/jclehner/rxdroid/Version.java
@@ -102,15 +102,15 @@ private static synchronized void init()
 		{
 			final Context c = RxDroid.getContext();
 			sVersion = c.getString(R.string.version);
-			sRevision = c.getString(R.string.vcs_revision);
+			sRevision = c.getString(R.string.git_hash);
 			sAppName = c.getString(R.string.app_name);
 
 			final StringTokenizer st = new StringTokenizer(sRevision);
 			if(st.countTokens() != 3)
 				return;
 
 			st.nextToken(); // discard
-			sRevision = st.nextToken();
+			sRevision = st.nextToken().substring(0, 8);
 		}
 	}
 

diff --git a/src/main/res/values/version.xml b/src/main/res/values/version.xml
@@ -1,7 +1,7 @@
 <resources>
     <item type="string" name="app_name">RxDroid</item>
     <item type="string" name="version">0.9.20</item>
-    <item type="string" name="vcs_revision">$Revision$</item>
+    <item type="string" name="git_hash">$Id$</item>
 
 	<item type="string" name="_msg_no_translation">RxDroid has not yet been translated to your language. If you want
 	    to help translating this app into %1$s, please contact me! Contact details can be found under "Preferences".