Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

[android] move conversation classes into their own package

Browse Source
This commit is contained in:
Torsten Grote
2018-11-05 11:42:11 -03:00
parent f964d1ef07
commit c3cb966009
26 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/main/AndroidManifest.xml
View File

@@ -102,7 +102,7 @@
</activity> </activity>
<activity <activity
android:name="org.briarproject.briar.android.contact.ConversationActivity" android:name="org.briarproject.briar.android.conversation.ConversationActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/BriarTheme.NoActionBar" android:theme="@style/BriarTheme.NoActionBar"
android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity" android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
@@ -190,10 +190,10 @@
<activity <activity
android:name="org.briarproject.briar.android.sharing.BlogInvitationActivity" android:name="org.briarproject.briar.android.sharing.BlogInvitationActivity"
android:label="@string/blogs_sharing_invitations_title" android:label="@string/blogs_sharing_invitations_title"
android:parentActivityName="org.briarproject.briar.android.contact.ConversationActivity"> android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.contact.ConversationActivity" android:value="org.briarproject.briar.android.conversation.ConversationActivity"
/> />
</activity> </activity>
@@ -327,11 +327,11 @@
<activity <activity
android:name="org.briarproject.briar.android.introduction.IntroductionActivity" android:name="org.briarproject.briar.android.introduction.IntroductionActivity"
android:label="@string/introduction_activity_title" android:label="@string/introduction_activity_title"
android:parentActivityName="org.briarproject.briar.android.contact.ConversationActivity" android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
android:windowSoftInputMode="stateHidden|adjustResize"> android:windowSoftInputMode="stateHidden|adjustResize">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.contact.ConversationActivity" android:value="org.briarproject.briar.android.conversation.ConversationActivity"
/> />
</activity> </activity>

4
briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
View File

@@ -31,7 +31,7 @@ import org.briarproject.bramble.api.system.AndroidExecutor;
import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.Clock;
import org.briarproject.bramble.util.StringUtils; import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.contact.ConversationActivity; import org.briarproject.briar.android.conversation.ConversationActivity;
import org.briarproject.briar.android.forum.ForumActivity; import org.briarproject.briar.android.forum.ForumActivity;
import org.briarproject.briar.android.login.SignInReminderReceiver; import org.briarproject.briar.android.login.SignInReminderReceiver;
import org.briarproject.briar.android.navdrawer.NavDrawerActivity; import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
@@ -72,7 +72,7 @@ import static android.support.v4.app.NotificationCompat.PRIORITY_MIN;
import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET; import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET;
import static android.support.v4.content.ContextCompat.getColor; import static android.support.v4.content.ContextCompat.getColor;
import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_BLOGS; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_BLOGS;
import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_CONTACTS; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_CONTACTS;
import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_FORUMS; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_FORUMS;

4
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
View File

@@ -15,10 +15,10 @@ import org.briarproject.briar.android.blog.ReblogFragment;
import org.briarproject.briar.android.blog.RssFeedImportActivity; import org.briarproject.briar.android.blog.RssFeedImportActivity;
import org.briarproject.briar.android.blog.RssFeedManageActivity; import org.briarproject.briar.android.blog.RssFeedManageActivity;
import org.briarproject.briar.android.blog.WriteBlogPostActivity; import org.briarproject.briar.android.blog.WriteBlogPostActivity;
import org.briarproject.briar.android.contact.AliasDialogFragment; import org.briarproject.briar.android.conversation.AliasDialogFragment;
import org.briarproject.briar.android.contact.ContactListFragment; import org.briarproject.briar.android.contact.ContactListFragment;
import org.briarproject.briar.android.contact.ContactModule; import org.briarproject.briar.android.contact.ContactModule;
import org.briarproject.briar.android.contact.ConversationActivity; import org.briarproject.briar.android.conversation.ConversationActivity;
import org.briarproject.briar.android.forum.CreateForumActivity; import org.briarproject.briar.android.forum.CreateForumActivity;
import org.briarproject.briar.android.forum.ForumActivity; import org.briarproject.briar.android.forum.ForumActivity;
import org.briarproject.briar.android.forum.ForumListFragment; import org.briarproject.briar.android.forum.ForumListFragment;

3
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View File

@@ -31,6 +31,7 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener; import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
import org.briarproject.briar.android.conversation.ConversationActivity;
import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.android.keyagreement.ContactExchangeActivity; import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.view.BriarRecyclerView;
@@ -54,7 +55,7 @@ import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logDuration;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.bramble.util.LogUtils.now;
import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault

2
briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProvider;
import android.arch.lifecycle.ViewModelProviders; import android.arch.lifecycle.ViewModelProviders;

6
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.arch.lifecycle.Observer; import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProvider;
@@ -51,8 +51,8 @@ import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.blog.BlogActivity; import org.briarproject.briar.android.blog.BlogActivity;
import org.briarproject.briar.android.contact.ConversationAdapter.ConversationListener; import org.briarproject.briar.android.conversation.ConversationAdapter.ConversationListener;
import org.briarproject.briar.android.contact.ConversationVisitor.TextCache; import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache;
import org.briarproject.briar.android.forum.ForumActivity; import org.briarproject.briar.android.forum.ForumActivity;
import org.briarproject.briar.android.introduction.IntroductionActivity; import org.briarproject.briar.android.introduction.IntroductionActivity;
import org.briarproject.briar.android.privategroup.conversation.GroupActivity; import org.briarproject.briar.android.privategroup.conversation.GroupActivity;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationAdapter.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.content.Context; import android.content.Context;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItemViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.CallSuper; import android.support.annotation.CallSuper;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageInItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageInItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.view.View; import android.view.View;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.view.View; import android.view.View;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.view.View; import android.view.View;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItemViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItemViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.view.View; import android.view.View;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;

4
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.view.View; import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.Button;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.contact.ConversationAdapter.ConversationListener; import org.briarproject.briar.android.conversation.ConversationAdapter.ConversationListener;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import android.arch.lifecycle.AndroidViewModel;

10
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationVisitor.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.contact; package org.briarproject.briar.android.conversation;
import android.arch.lifecycle.LiveData; import android.arch.lifecycle.LiveData;
import android.content.Context; import android.content.Context;
@@ -20,10 +20,10 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRespons
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.BLOG; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.BLOG;
import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.FORUM; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.FORUM;
import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.GROUP; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.GROUP;
import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.INTRODUCTION; import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.INTRODUCTION;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
@UiThread @UiThread

2
briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
View File

@@ -30,7 +30,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
public class ContactChooserFragment extends BaseFragment { public class ContactChooserFragment extends BaseFragment {

2
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionActivity.java
View File

@@ -9,7 +9,7 @@ import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
public class IntroductionActivity extends BriarActivity public class IntroductionActivity extends BriarActivity
implements BaseFragmentListener { implements BaseFragmentListener {

2
briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.briar.android.viewmodel;
import android.arch.lifecycle.ViewModel; import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProvider;
import org.briarproject.briar.android.contact.ConversationViewModel; import org.briarproject.briar.android.conversation.ConversationViewModel;
import javax.inject.Singleton; import javax.inject.Singleton;

2
briar-android/src/main/res/layout/activity_conversation.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".android.contact.ConversationActivity"> tools:context=".android.conversation.ConversationActivity">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"