From c2d43c8c9337ddda519858ae5b5cad791a54a9a5 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Wed, 10 May 2017 17:10:10 +0800
Subject: [PATCH] fixed possible NPEs

---
 .../twidere/loader/ObjectCursorLoader.java    |  2 +-
 .../model/ParameterizedExpression.java        | 27 -----------------
 .../twidere/model/ParameterizedExpression.kt  | 30 +++++++++++++++++++
 3 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 twidere/src/main/java/org/mariotaku/twidere/model/ParameterizedExpression.java
 create mode 100644 twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt

diff --git a/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java b/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java
index bbd6a3a53..67eb0bd7b 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java
@@ -241,7 +241,7 @@ public class ObjectCursorLoader<T> extends FixedAsyncTaskLoader<List<T>> {
         writer.println(mSortOrder);
         writer.print(prefix);
         writer.print("mObjects=");
-        writer.println(mObjects);
+        writer.println(mObjects.getCursor());
         writer.print(prefix);
         writer.print("mContentChanged=");
         writer.println(LoaderAccessor.isContentChanged(this));
diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/ParameterizedExpression.java b/twidere/src/main/java/org/mariotaku/twidere/model/ParameterizedExpression.java
deleted file mode 100644
index c0ca358c3..000000000
--- a/twidere/src/main/java/org/mariotaku/twidere/model/ParameterizedExpression.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.mariotaku.twidere.model;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import org.mariotaku.sqliteqb.library.Expression;
-
-/**
- * Created by mariotaku on 16/6/22.
- */
-public class ParameterizedExpression {
-    Expression expression;
-    String[] parameters;
-
-    public ParameterizedExpression(@NonNull Expression expression, @Nullable String[] parameters) {
-        this.expression = expression;
-        this.parameters = parameters;
-    }
-
-    public String[] getParameters() {
-        return parameters;
-    }
-
-    public String getSQL() {
-        return expression.getSQL();
-    }
-}
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt
new file mode 100644
index 000000000..9dd31a716
--- /dev/null
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt
@@ -0,0 +1,30 @@
+/*
+ *             Twidere - Twitter client for Android
+ *
+ *  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mariotaku.twidere.model
+
+import org.mariotaku.sqliteqb.library.Expression
+
+/**
+ * Created by mariotaku on 16/6/22.
+ */
+data class ParameterizedExpression(var expression: Expression, val parameters: Array<String>) {
+    val sql: String
+        get() = expression.sql
+}