David %!s(int64=10) %!d(string=hai) anos
pai
achega
30902cb4c4

+ 1 - 10
app/src/main/java/com/example/david/myapplication/LoginActivity.java

@@ -4,33 +4,24 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.app.LoaderManager.LoaderCallbacks;
-
 import android.content.CursorLoader;
+import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.AsyncTask;
-
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * A login screen that offers login via email/password.

+ 39 - 40
app/src/main/java/com/example/david/myapplication/MainActivity.java

@@ -1,37 +1,40 @@
 package com.example.david.myapplication;
 
 import android.content.pm.ActivityInfo;
-import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewSwitcher;
 
+import com.neovisionaries.ws.client.WebSocket;
+import com.neovisionaries.ws.client.WebSocketAdapter;
+import com.neovisionaries.ws.client.WebSocketException;
+import com.neovisionaries.ws.client.WebSocketFactory;
+import com.neovisionaries.ws.client.WebSocketFrame;
+import com.neovisionaries.ws.client.WebSocketListener;
 import com.squareup.picasso.Picasso;
 
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.handshake.ServerHandshake;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLContext;
 
 import io.vov.vitamio.LibsChecker;
 import io.vov.vitamio.MediaPlayer;
-import io.vov.vitamio.widget.CenterLayout;
-import io.vov.vitamio.widget.MediaController;
 import io.vov.vitamio.widget.VideoView;
 
 public class MainActivity extends AppCompatActivity implements OnGestureListener{
@@ -43,7 +46,7 @@ public class MainActivity extends AppCompatActivity implements OnGestureListener
     private ViewGroup.LayoutParams lparams;
     private float x1,x2;
     private int MIN_DISTANCE = 100;
-    private WebSocketClient mWebSocketClient;
+    private WebSocket ws;
 
         @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -55,6 +58,8 @@ public class MainActivity extends AppCompatActivity implements OnGestureListener
         if (!LibsChecker.checkVitamioLibs(this))
             return;
         setContentView(R.layout.activity_main);
+        connectWebSocket();
+
         mVideoView = (VideoView) findViewById(R.id.vitamio_videoView);
         viewSwitcher = (ViewSwitcher) findViewById(R.id.viewSwitcher);
 
@@ -77,7 +82,6 @@ public class MainActivity extends AppCompatActivity implements OnGestureListener
         });
 
 //        mVideoView.setLayoutParams(lparams);
-        connectWebSocket();
         mVideoView.setVideoPath(path);
         mVideoView.start();
 
@@ -85,50 +89,45 @@ public class MainActivity extends AppCompatActivity implements OnGestureListener
     }
 
     private void connectWebSocket() {
-        URI uri;
         try {
-            uri = new URI("wss://plataforma.especificosba.com.ar/ws/");
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
+            WebSocketFactory factory = new WebSocketFactory();
+            SSLContext context = NaiveSSLContext.getInstance("TLS");
+
+            // Set the custom SSL context.
+            factory.setSSLContext(context);
+            ws = factory.createSocket("wss://ws.especificosba.com.ar/");
+        } catch (Exception e) {
             return;
         }
 
-        mWebSocketClient = new WebSocketClient(uri) {
+        ws.addListener(new WebSocketAdapter() {
             @Override
-            public void onOpen(ServerHandshake serverHandshake) {
-                Log.i("Websocket", "Opened");
-                Toast.makeText(getApplicationContext(), "opened", Toast.LENGTH_SHORT).show();
+            public void onTextMessage(WebSocket websocket, String message) throws Exception {
+                // Received a text message.
+                TextView textView = (TextView)findViewById(R.id.chat);
+                textView.setText(textView.getText() + "\n" + message);
             }
-
             @Override
-            public void onMessage(String s) {
-                final String message = s;
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        TextView textView = (TextView)findViewById(R.id.chat);
-                        textView.setText(textView.getText() + "\n" + message);
-                    }
-                });
-            }
+            public void onConnected(WebSocket websocket, Map<String, List<String>> headers) throws Exception{
+                Log.i("Websocket", "connecterd");
 
-            @Override
-            public void onClose(int i, String s, boolean b) {
-               // Log.i("Websocket", "Closed " + s);
-                Toast.makeText(getApplicationContext(), "closed", Toast.LENGTH_SHORT).show();
             }
+            @Override
+            public void onDisconnected(WebSocket websocket,WebSocketFrame serverCloseFrame, WebSocketFrame clientCloseFrame,
+                                       boolean closedByServer){
+                Log.i("Websocket", "discon");
 
+            }
             @Override
-            public void onError(Exception e) {
-//                Toast.makeText(getApplicationContext(), "Error"+ e.getMessage(), Toast.LENGTH_SHORT).show();
-                Log.i("Websocket", "Error " + e.getMessage());
+            public void onConnectError(WebSocket websocket, WebSocketException cause){
+                Log.i("Websocket", "didnt even connect"+ cause.getMessage() );
             }
-        };
-        mWebSocketClient.connect();
+        });
+        ws.connectAsynchronously();
     }
     public void sendMessage() {
         EditText editText = (EditText)findViewById(R.id.send_text);
-        mWebSocketClient.send(editText.getText().toString());
+        ws.sendText(editText.getText().toString());
         editText.setText("");
     }
     @Override

