Assembly v 7.3.1 (15.05.24)

adslbarxatov · May 14, 2024 · b0206a7 · b0206a7
1 parent 6294a5f
commit b0206a7
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -16,7 +16,7 @@ jobs:
 # Константы, используемые далее по тексту
     env:
       PROJ: ${{ github.event.repository.name }}
-      TAG: '7.3'
+      TAG: '7.3.1'
 
     steps:
 # Проверка состава репозитория (без анализа, как может показаться)

diff --git a/.release/Release.md b/.release/Release.md
@@ -1,4 +1,4 @@
-_Changes for v 7.3_:
+_Changes for v 7.3.1_:
 - Windows: application retargeted to `.NET Framework 4.8.1`;
 - `Android`: background service code has been reworked, a number of compatibility issues with `Android 13` have been fixed;
 - `Android`: app permissions checker has been rewritten;

diff --git a/.release/TablepediaNotifier.apk b/.release/TablepediaNotifier.apk
diff --git a/.release/UniNotifier.apk b/.release/UniNotifier.apk
diff --git a/.release/UniNotifier.exe b/.release/UniNotifier.exe
diff --git a/src/SettingsForm.cs b/src/SettingsForm.cs
@@ -78,7 +78,7 @@ public SettingsForm (NotificationsSet Notifications, uint UpdatingFrequencyStep,
 				NotificationsList.SelectedIndex = 0;
 
 			// Запуск
-			ProgramDescription.ShowTips (NSTipTypes.StartupTip);
+			ProgramDescription.ShowTip (NSTipTypes.StartupTip);
 			this.ShowDialog ();
 			}
 
@@ -116,7 +116,7 @@ private void SettingsForm_FormClosing (object sender, FormClosingEventArgs e)
 			RDGenerics.SaveWindowDimensions (this);
 
 			// Закрытие окна
-			ProgramDescription.ShowTips (NSTipTypes.ServiceLaunchTip);
+			ProgramDescription.ShowTip (NSTipTypes.ServiceLaunchTip);
 			}
 
 		// Загрузка значений в поля
@@ -126,7 +126,7 @@ private void NotificationsList_Select (object sender, EventArgs e)
 			if (NotificationsList.SelectedIndex < 0)
 				return;
 			else if (NotificationsList.SelectedIndex != 0)
-				ProgramDescription.ShowTips (NSTipTypes.CurrentNotButton);
+				ProgramDescription.ShowTip (NSTipTypes.CurrentNotButton);
 
 			// Загрузка
 			int i = NotificationsList.SelectedIndex;
