--- a/app/build.gradle Sun Mar 15 21:32:05 2015 +0100
+++ b/app/build.gradle Sun Mar 15 22:05:30 2015 +0100
@@ -20,7 +20,9 @@
}
lintOptions {
- abortOnError false
+ abortOnError true
+ textReport true
+ disable("MissingTranslation")
}
}
--- a/app/src/main/AndroidManifest.xml Sun Mar 15 21:32:05 2015 +0100
+++ b/app/src/main/AndroidManifest.xml Sun Mar 15 22:05:30 2015 +0100
@@ -50,7 +50,6 @@
android:launchMode="singleTask" />
<activity android:name=".ui.GroupList" android:label="GroupList" />
- <activity android:name=".ui.PrivacyList" android:label="@string/privacy_list_name" />
<!-- MemorizingTrustManagerActivity -->
<activity android:name="de.duenndns.ssl.MemorizingActivity" />
--- a/app/src/main/java/com/beem/project/beem/ui/PrivacyList.java Sun Mar 15 21:32:05 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-/*
- BEEM is a videoconference application on the Android Platform.
-
- Copyright (C) 2009 by Frederic-Charles Barthelery,
- Jean-Manuel Da Silva,
- Nikita Kozlov,
- Philippe Lago,
- Jean Baptiste Vergely,
- Vincent Veronis.
-
- This file is part of BEEM.
-
- BEEM is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- BEEM is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with BEEM. If not, see <http://www.gnu.org/licenses/>.
-
- Please send bug reports with examples or suggestions to
- contact@beem-project.com or http://dev.beem-project.com/
-
- Epitech, hereby disclaims all copyright interest in the program "Beem"
- written by Frederic-Charles Barthelery,
- Jean-Manuel Da Silva,
- Nikita Kozlov,
- Philippe Lago,
- Jean Baptiste Vergely,
- Vincent Veronis.
-
- Nicolas Sadirac, November 26, 2009
- President of Epitech.
-
- Flavien Astraud, November 26, 2009
- Head of the EIP Laboratory.
-
-*/
-package com.beem.project.beem.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.Dialog;
-import android.app.ListActivity;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.content.DialogInterface.OnDismissListener;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-
-import com.beem.project.beem.R;
-import com.beem.project.beem.service.PrivacyListItem;
-import com.beem.project.beem.service.aidl.IPrivacyListListener;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
-import com.beem.project.beem.service.aidl.IXmppFacade;
-import com.beem.project.beem.ui.dialogs.builders.CreatePrivacyList;
-import com.beem.project.beem.ui.dialogs.builders.DeletePrivacyList;
-import com.beem.project.beem.utils.BeemBroadcastReceiver;
-
-/**
- * This class represents an activity which allows the user to manage his privacy lists.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
- */
-public class PrivacyList extends ListActivity {
-
- private static final String TAG = "PrivacyList";
- private static final Intent SERVICE_INTENT = new Intent();
- static {
- SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
- }
-
- private static final int DIALOG_CREATE = 0;
- private static final int DIALOG_UPDATE_BUDDIES = 1;
- private static final int DIALOG_UPDATE_GROUPS = 2;
- private static final int DIALOG_DELETE = 3;
-
- private static final String SAVED_INSTANCE_KEY_PRIVACY_LISTS = "PRIVACY_LISTS";
-
- private Handler mHandler = new Handler();
-
- private ArrayAdapter<String> mAdapter;
- private final List<String> mPrivacyListNames = new ArrayList<String>();
- private String mCurrPrivacyListName;
-
- private final ServiceConnection mConn = new BeemServiceConnection();
- private final BeemBroadcastReceiver mBroadcastReceiver = new BeemBroadcastReceiver();
-
- private IPrivacyListManager mPrivacyListManager;
- private IPrivacyListListener mPrivacyListListener;
-
- /**
- * Constructor.
- */
- public PrivacyList() {
- super();
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected void onSaveInstanceState(Bundle savedInstanceState) {
- Log.d(TAG, "BEGIN onSaveInstanceState.");
- savedInstanceState.putStringArrayList(SAVED_INSTANCE_KEY_PRIVACY_LISTS, (ArrayList<String>) mPrivacyListNames);
- Log.d(TAG, "END onSaveInstanceState.");
- super.onSaveInstanceState(savedInstanceState);
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- Log.d(TAG, "BEGIN onCreate.");
-
- setContentView(R.layout.privacy_list);
- registerForContextMenu(this.getListView());
-
- mHandler = new Handler();
-
- if (savedInstanceState != null && !savedInstanceState.isEmpty()) {
- mPrivacyListNames.addAll(savedInstanceState.getStringArrayList(SAVED_INSTANCE_KEY_PRIVACY_LISTS));
- }
-
- mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, mPrivacyListNames);
- setListAdapter(mAdapter);
-
- bindService(SERVICE_INTENT, mConn, BIND_AUTO_CREATE);
-
- mPrivacyListListener = new PrivacyListListener();
- this.registerReceiver(mBroadcastReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
-
- Log.d(TAG, "END onCreate.");
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected void onDestroy() {
- super.onDestroy();
-
- Log.v(TAG, "BEGIN onDestroy.");
-
- if (mPrivacyListManager != null) {
- try {
- mPrivacyListManager.removePrivacyListListener(mPrivacyListListener);
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- }
- }
-
- this.unregisterReceiver(mBroadcastReceiver);
- unbindService(mConn);
-
- Log.v(TAG, "END onDestroy.");
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected void onStart() {
- super.onStart();
-
- Log.v(TAG, "BEGIN onStart.");
- Log.v(TAG, "END onStart.");
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected void onStop() {
- super.onStop();
-
- Log.v(TAG, "BEGIN onStop.");
- Log.v(TAG, "END onStop.");
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- protected Dialog onCreateDialog(int id) {
- Dialog dialog;
- switch (id) {
- case DIALOG_CREATE:
- dialog = new CreatePrivacyList(PrivacyList.this, mPrivacyListManager).create();
- dialog.setOnDismissListener(new OnDismissListener() {
-
- @Override
- public void onDismiss(DialogInterface dialog) {
- PrivacyList.this.removeDialog(DIALOG_CREATE);
- }
- });
- break;
- case DIALOG_DELETE:
- dialog = new DeletePrivacyList(PrivacyList.this, mPrivacyListManager, mCurrPrivacyListName).create();
- dialog.setOnDismissListener(new OnDismissListener() {
-
- @Override
- public void onDismiss(DialogInterface dialog) {
- PrivacyList.this.removeDialog(DIALOG_DELETE);
- }
-
- });
- break;
- default:
- dialog = null;
- }
- return dialog;
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public final boolean onCreateOptionsMenu(Menu menu) {
- super.onCreateOptionsMenu(menu);
-
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.privacy_list, menu);
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
- super.onCreateContextMenu(menu, v, menuInfo);
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.privacy_list_context, menu);
- mCurrPrivacyListName = mPrivacyListNames.get(((AdapterView.AdapterContextMenuInfo) menuInfo).position);
- menu.setHeaderTitle(mCurrPrivacyListName);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean onContextItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.privacy_list_context_menu_buddies_item:
- return true;
- case R.id.privacy_list_context_menu_groups_item:
- return true;
- case R.id.privacy_list_context_menu_delete_item:
- showDialog(DIALOG_DELETE);
- return true;
- default:
- return super.onContextItemSelected(item);
- }
- }
-
- /**
- * {@inheritDoc}.
- */
- @Override
- public final boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.privacy_list_menu_create:
- showDialog(DIALOG_CREATE);
- return true;
- default:
- return false;
- }
- }
-
- /**
- * Service connection.
- * @author jamu
- */
- private final class BeemServiceConnection implements ServiceConnection {
-
- private IXmppFacade mXmppFacade;
-
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- Log.v(TAG, "BEGIN onServiceConnected.");
- mXmppFacade = IXmppFacade.Stub.asInterface(service);
- try {
- mPrivacyListManager = mXmppFacade.getPrivacyListManager();
- mPrivacyListManager.addPrivacyListListener(mPrivacyListListener);
- mPrivacyListNames.clear();
- mPrivacyListNames.addAll(mPrivacyListManager.getPrivacyLists());
- mAdapter.notifyDataSetChanged();
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- }
- Log.v(TAG, "END onServiceConnected.");
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- Log.v(TAG, "BEGIN onServiceDisconnected.");
- mXmppFacade = null;
- try {
- mPrivacyListManager.removePrivacyListListener(mPrivacyListListener);
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- }
- Log.v(TAG, "END onServiceDisconnected.");
- }
- }
-
- /**
- * Listener.
- * @author jamu
- */
- private class PrivacyListListener extends IPrivacyListListener.Stub {
-
- @Override
- public void setPrivacyList(String listName, List<PrivacyListItem> listItem) throws RemoteException {
- Log.d(TAG, "BEGIN PrivacyListListener >> setPrivacyList.");
- Log.d(TAG, "> " + listName + " has been setted.");
- Log.d(TAG, "END PrivacyListListener >> setPrivacyList.");
- }
-
- @Override
- public void updatedPrivacyList(final String listName) throws RemoteException {
- Log.d(TAG, "BEGIN PrivacyListListener >> updatedPrivacyList.");
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- try {
- mPrivacyListNames.clear();
- // Not that much lists and require some server queries to know if the list has been
- // updated/deleted or set to default/active by this activity or another IM client.
- mPrivacyListNames.addAll(mPrivacyListManager.getPrivacyLists());
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- }
- mAdapter.notifyDataSetChanged();
- }
- });
- Log.d(TAG, "END PrivacyListListener >> updatedPrivacyList.");
- }
- }
-}
--- a/app/src/main/java/com/beem/project/beem/ui/Settings.java Sun Mar 15 21:32:05 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/ui/Settings.java Sun Mar 15 22:05:30 2015 +0100
@@ -109,10 +109,6 @@
i = new Intent(this, Account.class);
startActivity(i);
return true;
- case R.id.settings_menu_privacy_lists:
- i = new Intent(this, PrivacyList.class);
- startActivity(i);
- return true;
default:
return false;
}
--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/Alias.java Sun Mar 15 21:32:05 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/Alias.java Sun Mar 15 22:05:30 2015 +0100
@@ -43,6 +43,8 @@
*/
package com.beem.project.beem.ui.dialogs.builders;
+import static com.google.android.apps.iosched.util.LogUtils.makeLogTag;
+
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -55,13 +57,14 @@
import com.beem.project.beem.R;
import com.beem.project.beem.service.Contact;
import com.beem.project.beem.service.aidl.IRoster;
+import com.google.android.apps.iosched.util.LogUtils;
/**
* Create dialog alias.
*/
public class Alias extends AlertDialog.Builder {
- private static final String TAG = "Dialogs.Builders > Alias";
+ private static final String TAG = makeLogTag(Alias.class);
private IRoster mRoster;
private Contact mContact;
--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/CreatePrivacyList.java Sun Mar 15 21:32:05 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
- BEEM is a videoconference application on the Android Platform.
-
- Copyright (C) 2009 by Frederic-Charles Barthelery,
- Jean-Manuel Da Silva,
- Nikita Kozlov,
- Philippe Lago,
- Jean Baptiste Vergely,
- Vincent Veronis.
-
- This file is part of BEEM.
-
- BEEM is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- BEEM is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with BEEM. If not, see <http://www.gnu.org/licenses/>.
-
- Please send bug reports with examples or suggestions to
- contact@beem-project.com or http://dev.beem-project.com/
-
- Epitech, hereby disclaims all copyright interest in the program "Beem"
- written by Frederic-Charles Barthelery,
- Jean-Manuel Da Silva,
- Nikita Kozlov,
- Philippe Lago,
- Jean Baptiste Vergely,
- Vincent Veronis.
-
- Nicolas Sadirac, November 26, 2009
- President of Epitech.
-
- Flavien Astraud, November 26, 2009
- Head of the EIP Laboratory.
-
-*/
-package com.beem.project.beem.ui.dialogs.builders;
-
-import java.util.ArrayList;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-
-import com.beem.project.beem.R;
-import com.beem.project.beem.service.PrivacyListItem;
-import com.beem.project.beem.service.aidl.IPrivacyListManager;
-
-/**
- * Use this builder to build a dialog which handles a privacy list creation.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
- */
-public class CreatePrivacyList extends AlertDialog.Builder {
-
- private static final String TAG = "Dialogs.Builders > CreatePrivacyList";
-
- private final IPrivacyListManager mPrivacyListManager;
- private final View mTextEntryView;
- private EditText mListNameField;
-
- /**
- * Constructor.
- * @param context context activity.
- * @param privacyListManager the privacy list manager that will be use to create our list.
- */
- public CreatePrivacyList(final Context context, final IPrivacyListManager privacyListManager) {
- super(context);
-
- LayoutInflater factory = LayoutInflater.from(context);
-
- mTextEntryView = factory.inflate(R.layout.privacy_list_create_dialog, null);
- setView(mTextEntryView);
-
- mPrivacyListManager = privacyListManager;
- mListNameField = (EditText) mTextEntryView.findViewById(R.id.privacy_list_create_dialog_list_name);
-
- setTitle(R.string.privacy_list_create_dialog_title);
- setPositiveButton(R.string.privacy_list_create_dialog_create_button, new DialogClickListener());
- setNegativeButton(R.string.CancelButton, new DialogClickListener());
- }
-
- /**
- * Event click listener.
- */
- class DialogClickListener implements DialogInterface.OnClickListener {
-
- /**
- * Constructor.
- */
- public DialogClickListener() {
- }
-
- @Override
- public void onClick(final DialogInterface dialog, final int which) {
- if (which == DialogInterface.BUTTON_POSITIVE) {
- try {
- Log.d(TAG, "mPrivacyListManager ## " + mPrivacyListManager);
- Log.d(TAG, "listNameField ## " + mListNameField);
- Log.d(TAG, "listNameField.getText().toString() ## " + mListNameField.getText().toString());
- mPrivacyListManager.createPrivacyList(mListNameField.getText().toString(),
- new ArrayList<PrivacyListItem>());
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- }
- }
- }
- }
-}
--- a/app/src/main/res/menu/edit_settings.xml Sun Mar 15 21:32:05 2015 +0100
+++ b/app/src/main/res/menu/edit_settings.xml Sun Mar 15 22:05:30 2015 +0100
@@ -3,8 +3,4 @@
android:visible="true"
android:icon="@drawable/ic_menu_invite"
android:title="@string/settings_menu_create_account" />
- <item android:id="@+id/settings_menu_privacy_lists"
- android:visible="false"
- android:title="@string/settings_menu_privacy_lists"
- android:icon="@drawable/ic_menu_blocked_user" />
</menu>
--- a/app/src/main/res/values/strings.xml Sun Mar 15 21:32:05 2015 +0100
+++ b/app/src/main/res/values/strings.xml Sun Mar 15 22:05:30 2015 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Generic terms -->
<string name="app_name">Beem</string>
<string name="OkButton">Ok</string>
@@ -255,7 +255,7 @@
<string name="chat_otrstate_encrypted">ENCRYPTED</string>
<string name="chat_otrstate_finished">FINISHED</string>
<string name="chat_otrstate_authenticated">AUTHENTICATED</string>
- <string name="chat_otr_verify_key" formatted="false">
+ <string name="chat_otr_verify_key" formatted="false" tools:ignore="StringFormatInvalid">
Authenticating a buddy helps ensure that the person you are talking to is who they claim to be.\n\n
To verify the fingerprint, contact your buddy via some <i>other</i> authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other.\n\n
If everything matches up, you should indicate in the above dialog that you <b>have</b> verified the fingerprint.\n\n