Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Changed the root package from net.sf.briar to org.briarproject.

Browse Source
This commit is contained in:
akwizgran
2014-01-08 16:18:30 +00:00
parent dce70f487c
commit 832476412c
427 changed files with 2507 additions and 2507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
briar-android/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.sf.briar"
package="org.briarproject"
android:versionCode="1"
android:versionName="1.0" >
@@ -22,7 +22,7 @@
android:name=".android.BriarService"
android:exported="false" >
<intent-filter>
<action android:name="net.sf.briar.android.BriarService" />
<action android:name="org.briarproject.android.BriarService" />
</intent-filter>
</service>
<activity
@@ -46,31 +46,43 @@
android:label="@string/contact_list_title" >
</activity>
<activity
android:name="net.sf.briar.android.groups.ConfigureGroupActivity"
android:name=".android.contact.ConversationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="net.sf.briar.android.groups.CreateGroupActivity"
android:name=".android.contact.ReadPrivateMessageActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name=".android.contact.WritePrivateMessageActivity"
android:label="@string/new_message_title" >
</activity>
<activity
android:name=".android.groups.ConfigureGroupActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name=".android.groups.CreateGroupActivity"
android:label="@string/create_forum_title" >
</activity>
<activity
android:name="net.sf.briar.android.groups.GroupActivity"
android:name=".android.groups.GroupActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="net.sf.briar.android.groups.GroupListActivity"
android:name=".android.groups.GroupListActivity"
android:label="@string/forums_title" >
</activity>
<activity
android:name="net.sf.briar.android.groups.ManageGroupsActivity"
android:name=".android.groups.ManageGroupsActivity"
android:label="@string/manage_subscriptions_title" >
</activity>
<activity
android:name="net.sf.briar.android.groups.ReadGroupPostActivity"
<activity
android:name=".android.groups.ReadGroupPostActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="net.sf.briar.android.groups.WriteGroupPostActivity"
android:name=".android.groups.WriteGroupPostActivity"
android:label="@string/new_post_title" >
</activity>
<activity
@@ -81,17 +93,5 @@
android:name=".android.invitation.AddContactActivity"
android:label="@string/add_contact_title" >
</activity>
<activity
android:name="net.sf.briar.android.contact.ConversationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="net.sf.briar.android.contact.ReadPrivateMessageActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name="net.sf.briar.android.contact.WritePrivateMessageActivity"
android:label="@string/new_message_title" >
</activity>
</application>
</manifest>

24
briar-android/res/values/roboguice.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="roboguice_modules">
<item>net.sf.briar.android.AndroidModule</item>
<item>net.sf.briar.clock.ClockModule</item>
<item>net.sf.briar.crypto.CryptoModule</item>
<item>net.sf.briar.db.DatabaseModule</item>
<item>net.sf.briar.invitation.InvitationModule</item>
<item>net.sf.briar.lifecycle.LifecycleModule</item>
<item>net.sf.briar.messaging.MessagingModule</item>
<item>net.sf.briar.messaging.duplex.DuplexMessagingModule</item>
<item>net.sf.briar.messaging.simplex.SimplexMessagingModule</item>
<item>net.sf.briar.plugins.PluginsModule</item>
<item>net.sf.briar.serial.SerialModule</item>
<item>net.sf.briar.transport.TransportModule</item>
<item>org.briarproject.android.AndroidModule</item>
<item>org.briarproject.crypto.CryptoModule</item>
<item>org.briarproject.db.DatabaseModule</item>
<item>org.briarproject.invitation.InvitationModule</item>
<item>org.briarproject.lifecycle.LifecycleModule</item>
<item>org.briarproject.messaging.MessagingModule</item>
<item>org.briarproject.messaging.duplex.DuplexMessagingModule</item>
<item>org.briarproject.messaging.simplex.SimplexMessagingModule</item>
<item>org.briarproject.plugins.PluginsModule</item>
<item>org.briarproject.serial.SerialModule</item>
<item>org.briarproject.system.SystemModule</item>
<item>org.briarproject.transport.TransportModule</item>
</string-array>
</resources>

4
briar-android/src/net/sf/briar/android/AndroidExecutorImpl.java → briar-android/src/org/briarproject/android/AndroidExecutorImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import net.sf.briar.api.android.AndroidExecutor;
import org.briarproject.api.android.AndroidExecutor;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;

4
briar-android/src/net/sf/briar/android/AndroidFileUtils.java → briar-android/src/org/briarproject/android/AndroidFileUtils.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.android;
package org.briarproject.android;
import java.io.File;
import java.io.IOException;
import net.sf.briar.api.system.FileUtils;
import org.briarproject.api.system.FileUtils;
import android.os.Build;
import android.os.StatFs;

38
briar-android/src/net/sf/briar/android/AndroidModule.java → briar-android/src/org/briarproject/android/AndroidModule.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import static android.content.Context.MODE_PRIVATE;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -16,24 +16,24 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.android.ReferenceManager;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexPluginConfig;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.api.ui.UiCallback;
import net.sf.briar.plugins.droidtooth.DroidtoothPluginFactory;
import net.sf.briar.plugins.tcp.DroidLanTcpPluginFactory;
import net.sf.briar.plugins.tcp.WanTcpPluginFactory;
import net.sf.briar.plugins.tor.TorPluginFactory;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.PluginExecutor;
import org.briarproject.api.plugins.duplex.DuplexPluginConfig;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.plugins.simplex.SimplexPluginConfig;
import org.briarproject.api.plugins.simplex.SimplexPluginFactory;
import org.briarproject.api.system.FileUtils;
import org.briarproject.api.ui.UiCallback;
import org.briarproject.plugins.droidtooth.DroidtoothPluginFactory;
import org.briarproject.plugins.tcp.DroidLanTcpPluginFactory;
import org.briarproject.plugins.tcp.WanTcpPluginFactory;
import org.briarproject.plugins.tor.TorPluginFactory;
import android.app.Application;
import android.content.Context;

