awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix: Accept the deprecated 3 as an alias for 2 (#3410)

Browse Source
This commit is contained in:
Hocuri
2024-11-05 15:28:50 +01:00
committed by GitHub
parent 56a0607a5e
commit 9679b22072
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+6 -4
View File
@@ -31,7 +31,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
@@ -225,9 +224,12 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
authMethod.setSelection(sel);
expandAdvanced = expandAdvanced || sel != 0;
int certCheckFlags = DcHelper.getInt(this, "imap_certificate_checks");
certCheck.setSelection(certCheckFlags);
expandAdvanced = expandAdvanced || certCheckFlags != 0;
int imapCertificateChecks = DcHelper.getInt(this, "imap_certificate_checks");
if (imapCertificateChecks == 3) {
imapCertificateChecks = 2; // 3 is a deprecated alias for 2
}
certCheck.setSelection(imapCertificateChecks);
expandAdvanced = expandAdvanced || imapCertificateChecks != 0;
} else if (getIntent() != null && getIntent().getBundleExtra(ACCOUNT_DATA) != null) {
// Companion app might have sent account data
Bundle b = getIntent().getBundleExtra(ACCOUNT_DATA);
src/main/res/layout/registration_activity.xml
-1
View File
@@ -384,7 +384,6 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:entries="@array/pref_dc_certck_entries"
android:entryValues="@array/pref_dc_certck_values"
app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
app:layout_constraintStart_toStartOf="@id/guideline_root_start"
app:layout_constraintTop_toBottomOf="@id/cert_check_label" />
src/main/res/values/arrays.xml
-6
View File
@@ -158,12 +158,6 @@
<item>@string/accept_invalid_certificates</item>
</string-array>
<string-array name="pref_dc_certck_values">
<item>0</item>
<item>1</item>
<item>3</item>
</string-array>
<!-- discrete MIME type (the part before the "/") -->