Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1369b7 authored by maniac103's avatar maniac103
Browse files

Merge pull request #233 from maniac103/improve-cert-fail-notification 

Improve certificate failure notifications.
parents d97d6b84 5d1e42c4

res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc 
    <string name="notification_action_read">Gelesen</string>

    <string name="notification_action_delete">Löschen</string>



    <string name="notification_certificate_error_title">Zertifikatsproblem</string>

    <string name="notification_certificate_error_title">Zertifikatsproblem (<xliff:g id="account">%s</xliff:g>)</string>

    <string name="notification_certificate_error_text">Servereinstellungen überprüfen</string>



    <string name="notification_bg_sync_ticker">Neue Nachrichten in <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> werden abgerufen</string>

res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ de plus</string> 
    <string name="notification_action_reply">Répondre</string>

    <string name="notification_action_read">Lire</string>

    <string name="notification_action_delete">Supprimer</string>

    <string name="notification_certificate_error_title">Erreur de certificat</string>

    <string name="notification_certificate_error_title">Erreur de certificat (<xliff:g id="account">%s</xliff:g>)</string>

    <string name="notification_certificate_error_text">Vérifier les paramètres serveur</string>



    <string name="notification_bg_sync_ticker">Vérification des messages\u00A0: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="notification_action_reply">Reply</string>

    <string name="notification_action_read">Read</string>

    <string name="notification_action_delete">Delete</string>

    <string name="notification_certificate_error_title">Certificate error</string>

    <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>

    <string name="notification_certificate_error_text">Check your server settings</string>



    <string name="notification_bg_sync_ticker">Checking mail: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>

src/com/fsck/k9/K9.java

+2 −2
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ public class K9 extends Application { 
    // Must not conflict with an account number

    public static final int FETCHING_EMAIL_NOTIFICATION      = -5000;

    public static final int SEND_FAILED_NOTIFICATION      = -1500;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_INCOMING = -2000;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_OUTGOING = -2500;

    public static final int CONNECTIVITY_ID = -3;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_INCOMING = -4;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_OUTGOING = -5;





    public static class Intents {

src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java

+5 −14
Original line number Diff line number Diff line
@@ -108,7 +108,11 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList 
                        finish();

                        return;

                    }

                    clearCertificateErrorNotifications();



                    final MessagingController ctrl = MessagingController.getInstance(getApplication());

                    ctrl.clearCertificateErrorNotifications(AccountSetupCheckSettings.this,

                            mAccount, mCheckIncoming, mCheckOutgoing);



                    if (mCheckIncoming) {

                        store = mAccount.getRemoteStore();
@@ -199,19 +203,6 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList 
        });

    }



    private void clearCertificateErrorNotifications() {

        final Application app = getApplication();

        final NotificationManager notifMgr = (NotificationManager) app

                .getSystemService(Context.NOTIFICATION_SERVICE);

        final String uuid = mAccount.getUuid();

        if (mCheckOutgoing){

            notifMgr.cancel(uuid, K9.CERTIFICATE_EXCEPTION_NOTIFICATION_OUTGOING);

        }

        if (mCheckIncoming){

            notifMgr.cancel(uuid, K9.CERTIFICATE_EXCEPTION_NOTIFICATION_INCOMING);

        }

    }



    private void showErrorDialog(final int msgResId, final Object... args) {

        mHandler.post(new Runnable() {

            public void run() {