commit 4030d2e5cf4dfef2af067f9d0e8a44a47e9d44ae
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Dec 02 23:08:03 2018 -0500
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Dec 02 23:08:33 2018 -0500
tree 2cb7d115e46aa21855b938ae542e63616585c434
parent a3204d1f5d22a7c0b30454f15e7776f587743e13

conversation: add audio, video preview

Change-Id: I48430557e5d57663f07512145211a420ee35dee6

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 9f2f993..2fe2557 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -181,9 +181,6 @@
     private File mCurrentPhoto = null;
     private Disposable actionbarTarget = null;
 
-    private Handler mHandler = new Handler();
-    private static final int REFRESH_INTERVAL = 10000;
-
     private static int getIndex(Spinner spinner, Uri myString) {
         for (int i = 0, n = spinner.getCount(); i < n; i++)
             if (((Phone) spinner.getItemAtPosition(i)).getNumber().equals(myString)) {
@@ -206,33 +203,6 @@
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        restartTimer();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        mHandler.removeCallbacks(mRefreshTask);
-
-    }
-
-    private void restartTimer() {
-        mHandler.removeCallbacks(mRefreshTask);
-        mHandler.postDelayed(mRefreshTask, REFRESH_INTERVAL);
-    }
-
-    private final Runnable mRefreshTask = new Runnable() {
-        @Override
-        public void run() {
-            if (mAdapter != null)
-                mAdapter.notifyDataSetChanged();
-            mHandler.postDelayed(mRefreshTask, REFRESH_INTERVAL);
-        }
-    };
-
-    @Override
     public void scrollToEnd() {
         if (mAdapter.getItemCount() > 0) {
             mHistList.scrollToPosition(mAdapter.getItemCount() - 1);
@@ -313,6 +283,12 @@
     }
 
     @Override
+    public void onDestroyView() {
+        mHistList.setAdapter(null);
+        super.onDestroyView();
+    }
+
+    @Override
     public boolean onContextItemSelected(MenuItem item) {
         if (mAdapter.onContextItemSelected(item))
             return true;
@@ -349,7 +325,6 @@
     public void takePicture() {
         Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
-
             // Create the File where the photo should go
             File photoFile = null;
             try {
@@ -431,7 +406,6 @@
     public void addElement(ConversationElement element) {
         mAdapter.add(element);
         scrollToEnd();
-        restartTimer();
     }
 
     @Override