add menu in SelectCurrentDbActivity, closes https://github.com/PhilippC/keepass2android/issues/988

.gitignore

@@ -170,3 +170,4 @@ src/java/Keepass2AndroidPluginSDK2/build/generated/mockable-Google-Inc.-Google-A
 /src/java/KP2ASoftkeyboard_AS/app/.cxx
 /src/java/KP2ASoftkeyboard_AS/app/src/main/libs
 /src/java/KP2AKdbLibrary/app/.cxx
+/src/ActionViewFilterTest

src/keepass2android/GroupBaseActivity.cs

@@ -1033,6 +1033,7 @@ namespace keepass2android
                     return Util.GotoDonateUrl(this);
                 case Resource.Id.menu_lock:
                     App.Kp2a.Lock();
+                    Finish();
                     return true;
                 case Resource.Id.menu_search_dummy:
                     StartActivityForResult(typeof(CloseImmediatelyActivity), RequestCodeActivateRealSearch);

src/keepass2android/Resources/menu/menu_selectdb.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of Keepass2Android, Copyright 2020 Philipp Crocoll. 
+
+  Keepass2Android is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item android:id="@+id/menu_search_advanced"
+        android:icon="@drawable/ic_menu_search"
+        android:title="@string/menu_search_advanced"
+        app:showAsAction="always"
+    />
+  <item android:id="@+id/menu_lock"
+      android:icon="@drawable/ic_menu_lock"
+      android:title="@string/menu_lock"
+      app:showAsAction="ifRoom"
+    />
+  <item android:id="@+id/menu_donate"
+        android:icon="@drawable/ic_menu_donatebeer"
+      android:title="@string/menu_donate"
+      app:showAsAction="ifRoom"
+    />
+  <item android:id="@+id/menu_app_settings"
+      android:icon="@drawable/ic_menu_settings"
+      android:title="@string/menu_app_settings"
+      app:showAsAction="ifRoom"
+    />
+  
+
+
+</menu>

src/keepass2android/SelectCurrentDbActivity.cs

@@ -183,6 +183,38 @@ namespace keepass2android
             AppTask.LaunchFirstGroupActivity(this);
         }
 
