Skip to content

warning cleanup test #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: v2.1-dev
Choose a base branch
from
Open

warning cleanup test #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a85175b
warning cleanup test
ransomw Jan 16, 2013
48a8098
commented out portions of DeckTask corresponding to commented out por…
ransomw Jan 18, 2013
8c5e984
DeskTask warning clean
ransomw Jan 20, 2013
4450683
Models warning clean
ransomw Jan 20, 2013
e23be0c
cleaned up Connection, except for doInBackgroundDownloadMissingMedia,…
ransomw Jan 20, 2013
fead8b7
easy fixes in libanki package
ransomw Jan 21, 2013
1d55618
Utils warning clean
ransomw Jan 22, 2013
a084614
Tagss warning clean
ransomw Jan 22, 2013
bbe71ea
Storage warning clean
ransomw Jan 22, 2013
249993c
Sound warning clean
ransomw Jan 22, 2013
36b2b83
easy cleanups in Sched
ransomw Jan 22, 2013
78f74e6
libanki warning clean --- Sched.getDeckCounts() returns a DeckCount o…
ransomw Jan 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
split.density=false
java.encoding=utf8
# Project target.
target=android-15
target=android-17
apk-configurations=
119 changes: 59 additions & 60 deletions src/com/ichi2/async/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,8 @@

package com.ichi2.async;

import android.app.Application;
import android.content.Context;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.util.Log;

import com.ichi2.anki.AnkiDatabaseManager;
import com.ichi2.anki.AnkiDb;
import com.ichi2.anki.AnkiDroidApp;
import com.ichi2.anki.Feedback;
import com.ichi2.anki.R;
import com.ichi2.libanki.Collection;
import com.ichi2.libanki.Decks;
import com.ichi2.libanki.Sched;
import com.ichi2.libanki.Utils;
import com.ichi2.libanki.sync.FullSyncer;
import com.ichi2.libanki.sync.BasicHttpSyncer;
import com.ichi2.libanki.sync.MediaSyncer;
import com.ichi2.libanki.sync.RemoteMediaServer;
import com.ichi2.libanki.sync.RemoteServer;
import com.ichi2.libanki.sync.Syncer;

import org.apache.commons.httpclient.contrib.ssl.EasySSLSocketFactory;
import org.apache.commons.httpclient.contrib.ssl.EasyX509TrustManager;
import org.apache.http.HttpResponse;
import org.json.JSONException;
import org.json.JSONObject;

import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileFilter;
Expand All @@ -62,16 +28,12 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.lang.OutOfMemoryError;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
Expand All @@ -81,6 +43,39 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;

import org.apache.commons.httpclient.contrib.ssl.EasyX509TrustManager;
import org.apache.http.HttpResponse;
import org.json.JSONException;
import org.json.JSONObject;

import android.app.Application;
import android.content.Context;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.util.Log;

import com.ichi2.anki.AnkiDatabaseManager;
import com.ichi2.anki.AnkiDb;
import com.ichi2.anki.AnkiDroidApp;
import com.ichi2.anki.Feedback;
import com.ichi2.anki.R;
import com.ichi2.libanki.Collection;
import com.ichi2.libanki.Decks;
import com.ichi2.libanki.Sched;
import com.ichi2.libanki.Utils;
import com.ichi2.libanki.sync.BasicHttpSyncer;
import com.ichi2.libanki.sync.FullSyncer;
import com.ichi2.libanki.sync.MediaSyncer;
import com.ichi2.libanki.sync.RemoteMediaServer;
import com.ichi2.libanki.sync.RemoteServer;
import com.ichi2.libanki.sync.Syncer;

public class Connection extends AsyncTask<Connection.Payload, Object, Connection.Payload> {

public static final int TASK_TYPE_LOGIN = 0;
Expand Down Expand Up @@ -677,9 +672,9 @@ private Payload doInBackgroundSync(Payload data) {
counts[2] += (Integer) deck[4];
}
}
Object[] dc = col.getSched().deckCounts();
data.result = dc[0];
data.data = new Object[] { conflictResolution, col, dc[1], dc[2], mediaError };
Sched.DeckCounts dc = col.getSched().getDeckCounts();
data.result = dc.getDecksNet();
data.data = new Object[] { conflictResolution, col, dc.eta, dc.cardCount, mediaError };
return data;
}
}
Expand All @@ -696,7 +691,8 @@ public void publishProgress(int id, long up, long down) {
}


