From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Thu, 21 Jun 2012 17:37:33 +0000 (+0200)
Subject: about dialog with version
X-Git-Tag: oc-android-1.4.3~352
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5fc8be29f962b0bc746105ed1b6c90570bc74389?ds=inline;hp=-c

about dialog with version
---

5fc8be29f962b0bc746105ed1b6c90570bc74389
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86af0694..a7ef3d05 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.123B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index 38be9b18..70600560 100644
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -7,4 +7,5 @@
     <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>
+    <item android:id="@+id/about_app" android:title="About" android:icon="@android:drawable/ic_menu_info_details"></item>
 </menu>
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index fae2b0fd..9430692e 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -37,6 +37,9 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -95,6 +98,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;
+    private static final int DIALOG_ABOUT_APP = 2;
     private static final int ACTION_SELECT_FILE = 1;
 
     @Override
@@ -161,6 +165,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             case R.id.action_settings: {
                 Intent settingsIntent = new Intent(this, Preferences.class);
                 startActivity(settingsIntent);
+                break;
+            }
+            case R.id.about_app : {
+                showDialog(DIALOG_ABOUT_APP);
+                break;
             }
             case android.R.id.home: {
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
@@ -354,7 +363,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     @Override
     protected Dialog onCreateDialog(int id) {
-        Dialog dialog;
+        Dialog dialog = null;
         AlertDialog.Builder builder;
         switch (id) {
         case DIALOG_SETUP_ACCOUNT:
@@ -366,6 +375,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setNegativeButton(android.R.string.cancel, this);
             dialog = builder.create();
             break;
+        case DIALOG_ABOUT_APP: {
+            builder = new AlertDialog.Builder(this);
+            builder.setTitle("About");
+            PackageInfo pkg;
+            try {
+                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
+                builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName );
+                builder.setIcon(android.R.drawable.ic_menu_info_details);
+                dialog = builder.create();
+            } catch (NameNotFoundException e) {
+                builder = null;
+                dialog = null;
+                e.printStackTrace();
+            }
+            break;
+        }
         case DIALOG_CREATE_DIR: {
             builder = new Builder(this);
             final EditText dirNameInput = new EditText(getBaseContext());