Skip to content

Commit 0ba4cec

Browse files
committed
Merge remote-tracking branch 'origin/v1.14'
2 parents 5678677 + 8769146 commit 0ba4cec

File tree

7 files changed

+23
-29
lines changed

7 files changed

+23
-29
lines changed

src/keepass2android-app/AboutDialog.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ protected override void OnCreate(Bundle savedInstanceState)
8787
{
8888
App.Kp2a.ShowMessage(Context, Resource.String.no_url_handler, MessageSeverity.Error);
8989
}
90-
}; FindViewById(Resource.Id.donate).Click += delegate
91-
{
92-
Util.GotoDonateUrl(Context);
9390
};
9491
}
9592

src/keepass2android-app/Manifests/AndroidManifest_net.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
1717
-->
1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:versionCode="243"
20-
android:versionName="1.15-pre2"
19+
android:versionCode="244"
20+
android:versionName="1.15-pre3"
2121
package="keepass2android.keepass2android"
2222
xmlns:tools="http://schemas.android.com/tools"
2323
android:installLocation="auto">

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
1717
-->
1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:versionCode="243"
20-
android:versionName="1.15-pre2"
19+
android:versionCode="244"
20+
android:versionName="1.15-pre3"
2121
package="keepass2android.keepass2android_nonet"
2222
xmlns:tools="http://schemas.android.com/tools"
2323
android:installLocation="auto">

src/keepass2android-app/Resources/layout/about.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,11 @@
8989
android:text="@string/translate_app"
9090
/>
9191

92-
<Button
93-
android:id="@+id/donate"
94-
android:layout_width="fill_parent"
95-
android:layout_height="wrap_content"
96-
android:layout_below="@id/translate"
97-
android:text="@string/menu_donate"
98-
/>
99-
100-
10192
<ImageView
10293
android:id="@+id/divider3"
10394
android:layout_width="fill_parent"
10495
android:layout_height="wrap_content"
105-
android:layout_below="@id/donate"
96+
android:layout_below="@id/translate"
10697
android:scaleType="fitXY"
10798
android:src="@android:drawable/divider_horizontal_dark" />
10899
<TextView

src/keepass2android-app/Resources/layout/plugin_list.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
android:layout_height="wrap_content"
77
android:orientation="vertical"
88
android:padding="12dp">
9-
<Button
10-
android:layout_width="fill_parent"
11-
android:layout_height="wrap_content"
12-
android:textAppearance="?android:attr/textAppearanceMedium"
13-
android:text="@string/plugin_web"
14-
style="@style/PaddedElement"
15-
android:id="@+id/btnPluginsOnline"
16-
android:layout_gravity="left|center_vertical" />
179
<ListView
1810
android:id="@android:id/list"
1911
android:layout_width="fill_parent"

src/keepass2android-app/Resources/values/strings.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
<?xml version='1.0' encoding='utf-8'?>
2+
<!--
3+
This file is part of Keepass2Android, Copyright 2025 Philipp Crocoll.
4+
5+
Keepass2Android is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
Keepass2Android is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
219
<resources>
320
<string name="about_feedback">Feedback</string>
421
<string name="AboutText">Keepass2Android is a password manager providing read/write access to KeePass 2.x databases on Android.</string>
@@ -760,6 +777,7 @@
760777
<string-array name="ChangeLog_1_14">
761778
<item>Update to .net 9 and Target SDK version 35. This comes with transparent status bar on Android 15 because edge-to-edge is now the default.</item>
762779
<item>Minor UI improvements</item>
780+
<item>Removed buttons for donate and find plugins, in order to comply with Google Play policies</item>
763781
</string-array>
764782

765783
<string-array name="ChangeLog_1_14_net">

src/keepass2android-app/pluginhost/PluginListActivity.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ protected override void OnCreate(Bundle bundle)
5252
StartActivity(i);
5353
};
5454

55-
FindViewById<Button>(Resource.Id.btnPluginsOnline).Click += delegate
56-
{
57-
Util.GotoUrl(this, "https://github.com/PhilippC/keepass2android/blob/master/docs/Available-Plug-ins.md");
58-
};
5955

6056
}
6157
protected override void OnResume()

0 commit comments

Comments
 (0)