+ 124 - 0
app/src/main/java/com/example/david/myapplication/NaiveSSLContext.java

@@ -0,0 +1,124 @@
+package com.example.david.myapplication;/*
+ * Copyright (C) 2015 Neo Visionaries Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+
+/**
+ * A factory class which creates an {@link SSLContext} that
+ * naively accepts all certificates without verification.
+ *
+ * <pre>
+ * // Create an SSL context that naively accepts all certificates.
+ * SSLContext context = com.example.david.myapplication.NaiveSSLContext.getInstance("TLS");
+ *
+ * // Create a socket factory from the SSL context.
+ * SSLSocketFactory factory = context.getSocketFactory();
+ *
+ * // Create a socket from the socket factory.
+ * SSLSocket socket = factory.createSocket("www.example.com", 443);
+ * </pre>
+ *
+ * @author Takahiko Kawasaki
+ */
+public class NaiveSSLContext
+{
+    private NaiveSSLContext()
+    {
+    }
+
+
+    /**
+     * Get an SSLContext that implements the specified secure
+     * socket protocol and naively accepts all certificates
+     * without verification.
+     */
+    public static SSLContext getInstance(String protocol) throws NoSuchAlgorithmException
+    {
+        return init(SSLContext.getInstance(protocol));
+    }
+
+
+    /**
+     * Get an SSLContext that implements the specified secure
+     * socket protocol and naively accepts all certificates
+     * without verification.
+     */
+    public static SSLContext getInstance(String protocol, Provider provider) throws NoSuchAlgorithmException
+    {
+        return init(SSLContext.getInstance(protocol, provider));
+    }
+
+
+    /**
+     * Get an SSLContext that implements the specified secure
+     * socket protocol and naively accepts all certificates
+     * without verification.
+     */
+    public static SSLContext getInstance(String protocol, String provider) throws NoSuchAlgorithmException, NoSuchProviderException
+    {
+        return init(SSLContext.getInstance(protocol, provider));
+    }
+
+
+    /**
+     * Set NaiveTrustManager to the given context.
+     */
+    private static SSLContext init(SSLContext context)
+    {
+        try
+        {
+            // Set NaiveTrustManager.
+            context.init(null, new TrustManager[] { new NaiveTrustManager() }, null);
+        }
+        catch (KeyManagementException e)
+        {
+            throw new RuntimeException("Failed to initialize an SSLContext.", e);
+        }
+
+        return context;
+    }
+
+
+    /**
+     * A {@link TrustManager} which trusts all certificates naively.
+     */
+    private static class NaiveTrustManager implements X509TrustManager
+    {
+        @Override
+        public X509Certificate[] getAcceptedIssuers()
+        {
+            return null;
+        }
+
+
+        public void checkClientTrusted(X509Certificate[] certs, String authType)
+        {
+        }
+
+
+        public void checkServerTrusted(X509Certificate[] certs, String authType)
+        {
+        }
+    }
+}