Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Move to new removabledrive package

Browse Source
This commit is contained in:
Daniel Lublin
2021-06-08 12:24:45 +02:00
committed by Torsten Grote
parent cffbfdf6f2
commit fa49da68a4
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.api.reporting.DevConfig;
import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory; import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
import org.briarproject.bramble.plugin.file.AndroidRemovableDrivePluginFactory; import org.briarproject.bramble.plugin.file.AndroidRemovableDrivePluginFactory;
import org.briarproject.bramble.plugin.file.RemovableDriveModule;
import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory; import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory; import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory;
import org.briarproject.bramble.util.AndroidUtils; import org.briarproject.bramble.util.AndroidUtils;
@@ -92,6 +93,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
GroupListModule.class, GroupListModule.class,
GroupConversationModule.class, GroupConversationModule.class,
SharingModule.class, SharingModule.class,
RemovableDriveModule.class
}) })
public class AppModule { public class AppModule {

18
briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveModule.java Normal file
View File

@@ -0,0 +1,18 @@
package org.briarproject.briar.android.removabledrive;
import org.briarproject.briar.android.viewmodel.ViewModelKey;
import androidx.lifecycle.ViewModel;
import dagger.Binds;
import dagger.Module;
import dagger.multibindings.IntoMap;
@Module
public interface RemovableDriveModule {
@Binds
@IntoMap
@ViewModelKey(RemovableDriveViewModel.class)
ViewModel bindRemovableDriveViewModel(RemovableDriveViewModel removableDriveViewModel);
}

2
briar-android/src/main/java/org/briarproject/briar/android/conversation/RemovableDriveViewModel.java → briar-android/src/main/java/org/briarproject/briar/android/removabledrive/RemovableDriveViewModel.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.conversation; package org.briarproject.briar.android.removabledrive;
import android.app.Application; import android.app.Application;
import android.net.Uri; import android.net.Uri;

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

@@ -4,7 +4,7 @@ import org.briarproject.briar.android.contact.add.remote.AddContactViewModel;
import org.briarproject.briar.android.contact.add.remote.PendingContactListViewModel; import org.briarproject.briar.android.contact.add.remote.PendingContactListViewModel;
import org.briarproject.briar.android.conversation.ConversationViewModel; import org.briarproject.briar.android.conversation.ConversationViewModel;
import org.briarproject.briar.android.conversation.ImageViewModel; import org.briarproject.briar.android.conversation.ImageViewModel;
import org.briarproject.briar.android.conversation.RemovableDriveViewModel; import org.briarproject.briar.android.removabledrive.RemovableDriveViewModel;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -41,12 +41,6 @@ public abstract class ViewModelModule {
abstract ViewModel bindPendingRequestsViewModel( abstract ViewModel bindPendingRequestsViewModel(
PendingContactListViewModel pendingContactListViewModel); PendingContactListViewModel pendingContactListViewModel);
@Binds
@IntoMap
@ViewModelKey(RemovableDriveViewModel.class)
abstract ViewModel bindRemovableDriveViewModel(
RemovableDriveViewModel removableDriveViewModel);
@Binds @Binds
@Singleton @Singleton
abstract ViewModelProvider.Factory bindViewModelFactory( abstract ViewModelProvider.Factory bindViewModelFactory(