moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-08 20:28:34 -05:00
Code Issues Releases Wiki Activity

Small change to make it parcelable in reality... contains a VERY VERY ugly quick fix, this needs to be corrected!!!

Browse Source
This commit is contained in:
dzan 2011-07-20 14:51:51 +02:00 committed by Andrew Chen
parent 925da1029c
commit 2423c45ec2
1 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/com/fsck/k9/helper/configxmlparser/AutoconfigInfo.java
View File

@ -110,7 +110,7 @@ public class AutoconfigInfo implements Parcelable {
authentication = AuthenticationType.valueOf(parcel.readString()); authentication = AuthenticationType.valueOf(parcel.readString());
} }
public static final Parcelable.Creator<Server> CREATOR /* public static final Parcelable.Creator<Server> CREATOR
= new Parcelable.Creator<Server>() { = new Parcelable.Creator<Server>() {
@Override @Override
public Server createFromParcel(Parcel parcel) { public Server createFromParcel(Parcel parcel) {
@ -119,7 +119,7 @@ public class AutoconfigInfo implements Parcelable {
@Override @Override
public Server[] newArray(int i) { return new Server[i]; } public Server[] newArray(int i) { return new Server[i]; }
}; }; */
@Override @Override
public int describeContents() { return this.hashCode(); } public int describeContents() { return this.hashCode(); }
@ -138,18 +138,29 @@ public class AutoconfigInfo implements Parcelable {
} }
} }
public static abstract class IncomingServer extends Server{ public static abstract class IncomingServer extends Server
{
public IncomingServer(ServerType type) {super(type);} public IncomingServer(ServerType type) {super(type);}
public IncomingServer(Parcel parcel, ServerType type) {super(parcel, type);} public IncomingServer(Parcel parcel, ServerType type) {super(parcel, type);}
} }
public static abstract class OutgoingServer extends Server{ public static abstract class OutgoingServer extends Server
{
public RestrictionType restriction; public RestrictionType restriction;
public OutgoingServer(ServerType type) {super(type);} public OutgoingServer(ServerType type) {super(type);}
public OutgoingServer(Parcel parcel, ServerType type) {super(parcel, type);} public OutgoingServer(Parcel parcel, ServerType type) {super(parcel, type);}
} }
public static class IncomingServerPOP3 extends IncomingServer { public static class IncomingServerPOP3 extends IncomingServer
{
public static final Parcelable.Creator<IncomingServerPOP3> CREATOR
= new Parcelable.Creator<IncomingServerPOP3>() {
@Override
public IncomingServerPOP3 createFromParcel(Parcel parcel) { return new IncomingServerPOP3(parcel); }
@Override
public IncomingServerPOP3[] newArray(int i) { return new IncomingServerPOP3[i]; }
};
// hardcode the type // hardcode the type
public ServerType type = ServerType.POP3; public ServerType type = ServerType.POP3;
@ -184,7 +195,16 @@ public class AutoconfigInfo implements Parcelable {
} }
} }
public static class IncomingServerIMAP extends IncomingServer { public static class IncomingServerIMAP extends IncomingServer
{
public static final Parcelable.Creator<IncomingServerIMAP> CREATOR
= new Parcelable.Creator<IncomingServerIMAP>() {
@Override
public IncomingServerIMAP createFromParcel(Parcel parcel) { return new IncomingServerIMAP(parcel); }
@Override
public IncomingServerIMAP[] newArray(int i) { return new IncomingServerIMAP[i]; }
};
public ServerType type = ServerType.IMAP; public ServerType type = ServerType.IMAP;
// constructor // constructor
@ -194,7 +214,16 @@ public class AutoconfigInfo implements Parcelable {
} }
} }
public static class OutgoingServerSMTP extends OutgoingServer { public static class OutgoingServerSMTP extends OutgoingServer
{
public static final Parcelable.Creator<OutgoingServerSMTP> CREATOR
= new Parcelable.Creator<OutgoingServerSMTP>() {
@Override
public OutgoingServerSMTP createFromParcel(Parcel parcel) { return new OutgoingServerSMTP(parcel); }
@Override
public OutgoingServerSMTP[] newArray(int i) { return new OutgoingServerSMTP[i]; }
};
// hardcode the type // hardcode the type
public ServerType type = ServerType.SMTP; public ServerType type = ServerType.SMTP;
@ -317,8 +346,14 @@ public class AutoconfigInfo implements Parcelable {
public ParcelableMutablePair(Parcel parcel){ public ParcelableMutablePair(Parcel parcel){
super(null, null); super(null, null);
first = (K) parcel.readValue(first.getClass().getClassLoader()); /*
second = (V) parcel.readValue(second.getClass().getClassLoader()); NOTE : WARNING :
TODO: this is very very very very ugly! just need it to compile for now!
the generic types won't always be strings! just can't figure out how to get
the classloader of K & V
*/
first = (K) parcel.readValue(String.class.getClassLoader());
second = (V) parcel.readValue(String.class.getClassLoader());
} }
public void setFirst(K val){ this.first = val; } public void setFirst(K val){ this.first = val; }