From 7264554de3e18f3cf9387c94b9c662a2946c57b4 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Wed, 6 Aug 2014 13:18:04 +0200
Subject: [PATCH] Added version number to about page.

---
 app/src/main/assets/www/about.html            |  4 +-
 .../ericsson/uecontrol/gui/AboutActivity.java | 42 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/app/src/main/assets/www/about.html b/app/src/main/assets/www/about.html
index 6a01ff2..d72411c 100755
--- a/app/src/main/assets/www/about.html
+++ b/app/src/main/assets/www/about.html
@@ -2,7 +2,9 @@
 <body>
     <h1>About</h1>
     <hr />
-    This application was developed by Ziver Koc (Ericsson AB).
+    Version {VERSION}, BuildNumber {BUILD}
+    <br /><br />
+    Application was developed by Ziver Koc (at Ericsson AB).
     <br /><br />
     <h3>Attributions:</h3>
     <ul>
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
index 4a019d9..8b2e6b2 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
@@ -1,19 +1,59 @@
 package com.ericsson.uecontrol.gui;
 
 import android.app.Activity;
+import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.webkit.WebView;
 
+import com.ericsson.uecontrol.BuildConfig;
+
+import org.apache.log4j.Logger;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 /**
  * Created by ezivkoc on 2014-07-28.
  */
 public class AboutActivity extends Activity{
+    private static final Logger log = Logger.getLogger(AboutActivity.class);
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        String html = "";
+        try {
+            html = getAssetContent("www/about.html");
+
+            // Replace keywords
+            html = html.replace("{VERSION}", BuildConfig.VERSION_NAME);
+            html = html.replace("{BUILD}", "" + BuildConfig.VERSION_CODE);
+        } catch(IOException e){
+            html = e.getMessage();
+            log.error(null, e);
+        }
+
         WebView view = new WebView(this);
-        view.loadUrl("file:///android_asset/www/about.html");
+        //view.loadUrl("file:///android_asset/www/about.html");
+        view.loadData(html, "text/html", "UTF-8");
         this.setContentView(view);
     }
+
+
+    public String getAssetContent(String file) throws IOException {
+        StringBuilder ret = new StringBuilder();
+        AssetManager assetManager = getResources().getAssets();
+        BufferedReader reader = new BufferedReader(
+                new InputStreamReader(
+                        assetManager.open(file)));
+        String line = null;
+        while ((line = reader.readLine()) != null) {
+            ret.append(line).append("\n");
+        }
+        reader.close();
+        return ret.toString();
+    }
 }
