Merge branch 'android-reauth-fix'

Fixes issues with reauthentication, in particular, to reestablish the
SA if MOBIKE is disabled.  The app currently can't handle
make-before-break reauthentication.  In part because necessary events are
currently not triggered.  So for now, we switch back to the classic
reauthentication approach.

src/frontends/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
 
-        versionCode 87
+        versionCode 88
-        versionName "2.5.3"
+        versionName "2.5.4"
 
         externalNativeBuild {
             ndkBuild {

src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c

@@ -504,6 +504,11 @@ static void set_options(char *logfile, jboolean ipv6)
 					"charon.retransmit_base", ANDROID_RETRANSMIT_BASE);
 	lib->settings->set_bool(lib->settings,
 					"charon.initiator_only", TRUE);
+	/* the service currently can't handle make-before-break reauth and assumes
+	 * the old SA is deleted before the replacement and intalls a special
+	 * replacement TUN device in-between */
+	lib->settings->set_bool(lib->settings,
+					"charon.make_before_break", FALSE);
 	lib->settings->set_bool(lib->settings,
 					"charon.close_ike_on_child_failure", TRUE);
 	lib->settings->set_bool(lib->settings,

src/frontends/android/app/src/main/play/release-notes/de-DE/default.txt

@@ -1,3 +1,7 @@
+# 2.5.4 #
+
+- Fixt Probleme beim Wiederherstellen der Verbindung
+
 # 2.5.3 #
 
 - Unterstützt die Verteilung von Passwörtern in verwalteten Profilen

src/frontends/android/app/src/main/play/release-notes/en-US/default.txt

@@ -1,3 +1,7 @@
+# 2.5.4 #
+
+- Fix issues when reestablishing the connection
+
 # 2.5.3 #
 
 - Add support for distributing passwords in managed profiles