From da3665c25b7de52c3f6818213a75ed5a92102a98 Mon Sep 17 00:00:00 2001 From: Rick Brown Date: Wed, 12 Jul 2023 18:40:57 -0400 Subject: [PATCH] Fix NoNet compilation error --- .../settings/DatabaseSettingsActivity.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/keepass2android/settings/DatabaseSettingsActivity.cs b/src/keepass2android/settings/DatabaseSettingsActivity.cs index 73655b61..bfe934da 100644 --- a/src/keepass2android/settings/DatabaseSettingsActivity.cs +++ b/src/keepass2android/settings/DatabaseSettingsActivity.cs @@ -175,7 +175,12 @@ namespace keepass2android FindPreference(GetString(Resource.String.DebugLog_key)).PreferenceChange += OnDebugLogChanged; FindPreference(GetString(Resource.String.DebugLog_send_key)).PreferenceClick += OnSendDebug; + +#if !EXCLUDE_JAVAFILESTORAGE && !NoNet FindPreference(GetString(Resource.String.JSchDebug_key)).PreferenceChange += OnJSchDebugChanged; +#else + FindPreference(GetString(Resource.String.JSchDebug_key)).Enabled = false; +#endif HashSet supportedLocales = new HashSet() { "en", "af", "ar", "az", "be", "bg", "ca", "cs", "da", "de", "el", "es", "eu", "fa", "fi", "fr", "gl", "he", "hr", "hu", "id", "in", "it", "iw", "ja", "ko", "ml", "nb", "nl", "nn", "no", "pl", "pt", "ro", "ru", "si", "sk", "sl", "sr", "sv", "tr", "uk", "vi", "zh" }; @@ -423,11 +428,14 @@ namespace keepass2android else Kp2aLog.FinishLogFile(); +#if !EXCLUDE_JAVAFILESTORAGE && !NoNet bool jschLogEnable = PreferenceManager.GetDefaultSharedPreferences(Application.Context) .GetBoolean(Application.Context.GetString(Resource.String.JSchDebug_key), false); SetJSchLogging(jschLogEnable); +#endif } +#if !EXCLUDE_JAVAFILESTORAGE && !NoNet private void OnJSchDebugChanged(object sender, Preference.PreferenceChangeEventArgs e) { SetJSchLogging((bool)e.NewValue); @@ -443,8 +451,9 @@ namespace keepass2android } sftpStorage.SetJschLogging(enabled, logFilename); } +#endif - private void AlgorithmPrefChange(object sender, Preference.PreferenceChangeEventArgs preferenceChangeEventArgs) + private void AlgorithmPrefChange(object sender, Preference.PreferenceChangeEventArgs preferenceChangeEventArgs) { var db = App.Kp2a.CurrentDb; var previousCipher = db.KpDatabase.DataCipherUuid; @@ -887,7 +896,7 @@ namespace keepass2android #if DEBUG preference.Enabled = (usageCount > 1); -#else +#else preference.Enabled = (usageCount > 50); #endif preference.PreferenceChange += delegate(object sender, Preference.PreferenceChangeEventArgs args)