Usage of new API, cleanups (reduced)

jni/Utils.h

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 112 matching lines @@
   return JniJavaToStdString(env, reinterpret_cast<jstring>(env->GetObjectField(jObj, env->GetFieldID(clazz, name, "Ljava/lang/String;"))));
 }
 
 inline bool JniGetBooleanField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
   return env->GetBooleanField(jObj, env->GetFieldID(clazz, name, "Z")) == JNI_TRUE;
 }
 
 inline int32_t JniGetIntField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
-  return (int32_t)env->GetBooleanField(jObj, env->GetFieldID(clazz, name, "I"));
+  return (int32_t)env->GetIntField(jObj, env->GetFieldID(clazz, name, "I"));
 }
 
 inline int64_t JniGetLongField(JNIEnv* env, jclass clazz, jobject jObj, const char* name)
 {
-  return (int64_t)env->GetBooleanField(jObj, env->GetFieldID(clazz, name, "J"));
+  return (int64_t)env->GetLongField(jObj, env->GetFieldID(clazz, name, "J"));
 }
 
 inline jobject NewJniFilter(JNIEnv* env, const AdblockPlus::FilterPtr& filter)
 {
+  if (!filter.get())
+  {
+    return 0;
+  }
+
   jclass clazz = env->FindClass(PKG("Filter"));
   jmethodID method = env->GetMethodID(clazz, "<init>", "(J)V");
   return env->NewObject(clazz, method, JniPtrToLong(new AdblockPlus::FilterPtr(filter)));
 }
 
 inline jobject NewJniSubscription(JNIEnv* env, const AdblockPlus::SubscriptionPtr& subscription)
 {
+  if (!subscription.get())
+  {
+    return 0;
+  }
+
   jclass clazz = env->FindClass(PKG("Subscription"));
   jmethodID method = env->GetMethodID(clazz, "<init>", "(J)V");
   return env->NewObject(clazz, method, JniPtrToLong(new AdblockPlus::SubscriptionPtr(subscription)));
 }
 
 #define CATCH_AND_THROW(jEnv) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
   }
 
 #define CATCH_THROW_AND_RETURN(jEnv, retVal) \
   catch (const std::exception& except) \
   { \
     JniThrowException(jEnv, except); \
     return retVal; \
   } \
   catch (...) \
   { \
     JniThrowException(jEnv); \
     return retVal; \
   }
 
-const std::string GetString(JNIEnv *pEnv, jstring str);
-
-template<class T>
-T TrimString(T text)
-{
-  // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
-  T trimmed(text);
-  trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
-  trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), trimmed.end());
-  return trimmed;
-}
-
 #endif