moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

astyle

Browse Source
This commit is contained in:
Jesse Vincent 2010-08-18 02:48:55 +00:00
parent de142b7faa
commit ff5024eaec
15 changed files with 145 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/fsck/k9/activity/ChooseFolder.java
View File

@ -224,10 +224,12 @@ public class ChooseFolder extends K9ListActivity
} }
} }
private void setDisplayMode(FolderMode aMode) { private void setDisplayMode(FolderMode aMode)
{
mMode = aMode; mMode = aMode;
// invalidate the current filter as it is working on an inval // invalidate the current filter as it is working on an inval
if (myFilter != null) { if (myFilter != null)
{
myFilter.invalidate(); myFilter.invalidate();
} }
//re-populate the list //re-populate the list

3
src/com/fsck/k9/activity/FolderListFilter.java
View File

@ -136,7 +136,8 @@ public class FolderListFilter<T> extends Filter
mFolders.notifyDataSetChanged(); mFolders.notifyDataSetChanged();
} }
public void invalidate() { public void invalidate()
{
mOriginalValues = null; mOriginalValues = null;
} }
} }

4
src/com/fsck/k9/activity/MessageView.java
View File

@ -2552,7 +2552,9 @@ public class MessageView extends K9Activity implements OnClickListener
} }
mCryptoSignatureLayout.setVisibility(View.VISIBLE); mCryptoSignatureLayout.setVisibility(View.VISIBLE);
mDecryptLayout.setVisibility(View.VISIBLE); mDecryptLayout.setVisibility(View.VISIBLE);
} else { }
else
{
mCryptoSignatureLayout.setVisibility(View.INVISIBLE); mCryptoSignatureLayout.setVisibility(View.INVISIBLE);
} }

3
src/com/fsck/k9/helper/ContactsSdk3_4.java
View File

