Change a little bit account menu to show actions to do on an account & do some code cleanups

src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountActionsActivity.java

@@ -0,0 +1,49 @@
+package fr.unix_experience.owncloud_sms.activities.remote_account;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+
+import fr.unix_experience.android_lib.AppCompatListActivity;
+import fr.unix_experience.owncloud_sms.R;
+
+public class AccountActionsActivity extends AppCompatListActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_account_actions);
+
+        ArrayList<String> itemList = new ArrayList<>();
+        ArrayAdapter<String> adp = new ArrayAdapter<>(getBaseContext(),
+                android.R.layout.simple_dropdown_item_1line, itemList);
+        setListAdapter(adp);
+
+        // Create item list
+        itemList.add(getBaseContext().getString(R.string.restore_all_messages));
+
+        adp.notifyDataSetChanged();
+
+        // Fetch account name from intent
+        _accountName = getIntent().getStringExtra("account");
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        switch (position) {
+            case 0:
+                Intent intent = new Intent(this, RestoreMessagesActivity.class);
+                intent.putExtra("account", _accountName);
+                startActivity(intent);
+                break;
+            default: break; // Unhandled
+        }
+    }
+
+    private String _accountName = "";
+    private static final String TAG = AccountActionsActivity.class.getSimpleName();
+}

src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java

@@ -12,8 +12,7 @@ import fr.unix_experience.android_lib.AppCompatListActivity;
 import fr.unix_experience.owncloud_sms.R;
 
 public class AccountListActivity extends AppCompatListActivity {
-	ArrayList<Account> listItems = new ArrayList<>();
-	AndroidAccountAdapter adapter;
+
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
@@ -22,16 +21,18 @@ public class AccountListActivity extends AppCompatListActivity {
 
 		setContentView(R.layout.restore_activity_accountlist);
 
-		adapter = new AndroidAccountAdapter(this,
+        ArrayList<Account> itemList = new ArrayList<>();
+
+        AndroidAccountAdapter adapter = new AndroidAccountAdapter(this,
 				android.R.layout.simple_list_item_1,
-				listItems,
+                itemList,
 				R.layout.account_list_item,
-				R.id.accountname, ContactListActivity.class);
+				R.id.accountname, AccountActionsActivity.class);
 		setListAdapter(adapter);
 
 		Account[] accountList =
 				_accountMgr.getAccountsByType(getString(R.string.account_type));
-        Collections.addAll(listItems, accountList);
+        Collections.addAll(itemList, accountList);
 
 		adapter.notifyDataSetChanged();
 

src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java

@@ -69,13 +69,15 @@ public class ContactListActivity extends AppCompatActivity implements ASyncConta
 		final Spinner sp = (Spinner) findViewById(R.id.contact_spinner);
 		mContactInfos = (LinearLayout) findViewById(R.id.contactinfos_layout);
 		final ProgressBar contactProgressBar = (ProgressBar) findViewById(R.id.contactlist_pgbar);
-        final ListView contactPhoneListView = (ListView) findViewById(R.id.contact_phonelistView);
+        ListView contactPhoneListView = (ListView) findViewById(R.id.contact_phonelistView);
         mContactPhoneListAdapter = new RecoveryPhoneNumberListViewAdapter(getBaseContext());
+        assert contactPhoneListView != null;
         contactPhoneListView.setAdapter(mContactPhoneListAdapter);
 
 		mContactInfos.setVisibility(View.INVISIBLE);
 
-		sp.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        assert sp != null;
+        sp.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 				mContactInfos.setVisibility(View.INVISIBLE);
@@ -97,7 +99,8 @@ public class ContactListActivity extends AppCompatActivity implements ASyncConta
 		for (final Account element : myAccountList) {
 			if (element.name.equals(accountName)) {
 				// Load "contacts"
-				contactProgressBar.setVisibility(View.VISIBLE);
+                assert contactProgressBar != null;
+                contactProgressBar.setVisibility(View.VISIBLE);
 				new ContactLoadTask(element, getBaseContext(), mAdapter, mObjects, mLayout, contactProgressBar, mContactInfos).execute();
 
 				// Add refresh handler

src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/RestoreMessagesActivity.java

@@ -0,0 +1,15 @@
+package fr.unix_experience.owncloud_sms.activities.remote_account;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import fr.unix_experience.owncloud_sms.R;
+
+public class RestoreMessagesActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_restore_messages);
+    }
+}