moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Mark Baker 2011-12-26 19:17:05 +00:00
commit 7ad5429e98
10 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@ -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"

5
src/com/fsck/k9/activity/EditIdentity.java
View File

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

7
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -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()));

6
src/com/fsck/k9/activity/setup/AccountSetupComposition.java
View File

@ -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());

5
src/com/fsck/k9/activity/setup/FolderSettings.java
View File

@ -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());

2
src/com/fsck/k9/helper/FileBrowserHelper.java
View File

@ -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) {

1
src/com/fsck/k9/mail/store/ImapResponseParser.java
View File

@ -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;

1
src/com/fsck/k9/mail/store/WebDavStore.java
View File

@ -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;

1
src/com/fsck/k9/view/MessageCryptoView.java
View File

@ -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;

1
src/com/fsck/k9/view/MessageHeader.java
View File

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