From dac70916985f390985f1d1f1abea0ae53bd41066 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Mon, 11 Jun 2012 09:10:16 +0000
Subject: [PATCH] android lcl example: Advances the networking code, now almost
 working

git-svn-id: trunk@37615 -
---
 examples/androidlcl/android/AndroidManifest.xml |  1 +
 examples/androidlcl/mainform.pas                | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/examples/androidlcl/android/AndroidManifest.xml b/examples/androidlcl/android/AndroidManifest.xml
index 667a38bf70..c8ab82e887 100644
--- a/examples/androidlcl/android/AndroidManifest.xml
+++ b/examples/androidlcl/android/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
     <application android:label="@string/app_name" 
diff --git a/examples/androidlcl/mainform.pas b/examples/androidlcl/mainform.pas
index b37a6d644f..5d45debff1 100644
--- a/examples/androidlcl/mainform.pas
+++ b/examples/androidlcl/mainform.pas
@@ -384,7 +384,7 @@ begin
   javaMethod_HttpResponse_getEntity := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_HttpResponse, 'getEntity', '()Lorg/apache/http/HttpEntity;');
   javaMethod_HttpEntity_getContent := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_HttpEntity, 'getContent', '()Ljava/io/InputStream;');
   javaMethod_InputStreamReader_new := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_InputStreamReader, '<init>', '(Ljava/io/InputStream;)V');
-  javaMethod_BufferedReader_new := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_BufferedReader, '<init>', '(Ljava/io/InputStream;)V');
+  javaMethod_BufferedReader_new := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_BufferedReader, '<init>', '(Ljava/io/Reader;)V');
   javaMethod_BufferedReader_readLine := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_BufferedReader, 'readLine', '()Ljava/lang/String;');
   javaMethod_BufferedReader_close := javaEnvRef^^.GetMethodID(javaEnvRef, javaClass_BufferedReader, 'close', '()V');
 
@@ -435,26 +435,30 @@ begin
     javaClass_InputStreamReader,
     javaMethod_InputStreamReader_new, @lParams[0]);
   // javaBufferedReader = new BufferedReader(javaStreamReader);
-  DebugLn(':LoadHTMLPageViaJNI 6.3');
+  DebugLn(':LoadHTMLPageViaJNI 6.3 javaStreamReader='+IntToHex(PtrInt(javaStreamReader), 8));
   lParams[0].l := javaStreamReader;
   DebugLn(':LoadHTMLPageViaJNI 6.4');
   javaBufferedReader := javaEnvRef^^.NewObjectA(javaEnvRef,
     javaClass_BufferedReader,
     javaMethod_BufferedReader_new, @lParams[0]);
 
-  DebugLn(':LoadHTMLPageViaJNI 7');
+  DebugLn(':LoadHTMLPageViaJNI 7 javaBufferedReader='+IntToHex(PtrInt(javaBufferedReader), 8));
   // String line = "";
   // while ((line = javaBufferedReader.readLine()) != null) {
   // }
   while True do
   begin
+    DebugLn(':LoadHTMLPageViaJNI 7.1');
     javaString := javaEnvRef^^.CallObjectMethod(javaEnvRef, javaBufferedReader,
       javaMethod_BufferedReader_readLine);
+    DebugLn(':LoadHTMLPageViaJNI 7.2');
     if javaString = nil then Break;
+    DebugLn(':LoadHTMLPageViaJNI 7.3');
     lNativeString := javaEnvRef^^.GetStringUTFChars(javaEnvRef, JavaString, nil);
     DebugLn(lNativeString);
     Result := lNativeString;
     javaEnvRef^^.ReleaseStringUTFChars(javaEnvRef, JavaString, lNativeString);
+    DebugLn(':LoadHTMLPageViaJNI 7.4');
   end;
 
   DebugLn(':LoadHTMLPageViaJNI 8');