Obtain version number programmatically in AskPassword.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1728 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 166a92d0b5cd0d281120b9b2b725d6d962753592..83bf9bdaea120ae1224f2618784280f7efda860c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,6 @@
 <resources>
     <string name="app_name">OI Safe</string>\r
     <string name="authors">Steven Osborn, Randy McEoin</string>\r
-    <string name="version">0.6.0</string>\r
     <string name="empty_safe">No Passwords present for this category.</string>\r
     <string name="empty_category">No categories present.  Please add one via Menu->Add</string>\r
     <string name="password_lock">Lock</string>\r

diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index 61141174f7d3820ef666340efa1a80dad8eb49dc..7b7ae8ceea302d3b07c756996a3057856c2ca908 100644 (file)
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -16,6 +16,8 @@
  */
 package org.openintents.safe;
 
+import org.openintents.util.VersionUtils;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -83,8 +85,8 @@ public class AskPassword extends Activity {
                ImageView icon = (ImageView) findViewById(R.id.entry_icon);
                icon.setImageResource(R.drawable.passicon);
                TextView header = (TextView) findViewById(R.id.entry_header);
-               String version = getString(R.string.version);
-               String appName = getString(R.string.app_name);
+               String version = VersionUtils.getVersionNumber(this);
+               String appName = VersionUtils.getApplicationName(this);
                String head = appName + " " + version + "\n";
                header.setText(head);
 

diff --git a/src/org/openintents/safe/LogOffActivity.java b/src/org/openintents/safe/LogOffActivity.java
index f939e58bb2e212856e6a8e998851433643121234..690d4e2de942e3572aee6767fb22432cbf1d31aa 100644 (file)
--- a/src/org/openintents/safe/LogOffActivity.java
+++ b/src/org/openintents/safe/LogOffActivity.java
@@ -1,6 +1,7 @@
 package org.openintents.safe;
 
 import org.openintents.safe.service.ServiceDispatchImpl;
+import org.openintents.util.VersionUtils;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -19,8 +20,8 @@ public class LogOffActivity extends Activity {
                        ImageView icon = (ImageView) findViewById(R.id.logoff_icon);
                        icon.setImageResource(R.drawable.passicon);
                        TextView header = (TextView) findViewById(R.id.logoff_header);
-                       String version = getString(R.string.version);
-                       String appName = getString(R.string.app_name);
+                       String version = VersionUtils.getVersionNumber(this);
+                       String appName = VersionUtils.getApplicationName(this);
                        String head = appName + " " + version + "\n";
                        header.setText(head);
                Button logoffButton = (Button) findViewById(R.id.logoff_button);

diff --git a/src/org/openintents/util/VersionUtils.java b/src/org/openintents/util/VersionUtils.java
new file mode 100644 (file)
index 0000000..06d721f
--- /dev/null
+++ b/src/org/openintents/util/VersionUtils.java
@@ -0,0 +1,50 @@
+package org.openintents.util;\r
+\r
+import android.content.Context;\r
+import android.content.pm.PackageInfo;\r
+import android.content.pm.PackageManager;\r
+import android.util.Log;\r
+\r
+/**\r
+ * \r
+ * @version 2009-01-15\r
+ * @author Peli\r
+ *\r
+ */\r
+public class VersionUtils {\r
+       \r
+       private static final String TAG = "VersionUtils";\r
+\r
+       /**\r
+        * Get current version number.\r
+        * \r
+        * @return\r
+        */\r
+       public static String getVersionNumber(Context context) {\r
+               String version = "?";\r
+               try {\r
+                       PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);\r
+                       version = pi.versionName;\r
+               } catch (PackageManager.NameNotFoundException e) {\r
+                       Log.e(TAG, "Package name not found", e);\r
+               };\r
+               return version;\r
+       }\r
+       \r
+       /**\r
+        * Get application name.\r
+        * \r
+        * @return\r
+        */\r
+       public static String getApplicationName(Context context) {\r
+               String name = "?";\r
+               try {\r
+                       PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);\r
+                       name = context.getString(pi.applicationInfo.labelRes);\r
+               } catch (PackageManager.NameNotFoundException e) {\r
+                       Log.e(TAG, "Package name not found", e);\r
+               };\r
+               return name;\r
+       }\r
+\r
+}\r