4
briar-android/src/net/sf/briar/android/AscendingHeaderComparator.java → briar-android/src/org/briarproject/android/AscendingHeaderComparator.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android;
package org.briarproject.android;
import java.util.Comparator;
import net.sf.briar.api.db.MessageHeader;
import org.briarproject.api.db.MessageHeader;
public class AscendingHeaderComparator implements Comparator<MessageHeader> {

10
briar-android/src/net/sf/briar/android/BriarService.java → briar-android/src/org/briarproject/android/BriarService.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
@@ -9,10 +9,10 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.lifecycle.LifecycleManager;
import org.briarproject.R;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.service.RoboService;
import android.app.PendingIntent;
import android.content.ComponentName;

38
briar-android/src/net/sf/briar/android/HomeScreenActivity.java → briar-android/src/org/briarproject/android/HomeScreenActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
@@ -11,8 +11,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import java.util.ArrayList;
import java.util.List;
@@ -21,21 +21,21 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.BriarService.BriarBinder;
import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.contact.ContactListActivity;
import net.sf.briar.android.groups.GroupListActivity;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.android.ReferenceManager;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.util.StringUtils;
import org.briarproject.R;
import org.briarproject.android.BriarService.BriarBinder;
import org.briarproject.android.BriarService.BriarServiceConnection;
import org.briarproject.android.contact.ContactListActivity;
import org.briarproject.android.groups.GroupListActivity;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.util.StringUtils;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -86,7 +86,7 @@ public class HomeScreenActivity extends RoboActivity {
public void onCreate(Bundle state) {
super.onCreate(state);
Intent i = getIntent();
long handle = i.getLongExtra("net.sf.briar.LOCAL_AUTHOR_HANDLE", -1);
long handle = i.getLongExtra("org.briarproject.LOCAL_AUTHOR_HANDLE", -1);
if(handle != -1) {
// The activity was launched from the setup wizard
if(System.currentTimeMillis() < EXPIRY_DATE) {

4
briar-android/src/net/sf/briar/android/ReferenceManagerImpl.java → briar-android/src/org/briarproject/android/ReferenceManagerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import static java.util.logging.Level.INFO;
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
import net.sf.briar.api.android.ReferenceManager;
import org.briarproject.api.android.ReferenceManager;
class ReferenceManagerImpl implements ReferenceManager {

26
briar-android/src/net/sf/briar/android/SetupActivity.java → briar-android/src/org/briarproject/android/SetupActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android;
package org.briarproject.android;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.text.InputType.TYPE_CLASS_TEXT;
@@ -9,23 +9,23 @@ import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import java.util.Arrays;
import java.util.concurrent.Executor;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.ReferenceManager;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyPair;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.util.StringUtils;
import org.briarproject.R;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.util.StringUtils;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -215,7 +215,7 @@ public class SetupActivity extends RoboActivity implements OnClickListener {
public void run() {
Intent i = new Intent(SetupActivity.this,
HomeScreenActivity.class);
i.putExtra("net.sf.briar.LOCAL_AUTHOR_HANDLE", handle);
i.putExtra("org.briarproject.LOCAL_AUTHOR_HANDLE", handle);
i.setFlags(FLAG_ACTIVITY_NEW_TASK);
startActivity(i);
finish();

6
briar-android/src/net/sf/briar/android/SplashScreenActivity.java → briar-android/src/org/briarproject/android/SplashScreenActivity.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.android;
package org.briarproject.android;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import net.sf.briar.api.db.DatabaseConfig;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import org.briarproject.api.db.DatabaseConfig;
import roboguice.RoboGuice;
import roboguice.activity.RoboSplashActivity;
import android.content.Intent;

4
briar-android/src/net/sf/briar/android/contact/ContactItem.java → briar-android/src/org/briarproject/android/contact/ContactItem.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import net.sf.briar.api.Contact;
import org.briarproject.api.Contact;
public class ContactItem {

2
briar-android/src/net/sf/briar/android/contact/ContactItemComparator.java → briar-android/src/org/briarproject/android/contact/ContactItemComparator.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import java.util.Comparator;

58
briar-android/src/net/sf/briar/android/contact/ContactListActivity.java → briar-android/src/org/briarproject/android/contact/ContactListActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.Collection;
import java.util.Comparator;
@@ -17,28 +17,28 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.invitation.AddContactActivity;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.event.ContactAddedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.transport.ConnectionListener;
import net.sf.briar.api.transport.ConnectionRegistry;
import org.briarproject.R;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.AuthorId;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.db.NoSuchContactException;
import org.briarproject.api.event.ContactAddedEvent;
import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.transport.ConnectionListener;
import org.briarproject.api.transport.ConnectionRegistry;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -212,10 +212,10 @@ ConnectionListener {
GroupId inbox = item.getInboxGroupId();
AuthorId localAuthorId = item.getContact().getLocalAuthorId();
Intent i = new Intent(this, ConversationActivity.class);
i.putExtra("net.sf.briar.CONTACT_ID", contactId.getInt());
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.GROUP_ID", inbox.getBytes());
i.putExtra("net.sf.briar.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
i.putExtra("org.briarproject.CONTACT_ID", contactId.getInt());
i.putExtra("org.briarproject.CONTACT_NAME", contactName);
i.putExtra("org.briarproject.GROUP_ID", inbox.getBytes());
i.putExtra("org.briarproject.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
startActivity(i);
}

6
briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java → briar-android/src/org/briarproject/android/contact/ContactListAdapter.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.view.Gravity.CENTER_VERTICAL;
import static android.widget.LinearLayout.HORIZONTAL;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.util.ArrayList;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.text.Html;

8
briar-android/src/net/sf/briar/android/contact/ContactListItem.java → briar-android/src/org/briarproject/android/contact/ContactListItem.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import java.util.Collection;
import net.sf.briar.api.Contact;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.messaging.GroupId;
import org.briarproject.api.Contact;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.messaging.GroupId;
// This class is not thread-safe
class ContactListItem {

70
briar-android/src/net/sf/briar/android/contact/ConversationActivity.java → briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.Collection;
import java.util.concurrent.Executor;
@@ -15,23 +15,23 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.AuthorId;
import org.briarproject.api.ContactId;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.db.NoSuchContactException;
import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -68,16 +68,16 @@ implements EventListener, OnClickListener, OnItemClickListener {
super.onCreate(state);
Intent i = getIntent();
int id = i.getIntExtra("net.sf.briar.CONTACT_ID", -1);
int id = i.getIntExtra("org.briarproject.CONTACT_ID", -1);
if(id == -1) throw new IllegalStateException();
contactId = new ContactId(id);
contactName = i.getStringExtra("net.sf.briar.CONTACT_NAME");
contactName = i.getStringExtra("org.briarproject.CONTACT_NAME");
if(contactName == null) throw new IllegalStateException();
setTitle(contactName);
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
b = i.getByteArrayExtra("net.sf.briar.LOCAL_AUTHOR_ID");
b = i.getByteArrayExtra("org.briarproject.LOCAL_AUTHOR_ID");
if(b == null) throw new IllegalStateException();
localAuthorId = new AuthorId(b);
@@ -221,9 +221,9 @@ implements EventListener, OnClickListener, OnItemClickListener {
public void onClick(View view) {
Intent i = new Intent(this, WritePrivateMessageActivity.class);
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("net.sf.briar.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
i.putExtra("org.briarproject.CONTACT_NAME", contactName);
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
startActivity(i);
}
@@ -235,14 +235,14 @@ implements EventListener, OnClickListener, OnItemClickListener {
private void displayMessage(int position) {
MessageHeader header = adapter.getItem(position).getHeader();
Intent i = new Intent(this, ReadPrivateMessageActivity.class);
i.putExtra("net.sf.briar.CONTACT_ID", contactId.getInt());
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("net.sf.briar.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
i.putExtra("net.sf.briar.AUTHOR_NAME", header.getAuthor().getName());
i.putExtra("net.sf.briar.MESSAGE_ID", header.getId().getBytes());
i.putExtra("net.sf.briar.CONTENT_TYPE", header.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", header.getTimestamp());
i.putExtra("org.briarproject.CONTACT_ID", contactId.getInt());
i.putExtra("org.briarproject.CONTACT_NAME", contactName);
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.LOCAL_AUTHOR_ID", localAuthorId.getBytes());
i.putExtra("org.briarproject.AUTHOR_NAME", header.getAuthor().getName());
i.putExtra("org.briarproject.MESSAGE_ID", header.getId().getBytes());
i.putExtra("org.briarproject.CONTENT_TYPE", header.getContentType());
i.putExtra("org.briarproject.TIMESTAMP", header.getTimestamp());
startActivityForResult(i, position);
}
}

8
briar-android/src/net/sf/briar/android/contact/ConversationAdapter.java → briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.widget.LinearLayout.HORIZONTAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.util.ArrayList;
import net.sf.briar.R;
import net.sf.briar.api.db.MessageHeader;
import org.briarproject.R;
import org.briarproject.api.db.MessageHeader;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;

4
briar-android/src/net/sf/briar/android/contact/ConversationItem.java → briar-android/src/org/briarproject/android/contact/ConversationItem.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import net.sf.briar.api.db.MessageHeader;
import org.briarproject.api.db.MessageHeader;
// This class is not thread-safe
class ConversationItem {

2
briar-android/src/net/sf/briar/android/contact/ConversationItemComparator.java → briar-android/src/org/briarproject/android/contact/ConversationItemComparator.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import java.util.Comparator;

58
briar-android/src/net/sf/briar/android/contact/ReadPrivateMessageActivity.java → briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL;
@@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -17,17 +17,17 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.HorizontalSpace;
import org.briarproject.api.AuthorId;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchMessageException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -70,30 +70,30 @@ implements OnClickListener {
super.onCreate(state);
Intent i = getIntent();
contactName = i.getStringExtra("net.sf.briar.CONTACT_NAME");
contactName = i.getStringExtra("org.briarproject.CONTACT_NAME");
if(contactName == null) throw new IllegalStateException();
setTitle(contactName);
byte[] b = i.getByteArrayExtra("net.sf.briar.LOCAL_AUTHOR_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.LOCAL_AUTHOR_ID");
if(b == null) throw new IllegalStateException();
localAuthorId = new AuthorId(b);
String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
String authorName = i.getStringExtra("org.briarproject.AUTHOR_NAME");
if(authorName == null) throw new IllegalStateException();
b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
b = i.getByteArrayExtra("org.briarproject.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
String contentType = i.getStringExtra("net.sf.briar.CONTENT_TYPE");
String contentType = i.getStringExtra("org.briarproject.CONTENT_TYPE");
if(contentType == null) throw new IllegalStateException();
timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
timestamp = i.getLongExtra("org.briarproject.TIMESTAMP", -1);
if(timestamp == -1) throw new IllegalStateException();
if(state == null) {
read = false;
setReadInDatabase(true);
} else {
read = state.getBoolean("net.sf.briar.READ");
read = state.getBoolean("org.briarproject.READ");
}
LinearLayout layout = new LinearLayout(this);
@@ -253,7 +253,7 @@ implements OnClickListener {
@Override
public void onSaveInstanceState(Bundle state) {
super.onSaveInstanceState(state);
state.putBoolean("net.sf.briar.READ", read);
state.putBoolean("org.briarproject.READ", read);
}
public void onClick(View view) {
@@ -267,12 +267,12 @@ implements OnClickListener {
finish();
} else if(view == replyButton) {
Intent i = new Intent(this, WritePrivateMessageActivity.class);
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("net.sf.briar.LOCAL_AUTHOR_ID",
i.putExtra("org.briarproject.CONTACT_NAME", contactName);
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.LOCAL_AUTHOR_ID",
localAuthorId.getBytes());
i.putExtra("net.sf.briar.PARENT_ID", messageId.getBytes());
i.putExtra("net.sf.briar.TIMESTAMP", timestamp);
i.putExtra("org.briarproject.PARENT_ID", messageId.getBytes());
i.putExtra("org.briarproject.TIMESTAMP", timestamp);
startActivity(i);
setResult(RESULT_REPLY);
finish();

8
briar-android/src/net/sf/briar/android/contact/SelectContactsDialog.java → briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import net.sf.briar.R;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
import org.briarproject.R;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;

46
briar-android/src/net/sf/briar/android/contact/WritePrivateMessageActivity.java → briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.contact;
package org.briarproject.android.contact;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
@@ -8,7 +8,7 @@ import static android.widget.LinearLayout.VERTICAL;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -18,22 +18,22 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageId;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalSpace;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchContactException;
import org.briarproject.api.db.NoSuchSubscriptionException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -76,17 +76,17 @@ implements OnClickListener {
super.onCreate(state);
Intent i = getIntent();
contactName = i.getStringExtra("net.sf.briar.CONTACT_NAME");
contactName = i.getStringExtra("org.briarproject.CONTACT_NAME");
if(contactName == null) throw new IllegalStateException();
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
b = i.getByteArrayExtra("net.sf.briar.LOCAL_AUTHOR_ID");
b = i.getByteArrayExtra("org.briarproject.LOCAL_AUTHOR_ID");
if(b == null) throw new IllegalStateException();
localAuthorId = new AuthorId(b);
b = i.getByteArrayExtra("net.sf.briar.PARENT_ID");
b = i.getByteArrayExtra("org.briarproject.PARENT_ID");
if(b != null) parentId = new MessageId(b);
timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
timestamp = i.getLongExtra("org.briarproject.TIMESTAMP", -1);
LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_WRAP);

38
briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java → briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
@@ -6,8 +6,8 @@ import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import java.util.Collection;
import java.util.Collections;
@@ -16,17 +16,17 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.contact.SelectContactsDialog;
import net.sf.briar.android.invitation.AddContactActivity;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import org.briarproject.R;
import org.briarproject.android.contact.SelectContactsDialog;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -69,17 +69,17 @@ SelectContactsDialog.Listener {
super.onCreate(state);
Intent i = getIntent();
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
GroupId id = new GroupId(b);
String name = i.getStringExtra("net.sf.briar.GROUP_NAME");
String name = i.getStringExtra("org.briarproject.GROUP_NAME");
if(name == null) throw new IllegalStateException();
setTitle(name);
b = i.getByteArrayExtra("net.sf.briar.GROUP_SALT");
b = i.getByteArrayExtra("org.briarproject.GROUP_SALT");
if(b == null) throw new IllegalStateException();
group = new Group(id, name, b);
subscribed = i.getBooleanExtra("net.sf.briar.SUBSCRIBED", false);
boolean all = i.getBooleanExtra("net.sf.briar.VISIBLE_TO_ALL", false);
subscribed = i.getBooleanExtra("org.briarproject.SUBSCRIBED", false);
boolean all = i.getBooleanExtra("org.briarproject.VISIBLE_TO_ALL", false);
LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_MATCH);

28
briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java → briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
@@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import java.util.Collection;
import java.util.Collections;
@@ -20,17 +20,17 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.contact.SelectContactsDialog;
import net.sf.briar.android.invitation.AddContactActivity;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import org.briarproject.R;
import org.briarproject.android.contact.SelectContactsDialog;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;

64
briar-android/src/net/sf/briar/android/groups/GroupActivity.java → briar-android/src/org/briarproject/android/groups/GroupActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
@@ -6,10 +6,10 @@ import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_NEXT;
import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_PREV;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.groups.ReadGroupPostActivity.RESULT_NEXT;
import static org.briarproject.android.groups.ReadGroupPostActivity.RESULT_PREV;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.Collection;
import java.util.concurrent.Executor;
@@ -17,23 +17,23 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.AscendingHeaderComparator;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.Author;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import org.briarproject.R;
import org.briarproject.android.AscendingHeaderComparator;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.Author;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.db.NoSuchSubscriptionException;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -67,10 +67,10 @@ OnClickListener, OnItemClickListener {
super.onCreate(state);
Intent i = getIntent();
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
groupName = i.getStringExtra("net.sf.briar.GROUP_NAME");
groupName = i.getStringExtra("org.briarproject.GROUP_NAME");
if(groupName == null) throw new IllegalStateException();
setTitle(groupName);
@@ -210,7 +210,7 @@ OnClickListener, OnItemClickListener {
public void onClick(View view) {
Intent i = new Intent(this, WriteGroupPostActivity.class);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
startActivity(i);
}
@@ -222,16 +222,16 @@ OnClickListener, OnItemClickListener {
private void displayMessage(int position) {
MessageHeader item = adapter.getItem(position);
Intent i = new Intent(this, ReadGroupPostActivity.class);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("net.sf.briar.GROUP_NAME", groupName);
i.putExtra("net.sf.briar.MESSAGE_ID", item.getId().getBytes());
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.GROUP_NAME", groupName);
i.putExtra("org.briarproject.MESSAGE_ID", item.getId().getBytes());
Author author = item.getAuthor();
if(author != null) {
i.putExtra("net.sf.briar.AUTHOR_ID", author.getId().getBytes());
i.putExtra("net.sf.briar.AUTHOR_NAME", author.getName());
i.putExtra("org.briarproject.AUTHOR_ID", author.getId().getBytes());
i.putExtra("org.briarproject.AUTHOR_NAME", author.getName());
}
i.putExtra("net.sf.briar.CONTENT_TYPE", item.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", item.getTimestamp());
i.putExtra("org.briarproject.CONTENT_TYPE", item.getContentType());
i.putExtra("org.briarproject.TIMESTAMP", item.getTimestamp());
startActivityForResult(i, position);
}
}

10
briar-android/src/net/sf/briar/android/groups/GroupAdapter.java → briar-android/src/org/briarproject/android/groups/GroupAdapter.java
View File

@@ -1,14 +1,14 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.widget.LinearLayout.HORIZONTAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.util.ArrayList;
import net.sf.briar.R;
import net.sf.briar.api.Author;
import net.sf.briar.api.db.MessageHeader;
import org.briarproject.R;
import org.briarproject.api.Author;
import org.briarproject.api.db.MessageHeader;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;

4
briar-android/src/net/sf/briar/android/groups/GroupItem.java → briar-android/src/org/briarproject/android/groups/GroupItem.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import net.sf.briar.api.messaging.Group;
import org.briarproject.api.messaging.Group;
class GroupItem {

4
briar-android/src/net/sf/briar/android/groups/GroupItemComparator.java → briar-android/src/org/briarproject/android/groups/GroupItemComparator.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static net.sf.briar.android.groups.GroupItem.NEW;
import static org.briarproject.android.groups.GroupItem.NEW;
import java.util.Comparator;

54
briar-android/src/net/sf/briar/android/groups/GroupListActivity.java → briar-android/src/org/briarproject/android/groups/GroupListActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
@@ -8,10 +8,10 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.groups.GroupListItem.MANAGE;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.groups.GroupListItem.MANAGE;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import java.util.Collection;
import java.util.Comparator;
@@ -22,26 +22,26 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.GroupStatus;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.HorizontalSpace;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.db.NoSuchSubscriptionException;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.RemoteSubscriptionsUpdatedEvent;
import org.briarproject.api.event.SubscriptionAddedEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.GroupStatus;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -347,8 +347,8 @@ implements EventListener, OnClickListener, OnItemClickListener {
} else {
Intent i = new Intent(this, GroupActivity.class);
Group g = item.getGroup();
i.putExtra("net.sf.briar.GROUP_ID", g.getId().getBytes());
i.putExtra("net.sf.briar.GROUP_NAME", g.getName());
i.putExtra("org.briarproject.GROUP_ID", g.getId().getBytes());
i.putExtra("org.briarproject.GROUP_NAME", g.getName());
startActivity(i);
}
}

8
briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java → briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
View File

@@ -1,17 +1,17 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER;
import static android.widget.LinearLayout.HORIZONTAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.groups.GroupListItem.MANAGE;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.groups.GroupListItem.MANAGE;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;

8
briar-android/src/net/sf/briar/android/groups/GroupListItem.java → briar-android/src/org/briarproject/android/groups/GroupListItem.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import java.util.Collection;
import java.util.Collections;
import net.sf.briar.api.Author;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.messaging.Group;
import org.briarproject.api.Author;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.messaging.Group;
class GroupListItem {

40
briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java → briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.groups.ManageGroupsItem.NONE;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.groups.ManageGroupsItem.NONE;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import java.util.Collection;
import java.util.Comparator;
@@ -12,18 +12,18 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupStatus;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.RemoteSubscriptionsUpdatedEvent;
import org.briarproject.api.event.SubscriptionAddedEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupStatus;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
@@ -132,11 +132,11 @@ implements EventListener, OnItemClickListener {
GroupStatus s = item.getGroupStatus();
Group g = s.getGroup();
Intent i = new Intent(this, ConfigureGroupActivity.class);
i.putExtra("net.sf.briar.GROUP_ID", g.getId().getBytes());
i.putExtra("net.sf.briar.GROUP_NAME", g.getName());
i.putExtra("net.sf.briar.GROUP_SALT", g.getSalt());
i.putExtra("net.sf.briar.SUBSCRIBED", s.isSubscribed());
i.putExtra("net.sf.briar.VISIBLE_TO_ALL", s.isVisibleToAll());
i.putExtra("org.briarproject.GROUP_ID", g.getId().getBytes());
i.putExtra("org.briarproject.GROUP_NAME", g.getName());
i.putExtra("org.briarproject.GROUP_SALT", g.getSalt());
i.putExtra("org.briarproject.SUBSCRIBED", s.isSubscribed());
i.putExtra("org.briarproject.VISIBLE_TO_ALL", s.isVisibleToAll());
startActivity(i);
}

8
briar-android/src/net/sf/briar/android/groups/ManageGroupsAdapter.java → briar-android/src/org/briarproject/android/groups/ManageGroupsAdapter.java
View File

@@ -1,18 +1,18 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER;
import static android.view.View.INVISIBLE;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static net.sf.briar.android.groups.ManageGroupsItem.NONE;
import static org.briarproject.android.groups.ManageGroupsItem.NONE;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.sf.briar.R;
import net.sf.briar.api.messaging.GroupStatus;
import org.briarproject.R;
import org.briarproject.api.messaging.GroupStatus;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;

4
briar-android/src/net/sf/briar/android/groups/ManageGroupsItem.java → briar-android/src/org/briarproject/android/groups/ManageGroupsItem.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import net.sf.briar.api.messaging.GroupStatus;
import org.briarproject.api.messaging.GroupStatus;
class ManageGroupsItem {

4
briar-android/src/net/sf/briar/android/groups/NoContactsDialog.java → briar-android/src/org/briarproject/android/groups/NoContactsDialog.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import net.sf.briar.R;
import org.briarproject.R;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;

50
briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java → briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL;
@@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -17,16 +17,16 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.HorizontalSpace;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchMessageException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -67,26 +67,26 @@ implements OnClickListener {
super.onCreate(state);
Intent i = getIntent();
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
String groupName = i.getStringExtra("net.sf.briar.GROUP_NAME");
String groupName = i.getStringExtra("org.briarproject.GROUP_NAME");
if(groupName == null) throw new IllegalStateException();
setTitle(groupName);
b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
b = i.getByteArrayExtra("org.briarproject.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
String contentType = i.getStringExtra("net.sf.briar.CONTENT_TYPE");
String contentType = i.getStringExtra("org.briarproject.CONTENT_TYPE");
if(contentType == null) throw new IllegalStateException();
timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
timestamp = i.getLongExtra("org.briarproject.TIMESTAMP", -1);
if(timestamp == -1) throw new IllegalStateException();
String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
String authorName = i.getStringExtra("org.briarproject.AUTHOR_NAME");
if(state == null) {
read = false;
setReadInDatabase(true);
} else {
read = state.getBoolean("net.sf.briar.READ");
read = state.getBoolean("org.briarproject.READ");
}
LinearLayout layout = new LinearLayout(this);
@@ -251,7 +251,7 @@ implements OnClickListener {
@Override
public void onSaveInstanceState(Bundle state) {
super.onSaveInstanceState(state);
state.putBoolean("net.sf.briar.READ", read);
state.putBoolean("org.briarproject.READ", read);
}
public void onClick(View view) {
@@ -265,9 +265,9 @@ implements OnClickListener {
finish();
} else if(view == replyButton) {
Intent i = new Intent(this, WriteGroupPostActivity.class);
i.putExtra("net.sf.briar.GROUP_ID", groupId.getBytes());
i.putExtra("net.sf.briar.PARENT_ID", messageId.getBytes());
i.putExtra("net.sf.briar.TIMESTAMP", timestamp);
i.putExtra("org.briarproject.GROUP_ID", groupId.getBytes());
i.putExtra("org.briarproject.PARENT_ID", messageId.getBytes());
i.putExtra("org.briarproject.TIMESTAMP", timestamp);
startActivity(i);
setResult(RESULT_REPLY);
finish();

56
briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java → briar-android/src/org/briarproject/android/groups/WriteGroupPostActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.groups;
package org.briarproject.android.groups;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
@@ -8,7 +8,7 @@ import static android.widget.LinearLayout.VERTICAL;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -19,27 +19,27 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.identity.CreateIdentityActivity;
import net.sf.briar.android.identity.LocalAuthorItem;
import net.sf.briar.android.identity.LocalAuthorItemComparator;
import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.PrivateKey;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageId;
import org.briarproject.R;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorItemComparator;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.android.util.HorizontalSpace;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -87,16 +87,16 @@ implements OnItemSelectedListener, OnClickListener {
super.onCreate(state);
Intent i = getIntent();
byte[] b = i.getByteArrayExtra("net.sf.briar.GROUP_ID");
byte[] b = i.getByteArrayExtra("org.briarproject.GROUP_ID");
if(b == null) throw new IllegalStateException();
groupId = new GroupId(b);
b = i.getByteArrayExtra("net.sf.briar.PARENT_ID");
b = i.getByteArrayExtra("org.briarproject.PARENT_ID");
if(b != null) parentId = new MessageId(b);
timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
timestamp = i.getLongExtra("org.briarproject.TIMESTAMP", -1);
if(state != null) {
b = state.getByteArray("net.sf.briar.LOCAL_AUTHOR_ID");
b = state.getByteArray("org.briarproject.LOCAL_AUTHOR_ID");
if(b != null) localAuthorId = new AuthorId(b);
}
@@ -210,7 +210,7 @@ implements OnItemSelectedListener, OnClickListener {
super.onSaveInstanceState(state);
if(localAuthorId != null) {
byte[] b = localAuthorId.getBytes();
state.putByteArray("net.sf.briar.LOCAL_AUTHOR_ID", b);
state.putByteArray("org.briarproject.LOCAL_AUTHOR_ID", b);
}
}

26
briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java → briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.identity;
package org.briarproject.android.identity;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS;
@@ -10,24 +10,24 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyPair;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import org.briarproject.R;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.activity.RoboActivity;
import android.os.Bundle;
import android.view.KeyEvent;

4
briar-android/src/net/sf/briar/android/identity/LocalAuthorItem.java → briar-android/src/org/briarproject/android/identity/LocalAuthorItem.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.android.identity;
package org.briarproject.android.identity;
import net.sf.briar.api.LocalAuthor;
import org.briarproject.api.LocalAuthor;
public class LocalAuthorItem {

6
briar-android/src/net/sf/briar/android/identity/LocalAuthorItemComparator.java → briar-android/src/org/briarproject/android/identity/LocalAuthorItemComparator.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.android.identity;
package org.briarproject.android.identity;
import static net.sf.briar.android.identity.LocalAuthorItem.ANONYMOUS;
import static net.sf.briar.android.identity.LocalAuthorItem.NEW;
import static org.briarproject.android.identity.LocalAuthorItem.ANONYMOUS;
import static org.briarproject.android.identity.LocalAuthorItem.NEW;
import java.util.Comparator;

8
briar-android/src/net/sf/briar/android/identity/LocalAuthorSpinnerAdapter.java → briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java
View File

@@ -1,14 +1,14 @@
package net.sf.briar.android.identity;
package org.briarproject.android.identity;
import static net.sf.briar.android.identity.LocalAuthorItem.ANONYMOUS;
import static net.sf.briar.android.identity.LocalAuthorItem.NEW;
import static org.briarproject.android.identity.LocalAuthorItem.ANONYMOUS;
import static org.briarproject.android.identity.LocalAuthorItem.NEW;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.view.View;

58
briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java → briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
@@ -15,22 +15,22 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.R;
import net.sf.briar.android.identity.LocalAuthorItem;
import net.sf.briar.android.identity.LocalAuthorItemComparator;
import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.android.ReferenceManager;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.invitation.InvitationListener;
import net.sf.briar.api.invitation.InvitationState;
import net.sf.briar.api.invitation.InvitationTask;
import net.sf.briar.api.invitation.InvitationTaskFactory;
import net.sf.briar.api.lifecycle.LifecycleManager;
import org.briarproject.R;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorItemComparator;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.invitation.InvitationListener;
import org.briarproject.api.invitation.InvitationState;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.activity.RoboActivity;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
@@ -78,17 +78,17 @@ implements InvitationListener {
setView(new NetworkSetupView(this));
} else {
// Restore the activity's state
byte[] b = state.getByteArray("net.sf.briar.LOCAL_AUTHOR_ID");
byte[] b = state.getByteArray("org.briarproject.LOCAL_AUTHOR_ID");
if(b != null) localAuthorId = new AuthorId(b);
taskHandle = state.getLong("net.sf.briar.TASK_HANDLE", -1);
taskHandle = state.getLong("org.briarproject.TASK_HANDLE", -1);
task = referenceManager.getReference(taskHandle,
InvitationTask.class);
if(task == null) {
// No background task - we must be in an initial or final state
localInvitationCode = state.getInt("net.sf.briar.LOCAL_CODE");
remoteInvitationCode = state.getInt("net.sf.briar.REMOTE_CODE");
connectionFailed = state.getBoolean("net.sf.briar.FAILED");
contactName = state.getString("net.sf.briar.CONTACT_NAME");
localInvitationCode = state.getInt("org.briarproject.LOCAL_CODE");
remoteInvitationCode = state.getInt("org.briarproject.REMOTE_CODE");
connectionFailed = state.getBoolean("org.briarproject.FAILED");
contactName = state.getString("org.briarproject.CONTACT_NAME");
if(contactName != null) {
localCompared = remoteCompared = true;
localMatched = remoteMatched = true;
@@ -184,13 +184,13 @@ implements InvitationListener {
super.onSaveInstanceState(state);
if(localAuthorId != null) {
byte[] b = localAuthorId.getBytes();
state.putByteArray("net.sf.briar.LOCAL_AUTHOR_ID", b);
state.putByteArray("org.briarproject.LOCAL_AUTHOR_ID", b);
}
state.putInt("net.sf.briar.LOCAL_CODE", localInvitationCode);
state.putInt("net.sf.briar.REMOTE_CODE", remoteInvitationCode);
state.putBoolean("net.sf.briar.FAILED", connectionFailed);
state.putString("net.sf.briar.CONTACT_NAME", contactName);
if(task != null) state.putLong("net.sf.briar.TASK_HANDLE", taskHandle);
state.putInt("org.briarproject.LOCAL_CODE", localInvitationCode);
state.putInt("org.briarproject.REMOTE_CODE", remoteInvitationCode);
state.putBoolean("org.briarproject.FAILED", connectionFailed);
state.putString("org.briarproject.CONTACT_NAME", contactName);
if(task != null) state.putLong("org.briarproject.TASK_HANDLE", taskHandle);
}
@Override

4
briar-android/src/net/sf/briar/android/invitation/AddContactView.java → briar-android/src/org/briarproject/android/invitation/AddContactView.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import android.content.Context;
import android.widget.LinearLayout;

6
briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java → briar-android/src/org/briarproject/android/invitation/BluetoothStatusView.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
import static android.provider.Settings.ACTION_BLUETOOTH_SETTINGS;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import net.sf.briar.R;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import org.briarproject.R;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;

2
briar-android/src/net/sf/briar/android/invitation/CodeEntryListener.java → briar-android/src/org/briarproject/android/invitation/CodeEntryListener.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
interface CodeEntryListener {

6
briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java → briar-android/src/org/briarproject/android/invitation/CodeEntryView.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.content.Context.INPUT_METHOD_SERVICE;
import static android.text.InputType.TYPE_CLASS_NUMBER;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import net.sf.briar.R;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
import android.content.Context;
import android.view.KeyEvent;
import android.view.View;

6
briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java → briar-android/src/org/briarproject/android/invitation/CodesDoNotMatchView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import net.sf.briar.R;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
import android.content.Context;
import android.view.View;
import android.view.View.OnClickListener;

4
briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java → briar-android/src/org/briarproject/android/invitation/ConfirmationCodeView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.widget.ImageView;

4
briar-android/src/net/sf/briar/android/invitation/ConnectedView.java → briar-android/src/org/briarproject/android/invitation/ConnectedView.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;

6
briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java → briar-android/src/org/briarproject/android/invitation/ConnectionFailedView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import net.sf.briar.R;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
import android.content.Context;
import android.view.View;
import android.view.View.OnClickListener;

4
briar-android/src/net/sf/briar/android/invitation/ConnectionView.java → briar-android/src/org/briarproject/android/invitation/ConnectionView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.widget.LinearLayout;
import android.widget.ProgressBar;

4
briar-android/src/net/sf/briar/android/invitation/ContactDetailsView.java → briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;

4
briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java → briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.widget.TextView;

18
briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java → briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java
View File

@@ -1,14 +1,14 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.identity.LocalAuthorItem.NEW;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import net.sf.briar.R;
import net.sf.briar.android.identity.CreateIdentityActivity;
import net.sf.briar.android.identity.LocalAuthorItem;
import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
import net.sf.briar.api.AuthorId;
import static org.briarproject.android.identity.LocalAuthorItem.NEW;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.api.AuthorId;
import android.content.Context;
import android.content.Intent;
import android.view.View;

4
briar-android/src/net/sf/briar/android/invitation/WaitForContactView.java → briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;

6
briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java → briar-android/src/org/briarproject/android/invitation/WifiStatusView.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.android.invitation;
package org.briarproject.android.invitation;
import static android.content.Context.WIFI_SERVICE;
import static android.provider.Settings.ACTION_WIFI_SETTINGS;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
import net.sf.briar.R;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import org.briarproject.R;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiInfo;

2
briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java → briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.util;
package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

4
briar-android/src/net/sf/briar/android/util/HorizontalBorder.java → briar-android/src/org/briarproject/android/util/HorizontalBorder.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.android.util;
package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import net.sf.briar.R;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.view.View;

2
briar-android/src/net/sf/briar/android/util/HorizontalSpace.java → briar-android/src/org/briarproject/android/util/HorizontalSpace.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.android.util;
package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import android.content.Context;

6
briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java → briar-android/src/org/briarproject/android/util/ListLoadingProgressBar.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.android.util;
package org.briarproject.android.util;
import static android.view.Gravity.CENTER;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import android.content.Context;
import android.widget.LinearLayout;
import android.widget.ProgressBar;

24
briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java → briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.droidtooth;
package org.briarproject.plugins.droidtooth;
import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
@@ -24,17 +24,17 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.util.LatchedReference;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.Clock;
import org.briarproject.util.LatchedReference;
import org.briarproject.util.StringUtils;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothServerSocket;

16
briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java → briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPluginFactory.java
View File

@@ -1,15 +1,15 @@
package net.sf.briar.plugins.droidtooth;
package org.briarproject.plugins.droidtooth;
import java.security.SecureRandom;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import org.briarproject.api.TransportId;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SystemClock;
import android.content.Context;
public class DroidtoothPluginFactory implements DuplexPluginFactory {

6
briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothTransportConnection.java → briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.plugins.droidtooth;
package org.briarproject.plugins.droidtooth;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import android.bluetooth.BluetoothSocket;
class DroidtoothTransportConnection implements DuplexTransportConnection {

2
briar-android/src/net/sf/briar/plugins/droidtooth/InsecureBluetooth.java → briar-android/src/org/briarproject/plugins/droidtooth/InsecureBluetooth.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.droidtooth;
package org.briarproject.plugins.droidtooth;
import static java.util.logging.Level.INFO;

10
briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java → briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPlugin.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import static android.content.Context.WIFI_SERVICE;
import java.util.concurrent.Executor;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.Clock;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.MulticastLock;

14
briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java → briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPluginFactory.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import org.briarproject.api.TransportId;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SystemClock;
import android.content.Context;
public class DroidLanTcpPluginFactory implements DuplexPluginFactory {

22
briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java → briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tor;
package org.briarproject.plugins.tor;
import static android.content.Context.MODE_PRIVATE;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -28,16 +28,16 @@ import java.util.zip.ZipInputStream;
import net.freehaven.tor.control.EventHandler;
import net.freehaven.tor.control.TorControlConnection;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.util.StringUtils;
import socks.Socks5Proxy;
import socks.SocksSocket;
import android.content.Context;

12
briar-android/src/net/sf/briar/plugins/tor/TorPluginFactory.java → briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.plugins.tor;
package org.briarproject.plugins.tor;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.TransportId;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import android.content.Context;
import android.os.Build;

6
briar-android/src/net/sf/briar/plugins/tor/TorTransportConnection.java → briar-android/src/org/briarproject/plugins/tor/TorTransportConnection.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.plugins.tor;
package org.briarproject.plugins.tor;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
class TorTransportConnection implements DuplexTransportConnection {

15
briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java
View File

@@ -1,15 +0,0 @@
package net.sf.briar.api.messaging.duplex;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
public interface DuplexConnectionFactory {
void createIncomingConnection(ConnectionContext ctx,
DuplexTransportConnection d);
void createOutgoingConnection(ContactId c, TransportId t,
DuplexTransportConnection d);
}

16
briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java
View File

@@ -1,16 +0,0 @@
package net.sf.briar.api.messaging.simplex;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
public interface SimplexConnectionFactory {
void createIncomingConnection(ConnectionContext ctx,
SimplexTransportReader r);
void createOutgoingConnection(ContactId c, TransportId t,
SimplexTransportWriter w);
}

2
briar-api/src/net/sf/briar/api/Author.java → briar-api/src/org/briarproject/api/Author.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
/** A pseudonym for a user. */
public class Author {

2
briar-api/src/net/sf/briar/api/AuthorConstants.java → briar-api/src/org/briarproject/api/AuthorConstants.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
public interface AuthorConstants {

2
briar-api/src/net/sf/briar/api/AuthorFactory.java → briar-api/src/org/briarproject/api/AuthorFactory.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
public interface AuthorFactory {

2
briar-api/src/net/sf/briar/api/AuthorId.java → briar-api/src/org/briarproject/api/AuthorId.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Arrays;

2
briar-api/src/net/sf/briar/api/Bytes.java → briar-api/src/org/briarproject/api/Bytes.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Arrays;

2
briar-api/src/net/sf/briar/api/Contact.java → briar-api/src/org/briarproject/api/Contact.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
public class Contact {

2
briar-api/src/net/sf/briar/api/ContactId.java → briar-api/src/org/briarproject/api/ContactId.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
/**
* Type-safe wrapper for an integer that uniquely identifies a contact within

2
briar-api/src/net/sf/briar/api/FormatException.java → briar-api/src/org/briarproject/api/FormatException.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.io.IOException;

2
briar-api/src/net/sf/briar/api/LocalAuthor.java → briar-api/src/org/briarproject/api/LocalAuthor.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
/** A pseudonym for the local user. */
public class LocalAuthor extends Author {

2
briar-api/src/net/sf/briar/api/TransportConfig.java → briar-api/src/org/briarproject/api/TransportConfig.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Hashtable;
import java.util.Map;

2
briar-api/src/net/sf/briar/api/TransportId.java → briar-api/src/org/briarproject/api/TransportId.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Arrays;

2
briar-api/src/net/sf/briar/api/TransportProperties.java → briar-api/src/org/briarproject/api/TransportProperties.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Hashtable;
import java.util.Map;

2
briar-api/src/net/sf/briar/api/TransportPropertyConstants.java → briar-api/src/org/briarproject/api/TransportPropertyConstants.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
public interface TransportPropertyConstants {

2
briar-api/src/net/sf/briar/api/UniqueId.java → briar-api/src/org/briarproject/api/UniqueId.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api;
package org.briarproject.api;
import java.util.Arrays;

2
briar-api/src/net/sf/briar/api/android/AndroidExecutor.java → briar-api/src/org/briarproject/api/android/AndroidExecutor.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.android;
package org.briarproject.api.android;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;

2
briar-api/src/net/sf/briar/api/android/DatabaseUiExecutor.java → briar-api/src/org/briarproject/api/android/DatabaseUiExecutor.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.android;
package org.briarproject.api.android;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;

2
briar-api/src/net/sf/briar/api/android/ReferenceManager.java → briar-api/src/org/briarproject/api/android/ReferenceManager.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.android;
package org.briarproject.api.android;
/**
* Manages mappings between object references and serialisable handles. This

2
briar-api/src/net/sf/briar/api/crypto/AuthenticatedCipher.java → briar-api/src/org/briarproject/api/crypto/AuthenticatedCipher.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
import java.security.GeneralSecurityException;

2
briar-api/src/net/sf/briar/api/crypto/CryptoComponent.java → briar-api/src/org/briarproject/api/crypto/CryptoComponent.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;

2
briar-api/src/net/sf/briar/api/crypto/CryptoExecutor.java → briar-api/src/org/briarproject/api/crypto/CryptoExecutor.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;

12
briar-api/src/net/sf/briar/api/crypto/KeyManager.java → briar-api/src/org/briarproject/api/crypto/KeyManager.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.lifecycle.Service;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.Endpoint;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.Endpoint;
public interface KeyManager extends Service {

2
briar-api/src/net/sf/briar/api/crypto/KeyPair.java → briar-api/src/org/briarproject/api/crypto/KeyPair.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
/** A key pair consisting of a {@link PublicKey} and a {@link PrivateKey). */
public class KeyPair {

2
briar-api/src/net/sf/briar/api/crypto/KeyParser.java → briar-api/src/org/briarproject/api/crypto/KeyParser.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
import java.security.GeneralSecurityException;

2
briar-api/src/net/sf/briar/api/crypto/MessageDigest.java → briar-api/src/org/briarproject/api/crypto/MessageDigest.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
public interface MessageDigest {

2
briar-api/src/net/sf/briar/api/crypto/PrivateKey.java → briar-api/src/org/briarproject/api/crypto/PrivateKey.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
/** The private half of a public/private {@link KeyPair}. */
public interface PrivateKey {

2
briar-api/src/net/sf/briar/api/crypto/PseudoRandom.java → briar-api/src/org/briarproject/api/crypto/PseudoRandom.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
/** A deterministic PRNG. */
public interface PseudoRandom {

2
briar-api/src/net/sf/briar/api/crypto/PublicKey.java → briar-api/src/org/briarproject/api/crypto/PublicKey.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
/** The public half of a public/private {@link KeyPair}. */
public interface PublicKey {

2
briar-api/src/net/sf/briar/api/crypto/SecretKey.java → briar-api/src/org/briarproject/api/crypto/SecretKey.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.crypto;
package org.briarproject.api.crypto;
/** A secret key used for encryption and/or authentication. */
public interface SecretKey {

Some files were not shown because too many files have changed in this diff Show More