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

Commit 14055691 authored by Jesse Vincent's avatar Jesse Vincent
Browse files

Merge branch 'mail-on-sd' 

* mail-on-sd: (40 commits)
  Added more comments to explain how the locking mecanism works for LocalStore
  Fixed wrong method being called during experimental provider initialization (since provider isn't enabled, that didn't harm)
  Add more comments about how the various StorageProviders work and how they're enabled
  find src/com/fsck/ -name \*.java|xargs astyle --style=ansi --mode=java --indent-switches --indent=spaces=4 --convert-tabs
  French localization for storage related settings
  Remove unused SD card strings (replaced with storage indirection)
  Merge mail-on-sd branch from trunk
  Reset mail service on storage mount (even if no account uses the storage, to be improved)
  find src/com/fsck/ -name \*.java|xargs astyle --style=ansi --mode=java --indent-switches --indent=spaces=4 --convert-tabs
  Migraion -> Migration
  move the Storage location preference into preferences rather than the wizard.
  Made LocalStore log less verbose Added @Override compile checks
  Added ACTION_SHUTDOWN broadcast receiver to properly initiate shutdown sequence (not yet implemented) and cancel any scheduled Intent
  Be more consistent about which SQLiteDatabase variable is used (from instance variable to argument variable) to make code more refactoring-friendly (class is already big, code extraction should be easier if not referencing the instance variable).
  Added transaction timing logging
  Factorised storage lock/transaction handling code for regular operations.
  Use DB transactions to batch modifications (makes code more robust / could improve performances)
  Merge mail-on-sd branch from trunk
  Update issue 888 Added DB close on unmount / DB open on mount
  Update issue 888 Back to account list when underlying storage not available/unmounting in MessageView / MessageList
  ...
parent 44496424

.project

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>k9mail</name>

	<name>k9mail-sdcard</name>

	<comment></comment>

	<projects>

	</projects>

AndroidManifest.xml

+23 −0
Original line number Diff line number Diff line
@@ -315,6 +315,29 @@ 
                <action android:name="com.fsck.k9.service.CoreReceiver.wakeLockRelease"/>

            </intent-filter>

        </receiver>

        <receiver android:name="com.fsck.k9.service.StorageReceiver"

              android:enabled="true"

              >

            <intent-filter>

<!-- 

android.intent.action.MEDIA_MOUNTED



     * Broadcast Action:  External media is present and mounted at its mount point.

     * The path to the mount point for the removed media is contained in the Intent.mData field.

     * The Intent contains an extra with name "read-only" and Boolean value to indicate if the

     * media was mounted read only.



 -->

                <action android:name="android.intent.action.MEDIA_MOUNTED"/>

<!-- 



MEDIA_EJECT and MEDIA_UNMOUNTED are not defined here: they have to be dynamically registered 

otherwise it would make K-9 start at the wrong time



 -->

                <data android:scheme="file"/>

            </intent-filter>

        </receiver>

        <service

            android:name="com.fsck.k9.service.MailService"

            android:enabled="true"

res/values-de/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -392,6 +392,13 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü 
    <string name="account_setup_incoming_save_all_headers_title">Alle Mail-Header herunterladen</string>

    <string name="account_setup_incoming_save_all_headers_label">Alle Header lokal speichern</string>



    <string name="account_setup_incoming_use_sd_card_title">Nutze SD-Karte</string>

    <string name="account_setup_incoming_use_sd_card_label">Speichere die Mails auf der SD-Karte</string>

    <string name="local_storage_provider_external_label">Externes Medium (SD-Karte)</string>

    <string name="local_storage_provider_internal_label">Interner Speicher</string>

    <string name="local_storage_provider_samsunggalaxy_label">%1$s zusätzlicher interner Speicher</string>

    <string name="local_storage_provider_label">Speicherort</string>



    <string name="account_setup_expunge_policy_label">Ordner bereinigen (Expunge)</string>

    <string name="account_setup_expunge_policy_immediately">Sofort nach Verschieben oder Kopieren</string>

    <string name="account_setup_expunge_policy_on_poll">Bei jedem Abrufen</string>

res/values-fr/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -364,6 +364,12 @@ 
  <string name="account_setup_incoming_other_label">Autre</string>

  <string name="account_setup_incoming_save_all_headers_title">Téléchargement des entêtes de messages</string>

  <string name="account_setup_incoming_save_all_headers_label">Enregistrer toutes les entêtes localement</string>



    <string name="local_storage_provider_external_label">Stockage externe (carte SD)</string>

    <string name="local_storage_provider_internal_label">Stockage interne</string>

    <string name="local_storage_provider_samsunggalaxy_label">Stockage additionnel %1$s</string>

    <string name="local_storage_provider_label">Emplacement du stockage</string>



  <string name="account_setup_expunge_policy_label">Élimination des messages</string>

  <string name="account_setup_expunge_policy_immediately">Immédiatement après avoir supprimé ou déplacé</string>

  <string name="account_setup_expunge_policy_on_poll">Pendant chaque récupération</string>
@@ -502,6 +508,10 @@ 
  

  <string name="account_settings_mail_check_frequency_label">Fréquence de vérification du dossier</string>

  <string name="account_settings_second_class_check_frequency_label">Fréquence de vérification pour 2ème classe</string>



    <string name="account_settings_storage_title">Stockage</string>





  <string name="account_settings_color_label">Couleur du compte</string>

  <string name="account_settings_color_summary">Choisir la couleur du compte tel qu\'affichée dans les listes de dossiers ou de comptes</string>

  <string name="account_settings_led_color_label">Couleur de la DEL de notification</string>

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -398,6 +398,11 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin 
    <string name="account_setup_incoming_save_all_headers_title">Download headers</string>

    <string name="account_setup_incoming_save_all_headers_label">Save all message headers locally</string>



    <string name="local_storage_provider_external_label">External storage (SD card)</string>

    <string name="local_storage_provider_internal_label">Regular internal storage</string>

    <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>

    <string name="local_storage_provider_label">Storage location</string>



    <string name="account_setup_expunge_policy_label">Expunge deleted messages</string>

    <string name="account_setup_expunge_policy_immediately">Immediately</string>

    <string name="account_setup_expunge_policy_on_poll">When polling</string>
@@ -558,6 +563,9 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin 
    <string name="account_settings_mail_check_frequency_label">Folder poll frequency</string>

    <string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>



    <string name="account_settings_storage_title">Storage</string>





    <string name="account_settings_color_label">Account color</string>

    <string name="account_settings_color_summary">Choose the color of the account used in folder and account list</string>