ICE-6236 android chat demo: crash

- Fixed crash.
- Fixed use of deprecated methods in the Android demos/tests.
- Rewrote Android hello demo.

4 files changed, 40 insertions, 38 deletions

diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java
index 41fbcc6a55f..3c878151d74 100644
--- a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java
+++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java
@@ -588,7 +588,7 @@ public class TestApp extends Application
 
             setupAddress(args, _ipv6);
 
-            if(_testName == "plugin")
+            if(_testName.equals("plugin"))
             {
                 try
                 {
@@ -862,10 +862,6 @@ public class TestApp extends Application
 
     synchronized public void startTest(int position)
     {
-        assert !_mode.isSSL() || (_mode.isSSL() && _sslInitialized);
-
-        PrintWriter pw = new PrintWriter(new MyWriter());
-
         _currentTest = position;
         _complete = false;
         _strings.clear();
@@ -987,7 +983,7 @@ public class TestApp extends Application
             {
                 private SSLContext initializeContext(java.io.InputStream cert)
                     throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException,
-                    FileNotFoundException, UnrecoverableKeyException, KeyManagementException
+                    UnrecoverableKeyException, KeyManagementException
                 {
                     SSLContext context = SSLContext.getInstance("TLS");
                     KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java
index a2154c35742..7787c3ed497 100644
--- a/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java
+++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java
@@ -12,10 +12,7 @@ package com.zeroc.testsuite;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ListActivity;
-import android.app.ProgressDialog;
+import android.app.*;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,8 +22,9 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public class TestSuite extends ListActivity
 {
-    private static final int DIALOG_INITIALIZING = 1;
-    private static final int DIALOG_SSL_FAILED = 2;
+    public static final String INITIALIZE_TAG = "initialize";
+    public static final String FAILED_TAG = "failed";
+
     private List<String> _tests = new ArrayList<String>();
 
     @Override
@@ -48,7 +46,11 @@ public class TestSuite extends ListActivity
             {
                 if(dismiss)
                 {
-                    dismissDialog(DIALOG_INITIALIZING);
+                    DialogFragment f= (DialogFragment)getFragmentManager().findFragmentByTag(INITIALIZE_TAG);
+                    if(f != null)
+                    {
+                        f.dismiss();
+                    }
                 }
             }
 
@@ -56,16 +58,22 @@ public class TestSuite extends ListActivity
             {
                 if(dismiss)
                 {
-                    dismissDialog(DIALOG_INITIALIZING);
+                    DialogFragment f= (DialogFragment)getFragmentManager().findFragmentByTag(INITIALIZE_TAG);
+                    if(f != null)
+                    {
+                        f.dismiss();
+                    }
                 }
-                showDialog(DIALOG_SSL_FAILED);
+                DialogFragment dialog = new SSLFailedDialogFragment();
+                dialog.show(getFragmentManager(), FAILED_TAG);
             }
 
             public void onWait()
             {
                 // Show the initializing dialog.
                 dismiss = true;
-                showDialog(DIALOG_INITIALIZING);
+                DialogFragment dialog = new InitializeDialogFragment();
+                dialog.show(getFragmentManager(), INITIALIZE_TAG);
             }
         });
         Spinner mode = (Spinner)findViewById(R.id.mode);
@@ -109,37 +117,37 @@ public class TestSuite extends ListActivity
         startActivity(new Intent(this, TestContainer.class));
     }
 
-    @Override
-    protected Dialog onCreateDialog(int id)
+    public static class InitializeDialogFragment extends DialogFragment
     {
-        switch (id)
-        {
-        case DIALOG_INITIALIZING:
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState)
         {
-            ProgressDialog dialog = new ProgressDialog(this);
+            ProgressDialog dialog = new ProgressDialog(getActivity());
             dialog.setTitle("Initializing");
             dialog.setMessage("Please wait while initializing SSL...");
             dialog.setIndeterminate(true);
             dialog.setCancelable(false);
             return dialog;
         }
+    }
 
-        case DIALOG_SSL_FAILED:
+    public static class SSLFailedDialogFragment extends DialogFragment
+    {
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState)
         {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle("Error");
-            builder.setMessage("SSL Initialization failed");
-            builder.setCancelable(false);
-            builder.setPositiveButton("Ok", new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int whichButton)
-                {
-                    finish();
-                }
-            });
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setTitle("Error")
+                    .setMessage("SSL Initialization failed")
+                    .setCancelable(false)
+                    .setPositiveButton("Ok", new DialogInterface.OnClickListener()
+                    {
+                        public void onClick(DialogInterface dialog, int whichButton)
+                        {
+                            getActivity().finish();
+                        }
+                    });
             return builder.create();
         }
-        }
-        return null;
     }
 }
diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml
index 299ec77ac2d..981662e19b1 100644
--- a/android/test/android/testApp.iml
+++ b/android/test/android/testApp.iml
@@ -80,7 +80,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml
index f6fbd6b7fec..916e385fd3b 100644
--- a/android/test/plugins/testPlugins.iml
+++ b/android/test/plugins/testPlugins.iml
@@ -25,7 +25,6 @@
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <content url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java">