Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix merge conflicts

  • Loading branch information...
commit 2acb17beb3e02bf027a83244f1a3650f39b64bb4 1 parent faeadfb
Phil Olson authored
6 AndroidManifest.xml
@@ -5,9 +5,9 @@
5 5 android:versionName="1.0" >
6 6
7 7 <uses-sdk android:minSdkVersion="11" />
8   -
9   - <uses-permission android:name="android.permission.INTERNET" />
10   -
  8 + <uses-permission
  9 + android:name="android.permission.INTERNET" />
  10 +
11 11 <application
12 12 android:icon="@drawable/ic_launcher"
13 13 android:label="@string/app_name" >
4 src/org/ragetemplate/contentproviders/RageProviderContracts.java
@@ -11,7 +11,7 @@
11 11 // RAGE COMIC TABLE CONTRACT
12 12 public static final class RageComics implements BaseColumns {
13 13
14   - public static final String TABLE_NAME = "ragecomics";
  14 + public static final String TABLE_NAME = "rage";
15 15
16 16 // URI DEFS
17 17 private static final String SCHEME = "content://";
@@ -25,7 +25,7 @@
25 25 // content://org.ragetemplate.rageprovider/rage/ -- used for content provider insert() call
26 26 public static final Uri CONTENT_ID_URI_BASE = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID);
27 27 // content://org.ragetemplate.rageprovider/rage/#
28   - public static final Uri CONTENT_ID_URI_PATTERN = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID + "/#");
  28 + public static final Uri CONTENT_ID_URI_PATTERN = Uri.parse(SCHEME + AUTHORITY + URI_PATH_WITH_COMIC_ID + "#");
29 29
30 30 public static final String[] ALL_COLUMNS;
31 31
21 src/org/ragetemplate/downloader/RageDownloader.java
@@ -200,15 +200,20 @@ RageComic buildComicFromJSON(JSONObject obj) {
200 200 RageComic r = null;
201 201
202 202 try {
203   - obj = obj.getJSONObject("data");
  203 + JSONObject data = obj.getJSONObject("data");
  204 + String name = data.getString("name");
  205 + String title = data.getString("title");
  206 + String author = data.getString("author");
204 207
205   - String name = obj.getString("name");
206   - String title = obj.getString("title");
207   - String author = obj.getString("author");
208   - Uri thumbnailUri = Uri.parse(obj.getString("thumbnail"));
209   - boolean NSFW = obj.getBoolean("over_18");
210   - Date createDate = new Date(obj.getLong("created_utc"));
211   - String imageUriStr = obj.getString("url");
  208 + Uri thumbnailUri = null;
  209 + try {
  210 + thumbnailUri = Uri.parse(data.getString("thumbnail"));
  211 + } catch (IllegalArgumentException e) {
  212 + e.printStackTrace();
  213 + }
  214 + boolean NSFW = data.getBoolean("over_18");
  215 + Date createDate = new Date(data.getLong("created_utc"));
  216 + String imageUriStr = data.getString("url");
212 217 if (!imageUriStr.endsWith(".png")) {
213 218 imageUriStr = imageUriStr + ".png";
214 219 }
2  src/org/ragetemplate/ui/RageList.java
@@ -17,7 +17,7 @@
17 17 import android.widget.ListView;
18 18
19 19
20   -public class RageList extends ListFragment implements LoaderCallbacks<Cursor> {
  20 +public class RageList extends ListFragment implements LoaderCallbacks<Cursor>{
21 21
22 22 private final String TAG = getClass().getSimpleName();
23 23

0 comments on commit 2acb17b

Please sign in to comment.
Something went wrong with that request. Please try again.