+        public override bool OnCreateOptionsMenu(IMenu menu)
+        {
+            MenuInflater inflater = MenuInflater;
+            inflater.Inflate(Resource.Menu.menu_selectdb, menu);
+            return base.OnCreateOptionsMenu(menu);
+        }
+
+        public override bool OnOptionsItemSelected(IMenuItem item)
+        {
+            switch (item.ItemId)
+            {
+                case Resource.Id.menu_search_advanced:
+                    if (App.Kp2a.CurrentDb == null)
+                        App.Kp2a.CurrentDb = App.Kp2a.OpenDatabases.First();
+                    Intent i = new Intent(this, typeof(SearchActivity));
+                    AppTask.ToIntent(i);
+                    StartActivityForResult(i, 0);
+                    return true;
+                case Resource.Id.menu_lock:
+                    App.Kp2a.Lock();
+                    return true;
+                case Resource.Id.menu_donate:
+                    return Util.GotoDonateUrl(this);
+                case Resource.Id.menu_app_settings:
+                    DatabaseSettingsActivity.Launch(this);
+                    return true;
+                default:
+                    break;
+            }
+            return base.OnOptionsItemSelected(item);
+        }
+
         protected override void OnCreate(Bundle savedInstanceState)
         {
             base.OnCreate(savedInstanceState);

src/keepass2android/keepass2android.csproj

@@ -219,6 +219,7 @@
     <Compile Include="settings\DatabaseSettingsActivity.cs" />
     <Compile Include="intents\Intents.cs" />
     <Compile Include="SelectCurrentDbActivity.cs" />
+    <Compile Include="settings\ExportKeyfileActivity.cs" />
     <Compile Include="settings\IconSetPreference.cs" />
     <Compile Include="SwitchImeActivity.cs" />
     <Compile Include="timeout\TimeoutHelper.cs" />
@@ -710,56 +711,55 @@
     <AndroidResource Include="Resources\values\strings.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
-	<AndroidResource Include="Resources/values-af/strings.xml" />
+    <AndroidResource Include="Resources/values-af/strings.xml" />
-<AndroidResource Include="Resources/values-ar/strings.xml" />
+    <AndroidResource Include="Resources/values-ar/strings.xml" />
-<AndroidResource Include="Resources/values-az/strings.xml" />
+    <AndroidResource Include="Resources/values-az/strings.xml" />
-<AndroidResource Include="Resources/values-bg-rBG/strings.xml" />
+    <AndroidResource Include="Resources/values-bg-rBG/strings.xml" />
-<AndroidResource Include="Resources/values-bg/strings.xml" />
+    <AndroidResource Include="Resources/values-bg/strings.xml" />
-<AndroidResource Include="Resources/values-ca/strings.xml" />
+    <AndroidResource Include="Resources/values-ca/strings.xml" />
-<AndroidResource Include="Resources/values-cs/strings.xml" />
+    <AndroidResource Include="Resources/values-cs/strings.xml" />
-<AndroidResource Include="Resources/values-da/strings.xml" />
+    <AndroidResource Include="Resources/values-da/strings.xml" />
-<AndroidResource Include="Resources/values-de/strings.xml" />
+    <AndroidResource Include="Resources/values-de/strings.xml" />
-<AndroidResource Include="Resources/values-el/strings.xml" />
+    <AndroidResource Include="Resources/values-el/strings.xml" />
-<AndroidResource Include="Resources/values-es/strings.xml" />
+    <AndroidResource Include="Resources/values-es/strings.xml" />
-<AndroidResource Include="Resources/values-eu/strings.xml" />
+    <AndroidResource Include="Resources/values-eu/strings.xml" />
-<AndroidResource Include="Resources/values-fa-rIR/strings.xml" />
+    <AndroidResource Include="Resources/values-fa-rIR/strings.xml" />
-<AndroidResource Include="Resources/values-fa/strings.xml" />
+    <AndroidResource Include="Resources/values-fa/strings.xml" />
-<AndroidResource Include="Resources/values-fi/strings.xml" />
+    <AndroidResource Include="Resources/values-fi/strings.xml" />
-<AndroidResource Include="Resources/values-fr/strings.xml" />
+    <AndroidResource Include="Resources/values-fr/strings.xml" />
-<AndroidResource Include="Resources/values-gl-rES/strings.xml" />
+    <AndroidResource Include="Resources/values-gl-rES/strings.xml" />
-<AndroidResource Include="Resources/values-gl/strings.xml" />
+    <AndroidResource Include="Resources/values-gl/strings.xml" />
-<AndroidResource Include="Resources/values-he/strings.xml" />
+    <AndroidResource Include="Resources/values-he/strings.xml" />
-<AndroidResource Include="Resources/values-hr-rHR/strings.xml" />
+    <AndroidResource Include="Resources/values-hr-rHR/strings.xml" />
-<AndroidResource Include="Resources/values-hr/strings.xml" />
+    <AndroidResource Include="Resources/values-hr/strings.xml" />
-<AndroidResource Include="Resources/values-hu/strings.xml" />
+    <AndroidResource Include="Resources/values-hu/strings.xml" />
-<AndroidResource Include="Resources/values-id/strings.xml" />
+    <AndroidResource Include="Resources/values-id/strings.xml" />
-<AndroidResource Include="Resources/values-in/strings.xml" />
+    <AndroidResource Include="Resources/values-in/strings.xml" />
-<AndroidResource Include="Resources/values-it/strings.xml" />
+    <AndroidResource Include="Resources/values-it/strings.xml" />
-<AndroidResource Include="Resources/values-iw/strings.xml" />
+    <AndroidResource Include="Resources/values-iw/strings.xml" />
-<AndroidResource Include="Resources/values-ja/strings.xml" />
+    <AndroidResource Include="Resources/values-ja/strings.xml" />
-<AndroidResource Include="Resources/values-ko/strings.xml" />
+    <AndroidResource Include="Resources/values-ko/strings.xml" />
-<AndroidResource Include="Resources/values-ml/strings.xml" />
+    <AndroidResource Include="Resources/values-ml/strings.xml" />
-<AndroidResource Include="Resources/values-nb/strings.xml" />
+    <AndroidResource Include="Resources/values-nb/strings.xml" />
-<AndroidResource Include="Resources/values-nl/strings.xml" />
+    <AndroidResource Include="Resources/values-nl/strings.xml" />
-<AndroidResource Include="Resources/values-nn/strings.xml" />
+    <AndroidResource Include="Resources/values-nn/strings.xml" />
-<AndroidResource Include="Resources/values-no/strings.xml" />
+    <AndroidResource Include="Resources/values-no/strings.xml" />
-<AndroidResource Include="Resources/values-pl/strings.xml" />
+    <AndroidResource Include="Resources/values-pl/strings.xml" />
-<AndroidResource Include="Resources/values-pt-rBR/strings.xml" />
+    <AndroidResource Include="Resources/values-pt-rBR/strings.xml" />
-<AndroidResource Include="Resources/values-pt-rPT/strings.xml" />
+    <AndroidResource Include="Resources/values-pt-rPT/strings.xml" />
-<AndroidResource Include="Resources/values-pt/strings.xml" />
+    <AndroidResource Include="Resources/values-pt/strings.xml" />
-<AndroidResource Include="Resources/values-ro/strings.xml" />
+    <AndroidResource Include="Resources/values-ro/strings.xml" />
-<AndroidResource Include="Resources/values-ru/strings.xml" />
+    <AndroidResource Include="Resources/values-ru/strings.xml" />
-<AndroidResource Include="Resources/values-sk/strings.xml" />
+    <AndroidResource Include="Resources/values-sk/strings.xml" />
-<AndroidResource Include="Resources/values-sl/strings.xml" />
+    <AndroidResource Include="Resources/values-sl/strings.xml" />
-<AndroidResource Include="Resources/values-sr/strings.xml" />
+    <AndroidResource Include="Resources/values-sr/strings.xml" />
-<AndroidResource Include="Resources/values-sv/strings.xml" />
+    <AndroidResource Include="Resources/values-sv/strings.xml" />
-<AndroidResource Include="Resources/values-tr/strings.xml" />
+    <AndroidResource Include="Resources/values-tr/strings.xml" />
-<AndroidResource Include="Resources/values-uk/strings.xml" />
+    <AndroidResource Include="Resources/values-uk/strings.xml" />
-<AndroidResource Include="Resources/values-vi/strings.xml" />
+    <AndroidResource Include="Resources/values-vi/strings.xml" />
-<AndroidResource Include="Resources/values-zh/strings.xml" />
+    <AndroidResource Include="Resources/values-zh/strings.xml" />
-<AndroidResource Include="Resources/values-zh-rCN/strings.xml" />
+    <AndroidResource Include="Resources/values-zh-rCN/strings.xml" />
-<AndroidResource Include="Resources/values-zh-rTW/strings.xml" />
+    <AndroidResource Include="Resources/values-zh-rTW/strings.xml" />
-
     <AndroidResource Include="Resources\layout\search.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -2064,6 +2064,9 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\menu\menu_selectdb.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>