Merge branch 'develop' into feature/ui_model

Conflicts: app/app.iml
ccomeaux · Mar 20, 2015 · d11bb4c · d11bb4c
2 parents 05c1dc4 + 9738342
commit d11bb4c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/CHNAGELOG.md → CHANGELOG.md b/CHNAGELOG.md → CHANGELOG.md
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ See what's changed in the [Change Log](/CHANGELOG.md).
 
 See what we're planning for on our [Trello board](https://trello.com/b/pRZWIOOv).
 
-The installer is available through the Play Store. If you are interested in Beta (or maybe even Alpha releases, please join the [Google+ Community](https://plus.google.com/communities/109617005048169697217).
+The installer is available through the Play Store. If you are interested in Beta (or maybe even Alpha releases), please join the [Google+ Community](https://plus.google.com/communities/109617005048169697217).
 
 License
 -------

diff --git a/app/app.iml b/app/app.iml
@@ -90,6 +90,7 @@
     <orderEntry type="library" exported="" name="hugo-annotations-1.2.1" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="converter-simplexml-1.9.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="palette-v7-22.0.0" level="project" />
@@ -100,8 +101,7 @@
     <orderEntry type="library" exported="" name="library-4.5.9" level="project" />
     <orderEntry type="library" exported="" name="library-1.2.3" level="project" />
     <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="stickylistheaders-2.5.2" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -65,7 +65,7 @@ dependencies {
         exclude group: 'stax', module: 'stax'
         exclude group: 'xpp3', module: 'xpp3'
     }
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
+    compile 'com.squareup.okhttp:okhttp:2.3.0'
     compile 'com.squareup.picasso:picasso:2.5.0'
     compile 'se.emilsjolander:stickylistheaders:2.5.2'
     compile 'com.jakewharton:butterknife:6.1.0'

diff --git a/app/src/main/java/com/boardgamegeek/service/SyncBuddiesDetail.java b/app/src/main/java/com/boardgamegeek/service/SyncBuddiesDetail.java
@@ -97,6 +97,7 @@ protected User getUser(BggService service, String name) {
 						break;
 					}
 				} else {
+					Timber.e(e, "Syncing buddy " + name);
 					throw e;
 				}
 			}

diff --git a/app/src/main/java/com/boardgamegeek/util/ResolverUtils.java b/app/src/main/java/com/boardgamegeek/util/ResolverUtils.java
@@ -44,8 +44,8 @@ public static ContentProviderResult[] applyBatch(Context context, ArrayList<Cont
 					}
 					return result;
 				} catch (OperationApplicationException | RemoteException e) {
-					Timber.e(e, batch.toString());
-					throw new RuntimeException(batch.toString(), e);
+					Timber.e(e, "Applying batch");
+					throw new RuntimeException("Applying batch", e);
 				}
 			}
 		}