mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-25 09:08:49 -05:00
Merge branch 'master' of github.com:k9mail/k-9
This commit is contained in:
commit
fb3cd234fa
@ -53,6 +53,7 @@
|
|||||||
android:label="@string/delete_messages_label"
|
android:label="@string/delete_messages_label"
|
||||||
android:description="@string/read_messages_desc"/>
|
android:description="@string/read_messages_desc"/>
|
||||||
<uses-permission android:name="com.fsck.k9.permission.DELETE_MESSAGES"/>
|
<uses-permission android:name="com.fsck.k9.permission.DELETE_MESSAGES"/>
|
||||||
|
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||||
<application
|
<application
|
||||||
android:icon="@drawable/icon"
|
android:icon="@drawable/icon"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
|
@ -90,11 +90,6 @@ public class EditIdentity extends K9Activity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveIdentity() {
|
private void saveIdentity() {
|
||||||
|
|
||||||
mIdentity.setDescription(mDescriptionView.getText().toString());
|
mIdentity.setDescription(mDescriptionView.getText().toString());
|
||||||
|
@ -698,11 +698,6 @@ public class AccountSettings extends K9PreferenceActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveSettings() {
|
private void saveSettings() {
|
||||||
if (mAccountDefault.isChecked()) {
|
if (mAccountDefault.isChecked()) {
|
||||||
Preferences.getPreferences(this).setDefaultAccount(mAccount);
|
Preferences.getPreferences(this).setDefaultAccount(mAccount);
|
||||||
@ -727,7 +722,7 @@ public class AccountSettings extends K9PreferenceActivity {
|
|||||||
mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
|
mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
|
||||||
if (mIsExpungeCapable) {
|
if (mIsExpungeCapable) {
|
||||||
mAccount.setExpungePolicy(mExpungePolicy.getValue());
|
mAccount.setExpungePolicy(mExpungePolicy.getValue());
|
||||||
};
|
}
|
||||||
mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
|
mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
|
||||||
mAccount.setSaveAllHeaders(mSaveAllHeaders.isChecked());
|
mAccount.setSaveAllHeaders(mSaveAllHeaders.isChecked());
|
||||||
mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
|
mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
|
||||||
|
@ -99,12 +99,6 @@ public class AccountSetupComposition extends K9Activity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
//mAccount.refresh(Preferences.getPreferences(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveSettings() {
|
private void saveSettings() {
|
||||||
mAccount.setEmail(mAccountEmail.getText().toString());
|
mAccount.setEmail(mAccountEmail.getText().toString());
|
||||||
mAccount.setAlwaysBcc(mAccountAlwaysBcc.getText().toString());
|
mAccount.setAlwaysBcc(mAccountAlwaysBcc.getText().toString());
|
||||||
|
@ -123,11 +123,6 @@ public class FolderSettings extends K9PreferenceActivity {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveSettings() throws MessagingException {
|
private void saveSettings() throws MessagingException {
|
||||||
mFolder.setInTopGroup(mInTopGroup.isChecked());
|
mFolder.setInTopGroup(mInTopGroup.isChecked());
|
||||||
mFolder.setIntegrate(mIntegrate.isChecked());
|
mFolder.setIntegrate(mIntegrate.isChecked());
|
||||||
|
@ -92,7 +92,7 @@ public class FileBrowserHelper {
|
|||||||
} catch (ActivityNotFoundException e) {
|
} catch (ActivityNotFoundException e) {
|
||||||
// Try the next intent in the list
|
// Try the next intent in the list
|
||||||
listIndex++;
|
listIndex++;
|
||||||
};
|
}
|
||||||
} while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
|
} while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
|
||||||
|
|
||||||
if (listIndex == PICK_DIRECTORY_INTENTS.length) {
|
if (listIndex == PICK_DIRECTORY_INTENTS.length) {
|
||||||
|
@ -5,7 +5,6 @@ import com.fsck.k9.mail.MessagingException;
|
|||||||
import com.fsck.k9.mail.filter.FixedLengthInputStream;
|
import com.fsck.k9.mail.filter.FixedLengthInputStream;
|
||||||
import com.fsck.k9.mail.filter.PeekableInputStream;
|
import com.fsck.k9.mail.filter.PeekableInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -311,7 +311,6 @@ public class WebDavStore extends Store {
|
|||||||
private String mPath; /* Stores the path for the server */
|
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 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 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 boolean mSecure;
|
||||||
private WebDavHttpClient mHttpClient = null;
|
private WebDavHttpClient mHttpClient = null;
|
||||||
|
@ -5,7 +5,6 @@ import android.content.Context;
|
|||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.*;
|
import android.widget.*;
|
||||||
import com.fsck.k9.K9;
|
import com.fsck.k9.K9;
|
||||||
import com.fsck.k9.R;
|
import com.fsck.k9.R;
|
||||||
|
@ -111,7 +111,6 @@ public class MessageHeader extends LinearLayout {
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
onShowAdditionalHeaders();
|
onShowAdditionalHeaders();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user