private Payload doInBackgroundSendFeedback(Payload data) {
@SuppressWarnings("unchecked")
private Payload doInBackgroundSendFeedback(Payload data) {
Log.i(AnkiDroidApp.TAG, "doInBackgroundSendFeedback");
String feedbackUrl = (String) data.data[0];
String errorUrl = (String) data.data[1];
Expand Down Expand Up @@ -745,14 +741,14 @@ private Payload doInBackgroundSendFeedback(Payload data) {
return data;
}


/**
* Downloads any missing media files according to the mediaURL deckvar.
*
* @param data
* @return The return type contains data.resultType and an array of Integer in data.data. data.data[0] is the number
* of total missing media, data.data[1] is the number of downloaded ones.
*/
// TODO: this method is broken. see FIXMEs
private Payload doInBackgroundDownloadMissingMedia(Payload data) {
Log.i(AnkiDroidApp.TAG, "DownloadMissingMedia");
HashMap<String, String> missingPaths = new HashMap<String, String>();
Expand All @@ -771,6 +767,7 @@ private Payload doInBackgroundDownloadMissingMedia(Payload data) {
String urlbase = "";// deck.getVar("mediaURL");
if (urlbase.equals("")) {
data.success = true;
// FIXME: the method returns here every time.
return data;
}

Expand All @@ -781,6 +778,7 @@ private Payload doInBackgroundDownloadMissingMedia(Payload data) {

Cursor cursor = null;
try {
// FIXME: assign cursor to non-null variable
cursor = null;// deck.getDB().getDatabase().rawQuery("SELECT filename, originalPath FROM media", null);
String path = null;
String f = null;
Expand All @@ -801,17 +799,17 @@ private Payload doInBackgroundDownloadMissingMedia(Payload data) {
}

totalMissing = missingPaths.size();
data.data[0] = new Integer(totalMissing);
data.data[0] = Integer.valueOf(totalMissing);
if (totalMissing == 0) {
data.success = true;
return data;
}
publishProgress(Boolean.FALSE, new Integer(totalMissing), new Integer(0), syncName);
publishProgress(Boolean.FALSE, Integer.valueOf(totalMissing), Integer.valueOf(0), syncName);

URL url = null;
HttpURLConnection connection = null;
String path = null;
String sum = null;
//String sum = null;
int readbytes = 0;
byte[] buf = new byte[4096];
for (String file : missingPaths.keySet()) {
Expand All @@ -832,17 +830,18 @@ private Payload doInBackgroundDownloadMissingMedia(Payload data) {
}
fos.close();

// Verify with checksum
sum = missingSums.get(file);
if (true) {// sum.equals("") || sum.equals(Utils.fileChecksum(path))) {
grabbed++;
} else {
// Download corrupted, delete file
Log.i(AnkiDroidApp.TAG, "Downloaded media file " + path + " failed checksum.");
File f = new File(path);
f.delete();
missing++;
}
// TODO: Verify with checksum
// sum = missingSums.get(file);
// if (true) {// sum.equals("") || sum.equals(Utils.fileChecksum(path))) {
// grabbed++;
// } else {
// // Download corrupted, delete file
// Log.i(AnkiDroidApp.TAG, "Downloaded media file " + path + " failed checksum.");
// File f = new File(path);
// f.delete();
// missing++;
// }
grabbed++;
} else {
Log.e(AnkiDroidApp.TAG, "Connection error (" + connection.getResponseCode()
+ ") while retrieving media file " + urlbase + file);
Expand Down Expand Up @@ -886,11 +885,11 @@ private Payload doInBackgroundDownloadMissingMedia(Payload data) {
connection.disconnect();
}
}
publishProgress(Boolean.TRUE, new Integer(totalMissing), new Integer(grabbed + missing), syncName);
publishProgress(Boolean.TRUE, Integer.valueOf(totalMissing), Integer.valueOf(grabbed + missing), syncName);
}

data.data[1] = new Integer(grabbed);
data.data[2] = new Integer(missing);
data.data[1] = Integer.valueOf(grabbed);
data.data[2] = Integer.valueOf(missing);
data.success = true;
return data;
}
Expand Down
Loading