ui: don't show disabled accounts in quick list

Tuleap: #468
Change-Id: I7fb15a433047df05d559aecee5e7ed3e16694898

ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java

@@ -21,12 +21,13 @@
 
 package cx.ring.adapters;
 
-import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 import cx.ring.R;
 
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,15 +41,15 @@ public class AccountSelectionAdapter extends BaseAdapter {
 
     private static final String TAG = AccountSelectionAdapter.class.getSimpleName();
 
-    private List<Account> accounts;
-    private Context mContext;
+    private final List<Account> all_accounts = new ArrayList<>();
+    private final List<Account> accounts = new ArrayList<>();
+    private final Context mContext;
     private int selectedAccount = -1;
-    private static final String DEFAULT_ACCOUNT_ID = "IP2IP";
 
     public AccountSelectionAdapter(Context cont, List<Account> newList) {
         super();
-        accounts = newList;
         mContext = cont;
+        setAccounts(newList);
     }
 
     @Override
@@ -83,7 +84,7 @@ public class AccountSelectionAdapter extends BaseAdapter {
         } else {
             entryView = (AccountView) rowView.getTag();
         }
-        entryView.error.setColorFilter(mContext.getResources().getColor(R.color.error_red));
+        entryView.error.setColorFilter(ContextCompat.getColor(mContext, R.color.error_red));
 
 /*
         entryView.alias.setText(accounts.get(pos).getAlias());
@@ -114,7 +115,7 @@ public class AccountSelectionAdapter extends BaseAdapter {
         } else {
             entryView = (AccountView) rowView.getTag();
         }
-        entryView.error.setColorFilter(mContext.getResources().getColor(R.color.error_red));
+        entryView.error.setColorFilter(ContextCompat.getColor(mContext, R.color.error_red));
 
         updateAccountView(entryView, accounts.get(pos));
         return rowView;
@@ -158,51 +159,29 @@ public class AccountSelectionAdapter extends BaseAdapter {
         return accounts.get(selectedAccount);
     }
 
-    public void removeAll() {
-        accounts.clear();
-        notifyDataSetChanged();
-
-    }
-
-    public void addAll(List<Account> results) {
-        accounts.addAll(results);
-        notifyDataSetChanged();
-    }
-
     public void replaceAll(List<Account> results) {
-        accounts.clear();
-        accounts.addAll(results);
+        setAccounts(results);
         notifyDataSetChanged();
     }
 
-    /**
-     * Modify state of specific account
-     */
-    public void updateAccount(String accoundID, String state, int code) {
-        Log.i(TAG, "updateAccount ");
-
-        for (Account a : accounts) {
-            if (a.getAccountID().contentEquals(accoundID)) {
-                a.setRegistrationState(state, code);
-                Log.i(TAG, "updateAccount " + accoundID + " " + code);
-                notifyDataSetChanged();
-                return;
-            }
-        }
+    private void setAccounts(List<Account> results) {
+        all_accounts.clear();
+        accounts.clear();
+        all_accounts.addAll(results);
+        for (Account acc : results)
+            if (acc.isEnabled())
+                accounts.add(acc);
     }
 
-    public String getAccountOrder() {
-        String result = DEFAULT_ACCOUNT_ID + File.separator;
+    public List<String> getAccountOrder() {
+        List<String> result = new ArrayList<>(accounts.size());
         String selectedID = accounts.get(selectedAccount).getAccountID();
-        result += selectedID + File.separator;
-
-        for (Account a : accounts) {
-            if (a.getAccountID().contentEquals(selectedID)) {
+        result.add(selectedID);
+        for (Account a : all_accounts) {
+            if (a.getAccountID().contentEquals(selectedID))
                 continue;
+            result.add(a.getAccountID());
         }
-            result += a.getAccountID() + File.separator;
-        }
-
         return result;
     }
 

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

@@ -55,7 +55,6 @@ import java.util.List;
 public class AccountsManagementFragment extends Fragment {
     static final String TAG = AccountsManagementFragment.class.getSimpleName();
 
-    private static final String DEFAULT_ACCOUNT_ID = "IP2IP";
     public static final int ACCOUNT_CREATE_REQUEST = 1;
     public static final int ACCOUNT_EDIT_REQUEST = 2;
     private AccountsAdapter mAccountsAdapter;
@@ -70,17 +69,12 @@ public class AccountsManagementFragment extends Fragment {
                 Account item = mAccountsAdapter.getItem(from);
                 mAccountsAdapter.remove(item);
                 mAccountsAdapter.insert(item, to);
-                try {
-                    mCallbacks.getService().getRemoteService().setAccountOrder(mAccountsAdapter.generateAccountOrder());
-                } catch (RemoteException e) {
-                    e.printStackTrace();
-                }
+                mCallbacks.getService().setAccountOrder(mAccountsAdapter.getAccountOrder());
             }
         }
     };
 
     private LocalService.Callbacks mCallbacks = LocalService.DUMMY_CALLBACKS;
-    //private Account ip2ip;
 
     @Override
     public void onAttach(Activity activity) {
@@ -351,12 +345,11 @@ public class AccountsManagementFragment extends Fragment {
             notifyDataSetChanged();
         }
 
-        private String generateAccountOrder() {
-            String result = DEFAULT_ACCOUNT_ID + File.separator;
-            for (Account a : accounts) {
-                result += a.getAccountID() + File.separator;
-            }
-            return result;
+        private List<String> getAccountOrder() {
+            ArrayList<String> order = new ArrayList<>(accounts.size());
+            for (Account acc : accounts)
+                order.add(acc.getAccountID());
+            return order;
         }
 
     }

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

@@ -81,7 +81,6 @@ public class GeneralAccountFragment extends PreferenceFragment {
 
     private void setPreferenceDetails(AccountDetail details) {
         for (AccountDetail.PreferenceEntry p : details.getDetailValues()) {
-            //Log.i(TAG, "setPreferenceDetails: pref " + p.mKey + " value " + p.mValue);
             Preference pref = findPreference(p.mKey);
             if (pref != null) {
                 if (!p.isTwoState) {
@@ -96,11 +95,8 @@ public class GeneralAccountFragment extends PreferenceFragment {
                         pref.setSummary(p.mValue);
                     }
                 } else {
-                    Log.i(TAG, "pref:"+p.mKey);
                     ((TwoStatePreference) pref).setChecked(p.isChecked());
                 }
-            } else {
-                Log.w(TAG, "pref not found");
             }
         }
     }

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

@@ -2,6 +2,7 @@
  *  Copyright (C) 2004-2016 Savoir-faire Linux Inc.
  *
  *  Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,7 +28,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -56,7 +56,7 @@ public class MenuFragment extends Fragment {
     @SuppressWarnings("unused")
     private static final String TAG = MenuFragment.class.getSimpleName();
 
-    AccountSelectionAdapter mAccountAdapter;
+    private AccountSelectionAdapter mAccountAdapter;
     private Spinner spinnerAccounts;
     private ImageButton shareBtn;
     private Button newAccountBtn;
@@ -64,16 +64,6 @@ public class MenuFragment extends Fragment {
 
     private LocalService.Callbacks mCallbacks = LocalService.DUMMY_CALLBACKS;
 
-    public Account retrieveAccountById(String accountID) {
-        Account toReturn;
-        toReturn = mAccountAdapter.getAccount(accountID);
-
-        if(toReturn == null || !toReturn.isRegistered())
-            return getSelectedAccount();
-
-        return toReturn;
-    }
-
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -98,7 +88,6 @@ public class MenuFragment extends Fragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        //getLoaderManager().restartLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
     }
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -167,12 +156,7 @@ public class MenuFragment extends Fragment {
                 Bitmap qrBitmap = encodeStringAsQrBitmap(share_uri, qrImage.getWidth());
                 qrImage.setImageBitmap(qrBitmap);
 
-                //view.findViewById(R.id.account_selected).setVisibility(View.GONE);
-                try {
-                    mCallbacks.getRemoteService().setAccountOrder(mAccountAdapter.getAccountOrder());
-                } catch (RemoteException e) {
-                    e.printStackTrace();
-                }
+                mCallbacks.getService().setAccountOrder(mAccountAdapter.getAccountOrder());
             }
 
             @Override
@@ -202,8 +186,6 @@ public class MenuFragment extends Fragment {
     }
 
     public void updateAllAccounts() {
-        /*if (getActivity() != null)
-            getLoaderManager().restartLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);*/
         if (mAccountAdapter != null && mCallbacks.getService() != null) {
             List<Account> accs = mCallbacks.getService().getAccounts();
             if (accs.isEmpty()) {
@@ -226,6 +208,7 @@ public class MenuFragment extends Fragment {
             qr_image_matrix = qr_writer.encode(input, BarcodeFormat.QR_CODE, qrWindowPixels , qrWindowPixels);
         } catch (WriterException e) {
             e.printStackTrace();
+            return null;
         }
 
         int qrImageWidth = qr_image_matrix.getWidth();

ring-android/app/src/main/java/cx/ring/service/DRingService.java

@@ -724,7 +724,7 @@ public class DRingService extends Service {
             getExecutor().execute(new SipRunnable() {
                 @Override
                 protected void doRun() throws SameThreadException {
-                    Log.i(TAG, "DRingService.setAccountsOrder() thread running...");
+                    Log.i(TAG, "DRingService.setAccountsOrder() " + order + " thread running...");
                     Ringservice.setAccountsOrder(order);
                 }
             });

ring-android/app/src/main/java/cx/ring/service/LocalService.java

@@ -62,6 +62,7 @@ import android.util.LongSparseArray;
 import android.util.LruCache;
 import android.util.Pair;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -358,6 +359,8 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
             boolean haveSipAccount = false;
             boolean haveRingAccount = false;
             for (Account acc : accounts) {
+                if (!acc.isEnabled())
+                    continue;
                 if (acc.isSip())
                     haveSipAccount = true;
                 else if (acc.isRing())
@@ -511,6 +514,25 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
                 return acc;
         return null;
     }
+    public void setAccountOrder(List<String> accountOrder) {
+        ArrayList<Account> newlist = new ArrayList<>(accounts.size());
+        String order = "";
+        for (String acc_id : accountOrder) {
+            Account acc = getAccount(acc_id);
+            if (acc != null)
+                newlist.add(acc);
+            order += acc_id + File.separator;
+        }
+        accounts = newlist;
+        try {
+            order += AccountsLoader.ACCOUNT_IP2IP;
+            mService.setAccountOrder(order);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+        sendBroadcast(new Intent(ACTION_ACCOUNT_UPDATE));
+    }
+
 
     public ArrayList<Conversation> getConversations() {
         ArrayList<Conversation> convs = new ArrayList<>(conversations.values());