Merge remote-tracking branch 'upstream/master'

AndroidManifest.xml

@@ -53,6 +53,7 @@
                 android:label="@string/delete_messages_label"
                 android:description="@string/read_messages_desc"/>
     <uses-permission android:name="com.fsck.k9.permission.DELETE_MESSAGES"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name"

src/com/fsck/k9/activity/EditIdentity.java

@@ -90,11 +90,6 @@ public class EditIdentity extends K9Activity {
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
     private void saveIdentity() {
 
         mIdentity.setDescription(mDescriptionView.getText().toString());

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

@@ -698,11 +698,6 @@ public class AccountSettings extends K9PreferenceActivity {
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
     private void saveSettings() {
         if (mAccountDefault.isChecked()) {
             Preferences.getPreferences(this).setDefaultAccount(mAccount);
@@ -727,7 +722,7 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
         if (mIsExpungeCapable) {
             mAccount.setExpungePolicy(mExpungePolicy.getValue());
-        };
+        }
         mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
         mAccount.setSaveAllHeaders(mSaveAllHeaders.isChecked());
         mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));

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

@@ -99,12 +99,6 @@ public class AccountSetupComposition extends K9Activity {
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        //mAccount.refresh(Preferences.getPreferences(this));
-    }
-
     private void saveSettings() {
         mAccount.setEmail(mAccountEmail.getText().toString());
         mAccount.setAlwaysBcc(mAccountAlwaysBcc.getText().toString());

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

@@ -123,11 +123,6 @@ public class FolderSettings extends K9PreferenceActivity {
         });
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
     private void saveSettings() throws MessagingException {
         mFolder.setInTopGroup(mInTopGroup.isChecked());
         mFolder.setIntegrate(mIntegrate.isChecked());

src/com/fsck/k9/helper/FileBrowserHelper.java

@@ -92,7 +92,7 @@ public class FileBrowserHelper {
             } catch (ActivityNotFoundException e) {
                 // Try the next intent in the list
                 listIndex++;
-            };
+            }
         } while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
 
         if (listIndex == PICK_DIRECTORY_INTENTS.length) {

src/com/fsck/k9/mail/store/ImapResponseParser.java

@@ -5,7 +5,6 @@ import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.filter.FixedLengthInputStream;
 import com.fsck.k9.mail.filter.PeekableInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

src/com/fsck/k9/mail/store/WebDavStore.java

@@ -311,7 +311,6 @@ public class WebDavStore extends Store {
     private String mPath; /* Stores the path for the server */
     private String mAuthPath; /* Stores the path off of the server to post data to for form based authentication */
     private String mMailboxPath; /* Stores the user specified path to the mailbox */
-    private URI mUri; /* Stores the Uniform Resource Indicator with all connection info */
 
     private boolean mSecure;
     private WebDavHttpClient mHttpClient = null;

src/com/fsck/k9/view/MessageCryptoView.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.*;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;

src/com/fsck/k9/view/MessageHeader.java

@@ -111,7 +111,6 @@ public class MessageHeader extends LinearLayout {
             @Override
             public void onClick(View v) {
                 onShowAdditionalHeaders();
-                return;
             }
         });