@ -31,7 +31,8 @@ public class ContactsSdk3_4 extends com.fsck.k9.helper.Contacts
* {@link com.fsck.k9.EmailAddressAdapter} or more specificly by * {@link com.fsck.k9.EmailAddressAdapter} or more specificly by
* {@link android.widget.ResourceCursorAdapter}. * {@link android.widget.ResourceCursorAdapter}.
*/ */
private static final String PROJECTION[] = { private static final String PROJECTION[] =
{
Contacts.People.ContactMethods._ID, Contacts.People.ContactMethods._ID,
Contacts.People.ContactMethods.NAME, Contacts.People.ContactMethods.NAME,
Contacts.People.ContactMethods.DATA Contacts.People.ContactMethods.DATA

3
src/com/fsck/k9/helper/ContactsSdk5.java
View File

@ -34,7 +34,8 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts
* {@link com.fsck.k9.EmailAddressAdapter} or more specificly by * {@link com.fsck.k9.EmailAddressAdapter} or more specificly by
* {@link android.widget.ResourceCursorAdapter}. * {@link android.widget.ResourceCursorAdapter}.
*/ */
private static final String PROJECTION[] = { private static final String PROJECTION[] =
{
Contacts._ID, Contacts._ID,
Contacts.DISPLAY_NAME, Contacts.DISPLAY_NAME,
Email.DATA Email.DATA

3
src/com/fsck/k9/service/MailService.java
View File

@ -412,7 +412,8 @@ public class MailService extends CoreService
} }
else else
{ {
if (K9.DEBUG) { if (K9.DEBUG)
{
Log.i(K9.LOG_TAG, "Not scheduling pushers: connectivity? "+hasConnectivity + " -- doBackground? "+doBackground); Log.i(K9.LOG_TAG, "Not scheduling pushers: connectivity? "+hasConnectivity + " -- doBackground? "+doBackground);
} }

38
src/com/fsck/k9/web/AccessibleEmailContentActivity.java
View File

@ -24,8 +24,10 @@ import android.text.Html;
import android.text.Spanned; import android.text.Spanned;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
public class AccessibleEmailContentActivity extends ListActivity { public class AccessibleEmailContentActivity extends ListActivity
String[] listItems = { {
String[] listItems =
{
"" ""
}; };
@ -35,7 +37,8 @@ public class AccessibleEmailContentActivity extends ListActivity {
/** Called when the activity is first created. */ /** Called when the activity is first created. */
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
htmlSource = getIntent().getStringExtra("content"); htmlSource = getIntent().getStringExtra("content");
@ -43,8 +46,10 @@ public class AccessibleEmailContentActivity extends ListActivity {
String[] rawListItems = parsedHtml.toString().split("\n"); String[] rawListItems = parsedHtml.toString().split("\n");
cleanedList = new ArrayList<String>(); cleanedList = new ArrayList<String>();
for (int i = 0; i < rawListItems.length; i++) { for (int i = 0; i < rawListItems.length; i++)
if (rawListItems[i].trim().length() > 0) { {
if (rawListItems[i].trim().length() > 0)
{
addToCleanedList(rawListItems[i]); addToCleanedList(rawListItems[i]);
} }
} }
@ -55,21 +60,30 @@ public class AccessibleEmailContentActivity extends ListActivity {
setListAdapter(new ArrayAdapter(this, android.R.layout.simple_list_item_1, listItems)); setListAdapter(new ArrayAdapter(this, android.R.layout.simple_list_item_1, listItems));
} }
private void addToCleanedList(String line) { private void addToCleanedList(String line)
if (line.length() < 80) { {
if (line.length() < 80)
{
cleanedList.add(line); cleanedList.add(line);
} else { }
while (line.length() > 80) { else
{
while (line.length() > 80)
{
int cutPoint = line.indexOf(" ", 80); int cutPoint = line.indexOf(" ", 80);
if ((cutPoint > 0) && (cutPoint < line.length())) { if ((cutPoint > 0) && (cutPoint < line.length()))
{
cleanedList.add(line.substring(0, cutPoint)); cleanedList.add(line.substring(0, cutPoint));
line = line.substring(cutPoint).trim(); line = line.substring(cutPoint).trim();
} else { }
else
{
cleanedList.add(line); cleanedList.add(line);
line = ""; line = "";
} }
} }
if (line.length() > 0) { if (line.length() > 0)
{
cleanedList.add(line); cleanedList.add(line);
} }
} }

51
src/com/fsck/k9/web/AccessibleWebView.java
View File

@ -26,84 +26,101 @@ import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.TextView; import android.widget.TextView;
public class AccessibleWebView extends TextView { public class AccessibleWebView extends TextView
{
private Activity parent; private Activity parent;
private String htmlSource; private String htmlSource;
private WebView dummyWebView; private WebView dummyWebView;
public AccessibleWebView(Context context) { public AccessibleWebView(Context context)
{
super(context); super(context);
parent = (Activity) context; parent = (Activity) context;
dummyWebView = new WebView(context); dummyWebView = new WebView(context);
setFocusable(true); setFocusable(true);
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
setOnClickListener(new OnClickListener() { setOnClickListener(new OnClickListener()
{
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0)
{
diveIn(); diveIn();
} }
}); });
} }
public AccessibleWebView(Context context, AttributeSet attributes) { public AccessibleWebView(Context context, AttributeSet attributes)
{
super(context, attributes); super(context, attributes);
parent = (Activity) context; parent = (Activity) context;
dummyWebView = new WebView(context); dummyWebView = new WebView(context);
setFocusable(true); setFocusable(true);
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
setOnClickListener(new OnClickListener() { setOnClickListener(new OnClickListener()
{
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0)
{
diveIn(); diveIn();
} }
}); });
} }
public void loadData(String data, String mimeType, String encoding) { public void loadData(String data, String mimeType, String encoding)
{
htmlSource = data; htmlSource = data;
this.setText(Html.fromHtml(htmlSource, null, null)); this.setText(Html.fromHtml(htmlSource, null, null));
} }
public WebSettings getSettings() { public WebSettings getSettings()
{
return dummyWebView.getSettings(); return dummyWebView.getSettings();
} }
public void setVerticalScrollbarOverlay(boolean booleanValue) { public void setVerticalScrollbarOverlay(boolean booleanValue)
{
// Do nothing here; dummy stub method to maintain compatibility with // Do nothing here; dummy stub method to maintain compatibility with
// standard WebView. // standard WebView.
} }
public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding,
String historyUrl) { String historyUrl)
{
htmlSource = data; htmlSource = data;
this.setText(Html.fromHtml(htmlSource, null, null)); this.setText(Html.fromHtml(htmlSource, null, null));
} }
public void loadUrl(String url) { public void loadUrl(String url)
{
// Do nothing here; dummy stub method to maintain compatibility with // Do nothing here; dummy stub method to maintain compatibility with
// standard WebView. // standard WebView.
} }
public boolean zoomIn() { public boolean zoomIn()
if (getTextSize() < 100) { {
if (getTextSize() < 100)
{
setTextSize(getTextSize() + 5); setTextSize(getTextSize() + 5);
return true; return true;
} }
return false; return false;
} }
public boolean zoomOut() { public boolean zoomOut()
if (getTextSize() > 5) { {
if (getTextSize() > 5)
{
setTextSize(getTextSize() - 5); setTextSize(getTextSize() - 5);
return true; return true;
} }
return false; return false;
} }
private void diveIn() { private void diveIn()
{
Intent i = new Intent(); Intent i = new Intent();
i.setClass(parent, AccessibleEmailContentActivity.class); i.setClass(parent, AccessibleEmailContentActivity.class);
i.putExtra("content", htmlSource); i.putExtra("content", htmlSource);