Issue 1540 - Utility method for loading text is at the wrong location

src/org/adblockplus/android/Utils.java

 /*
  * 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
  * 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
 import org.adblockplus.android.updater.UpdaterActivity;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.Subscription;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 83 matching lines @@
     {
       time = lastDownload;
       status = "synchronize_last_at";
     }
 
     context.sendBroadcast(new Intent(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS)
         .putExtra("url", sub.getProperty("url").toString())
         .putExtra("status", status)
         .putExtra("time", time * 1000L));
   }
+
+  public static void appendRawTextFile(final Context context, final StringBuilder text, final int id)
+  {
+    try
+    {
+      final BufferedReader buf = new BufferedReader(new InputStreamReader(context.getResources().openRawResource(id)));
+
+      try
+      {
+        String line;
+        while ((line = buf.readLine()) != null)
+        {
+          text.append(line);
+          text.append('\n');

[Felix Dahlke, 2014/11/11 09:21:46]

I wonder why it worked before when we were cutting off EOL characters. We were
just using it for HTML, I guess?

[René Jeschke, 2014/11/11 11:57:00]

Yep, seems like we always only loaded HTML so far, so it didn't matter. It just
felt right to correct this behaviour, though :-)

+        }
+      }
+      finally
+      {
+        buf.close();
+      }
+
+    }
+    catch (final Exception e)
+    {
+      // Ignored for now
+    }
+  }
 }