Browse files

Fix merge conflicts

  • Loading branch information...
1 parent faeadfb commit 2acb17beb3e02bf027a83244f1a3650f39b64bb4 Phil Olson committed Feb 8, 2012
View
6 AndroidManifest.xml
@@ -5,9 +5,9 @@
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="11" />
-
- <uses-permission android:name="android.permission.INTERNET" />
-
+ <uses-permission
+ android:name="android.permission.INTERNET" />
+
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
View
4 src/org/ragetemplate/contentproviders/RageProviderContracts.java
@@ -11,7 +11,7 @@
// RAGE COMIC TABLE CONTRACT
public static final class RageComics implements BaseColumns {
- public static final String TABLE_NAME = "ragecomics";
+ public static final String TABLE_NAME = "rage";
// URI DEFS
private static final String SCHEME = "content://";
@@ -25,7 +25,7 @@
// content://org.ragetemplate.rageprovider/rage/ -- used for content provider insert() call
public static final Uri CONTENT_ID_URI_BASE = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID);
// content://org.ragetemplate.rageprovider/rage/#
- public static final Uri CONTENT_ID_URI_PATTERN = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID + "/#");
+ public static final Uri CONTENT_ID_URI_PATTERN = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID + "#");
public static final String[] ALL_COLUMNS;
View
21 src/org/ragetemplate/downloader/RageDownloader.java
@@ -200,15 +200,20 @@ RageComic buildComicFromJSON(JSONObject obj) {
RageComic r = null;
try {
- obj = obj.getJSONObject("data");
+ JSONObject data = obj.getJSONObject("data");
+ String name = data.getString("name");
+ String title = data.getString("title");
+ String author = data.getString("author");
- String name = obj.getString("name");
- String title = obj.getString("title");
- String author = obj.getString("author");
- Uri thumbnailUri = Uri.parse(obj.getString("thumbnail"));
- boolean NSFW = obj.getBoolean("over_18");
- Date createDate = new Date(obj.getLong("created_utc"));
- String imageUriStr = obj.getString("url");
+ Uri thumbnailUri = null;
+ try {
+ thumbnailUri = Uri.parse(data.getString("thumbnail"));
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ boolean NSFW = data.getBoolean("over_18");
+ Date createDate = new Date(data.getLong("created_utc"));
+ String imageUriStr = data.getString("url");
if (!imageUriStr.endsWith(".png")) {
imageUriStr = imageUriStr + ".png";
}
View
2 src/org/ragetemplate/ui/RageList.java
@@ -17,7 +17,7 @@
import android.widget.ListView;
-public class RageList extends ListFragment implements LoaderCallbacks<Cursor> {
+public class RageList extends ListFragment implements LoaderCallbacks<Cursor>{
private final String TAG = getClass().getSimpleName();

0 comments on commit 2acb17b

Please sign in to comment.