@@ -151,7 +151,7 @@ private void NotificationsList_Select (object sender, EventArgs e)
 		private void BAdd_Click (object sender, EventArgs e)
 			{
 			// Добавление
-			ProgramDescription.ShowTips (NSTipTypes.AddButton);
+			ProgramDescription.ShowTip (NSTipTypes.AddButton);
 			UpdateItem (-1);
 
 			// Обновление кнопок
@@ -160,7 +160,7 @@ private void BAdd_Click (object sender, EventArgs e)
 
 		private void BUpdate_Click (object sender, EventArgs e)
 			{
-			ProgramDescription.ShowTips (NSTipTypes.ApplyButton);
+			ProgramDescription.ShowTip (NSTipTypes.ApplyButton);
 			UpdateItem (NotificationsList.SelectedIndex);
 			}
 
@@ -232,7 +232,7 @@ private void UpdateItem (int ItemNumber)
 		private void BDelete_Click (object sender, EventArgs e)
 			{
 			// Контроль
-			ProgramDescription.ShowTips (NSTipTypes.DeleteButton);
+			ProgramDescription.ShowTip (NSTipTypes.DeleteButton);
 			if (NotificationsList.SelectedIndex < 0)
 				{
 				RDGenerics.LocalizedMessageBox (RDMessageTypes.Warning_Center, "DeleteLineNotSpecified");
@@ -285,14 +285,14 @@ private void LanguageCombo_SelectedIndexChanged (object sender, EventArgs e)
 		// Подсказка по полю Occurence
 		private void OccurrenceField_Click (object sender, EventArgs e)
 			{
-			ProgramDescription.ShowTips (NSTipTypes.OccurenceTip);
+			ProgramDescription.ShowTip (NSTipTypes.OccurenceTip);
 			}
 
 		// Выгрузка настроек в буфер обмена
 		private void ShareSettings_Click (object sender, EventArgs e)
 			{
 			// Подсказка
-			ProgramDescription.ShowTips (NSTipTypes.ShareSettings);
+			ProgramDescription.ShowTip (NSTipTypes.ShareSettings);
 
 			// Выбор варианта выгрузки
 			switch (RDGenerics.MessageBox (RDMessageTypes.Question_Left, RDLocale.GetText ("ShareVariant"),
@@ -409,7 +409,7 @@ private void NotWizard_Click (object sender, EventArgs e)
 		private void ComparatorFlag_CheckedChanged (object sender, EventArgs e)
 			{
 			if (ComparatorFlag.Checked)
-				ProgramDescription.ShowTips (NSTipTypes.Threshold);
+				ProgramDescription.ShowTip (NSTipTypes.Threshold);
 
 			ComparatorType.Enabled = ComparatorValue.Enabled = MisfitsFlag.Enabled = ComparatorFlag.Checked;
 			}

diff --git a/src/UniNotifierForm.cs b/src/UniNotifierForm.cs
@@ -323,12 +323,13 @@ private void ShowSettings (object sender, EventArgs e)
 		// Переход на страницу сообщества
 		private void GoToLink (object sender, EventArgs e)
 			{
-			ProgramDescription.ShowTips (NSTipTypes.GoToButton);
+			ProgramDescription.ShowTip (NSTipTypes.GoToButton);
 			RDGenerics.RunURL (ns.Notifications[NamesCombo.SelectedIndex].Link);
+			this.Close ();
+
 			/*try
 				{
 				Process.Start (ns.Notifications[NamesCombo.SelectedIndex].Link);
-				this.Close ();
 				}
 			catch { }*/
 			}

diff --git a/src/android/AndroidManifest.G.xml b/src/android/AndroidManifest.G.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.RD_AAOW.UniNotifier"
-	android:installLocation="internalOnly" android:versionCode="600709" android:versionName="7.3">
+	android:installLocation="internalOnly" android:versionCode="600710" android:versionName="7.3.1">
 
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 

diff --git a/src/android/App.xaml.cs b/src/android/App.xaml.cs
@@ -175,7 +175,7 @@ public App (RDAppStartupFlags Flags)
 				}
 
 			// Не работают файловые операции
-			if (!Flags.HasFlag (RDAppStartupFlags.CanReadFiles) ||
+			else if (!Flags.HasFlag (RDAppStartupFlags.CanReadFiles) ||
 				!Flags.HasFlag (RDAppStartupFlags.CanWriteFiles))
 				{
 				allowServiceTip = AndroidSupport.ApplyLabelSettings (settingsPage, "AllowStartTip",

diff --git a/src/android/MainActivity.cs b/src/android/MainActivity.cs
@@ -89,13 +89,13 @@ protected override void OnCreate (Bundle savedInstanceState)
 
 			// Для Android 12 и выше запуск службы возможен только здесь
 			if (flags.HasFlag (RDAppStartupFlags.CanShowNotifications))
-				if (!AndroidSupport.AllowServiceToStart || !AndroidSupport.IsForegroundStartableFromResumeEvent)
-					{
-					if (AndroidSupport.IsForegroundAvailable)
-						StartForegroundService (mainService);
-					else
-						StartService (mainService);
-					}
+			/*if (!AndroidSupport.AllowServiceToStart || !AndroidSupport.IsForegroundStartableFromResumeEvent)*/
+				{
+				if (AndroidSupport.IsForegroundAvailable)
+					StartForegroundService (mainService);
+				else
+					StartService (mainService);
+				}
 
 			// Запуск
 			if (AndroidSupport.KeepScreenOn)
@@ -321,7 +321,7 @@ private async void TimerTick ()
 					defaultChannelID : urgentChannelID);
 			notBuilder.SetColor (ProgramDescription.NSet.HasUrgentNotifications ? urgentColor : defaultColor);
 
-// Формирование сообщения
+			// Формирование сообщения
 notMessage:
 			notBuilder.SetContentText (msg);
 			notTextStyle.BigText (msg);