From 6fd360e62db4d9b4af11cb2350a382abf5b14a7a Mon Sep 17 00:00:00 2001
From: Henrik Tunedal <tunedal@gmail.com>
Date: Thu, 27 Jan 2011 19:59:57 +0100
Subject: [PATCH] Fixed text corruption problem in marketcheck.

The problem was due to marketcheck using DataInputStream.readLine(),
which is a fundamentally broken function and has been deprecated since
Java 1.1. Strings in Java consist of Unicode characters, not bytes.
---
 marketcheck/test.java                          | 12 ++++++------
 metadata/com.android.inputmethod.norwegian.txt |  2 +-
 metadata/org.abrantix.rockon.rockonnggl.txt    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/marketcheck/test.java b/marketcheck/test.java
index 9698ac68..2a34a67d 100644
--- a/marketcheck/test.java
+++ b/marketcheck/test.java
@@ -61,15 +61,15 @@ class test {
                                 App app = response.getAppList().get(0);
                                 String filespec = "../metadata/" + app.getPackageName() + ".txt";
                                 FileInputStream fi = new FileInputStream(filespec);
-                                BufferedInputStream bi = new BufferedInputStream(fi);
-                                DataInputStream di = new DataInputStream(bi);
+                                InputStreamReader isr = new InputStreamReader(fi, "UTF-8");
+                                BufferedReader br = new BufferedReader(isr);
                                 StringBuilder output = new StringBuilder();
                                 boolean changed = false;
                                 boolean vercodefound = false;
                                 boolean versionfound = false;
                                 String line, newline;
-                                while (di.available() != 0) {
-                                    line = di.readLine();
+                                while (br.ready()) {
+                                    line = br.readLine();
                                     if (line.startsWith("Market Version:")) {
                                         versionfound = true;
                                         newline="Market Version:" + app.getVersion();
@@ -87,8 +87,8 @@ class test {
                                     }
                                     output.append(line + "\n");
                                 }
-                                di.close();
-                                bi.close();
+                                br.close();
+                                isr.close();
                                 fi.close();
                                 if(!versionfound) {
                                     changed = true;
diff --git a/metadata/com.android.inputmethod.norwegian.txt b/metadata/com.android.inputmethod.norwegian.txt
index e4044795..713a8c9b 100644
--- a/metadata/com.android.inputmethod.norwegian.txt
+++ b/metadata/com.android.inputmethod.norwegian.txt
@@ -6,7 +6,7 @@ Summary:Keyboard for Scandinavian languages
 Description:
 A modified version of the standard onscreen keyboard in Android
 with support for Norwegian, Swedish, Danish, Faroese, German,
-Icelandic and Northern Sámi keyboard layouts.
+Icelandic and Northern Sámi keyboard layouts.
 .
 Repo Type:svn
 Repo:http://scandinavian-keyboard.googlecode.com/svn/trunk
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index 04e7fb16..af2a248b 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -4,7 +4,7 @@ Source Code:http://github.com/fabrantes/rockonnggl
 Issue Tracker:http://github.com/fabrantes/rockonnggl/issues
 Summary:Music player
 Description:
-A music player. Cubed, also known as ³, has possibly the silliest choice of application
+A music player. Cubed, also known as ³, has possibly the silliest choice of application
 name ever.
 .
 Market Version:1.0.81
-- 
2.30.2