gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix to add account (temp solution until conductor is removed)

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-04-06 19:13:03 +02:00 committed by Andy Scherzinger
parent aa1e93db05
commit 1246223859
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -52,6 +52,7 @@ import com.nextcloud.talk.users.UserManager
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.SecurityUtils import com.nextcloud.talk.utils.SecurityUtils
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.bundle.BundleKeys.ADD_ACCOUNT
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACTIVE_CONVERSATION import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACTIVE_CONVERSATION
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
@ -92,7 +93,9 @@ class MainActivity : BaseActivity(), ActionBarProvider {
router = Conductor.attachRouter(this, binding.controllerContainer, savedInstanceState) router = Conductor.attachRouter(this, binding.controllerContainer, savedInstanceState)
if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { if (intent.hasExtra(ADD_ACCOUNT) && intent.getBooleanExtra(ADD_ACCOUNT, false)) {
addAccount()
} else if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
onNewIntent(intent) onNewIntent(intent)
} else if (!router!!.hasRootController()) { } else if (!router!!.hasRootController()) {
if (!appPreferences.isDbRoomMigrated) { if (!appPreferences.isDbRoomMigrated) {

3
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt
View File

@ -466,7 +466,8 @@ class AccountVerificationController(args: Bundle? = null) :
ApplicationWideMessageHolder.getInstance().messageType = ApplicationWideMessageHolder.getInstance().messageType =
ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED
} }
router.popToRoot() val intent = Intent(context, ConversationsListActivity::class.java)
startActivity(intent)
} }
} }
} }

9
app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
View File

@ -35,6 +35,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.nextcloud.talk.activities.MainActivity;
import com.nextcloud.talk.adapters.items.AdvancedUserItem; import com.nextcloud.talk.adapters.items.AdvancedUserItem;
import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.NcApi;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
@ -70,6 +71,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import static com.nextcloud.talk.utils.bundle.BundleKeys.ADD_ACCOUNT;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class ChooseAccountDialogFragment extends DialogFragment { public class ChooseAccountDialogFragment extends DialogFragment {
public static final String TAG = ChooseAccountDialogFragment.class.getSimpleName(); public static final String TAG = ChooseAccountDialogFragment.class.getSimpleName();
@ -182,9 +185,11 @@ public class ChooseAccountDialogFragment extends DialogFragment {
binding.addAccount.setOnClickListener(v -> { binding.addAccount.setOnClickListener(v -> {
// TODO: change this when conductor is removed
Intent intent = new Intent(getContext(), MainActivity.class);
intent.putExtra(ADD_ACCOUNT, true);
startActivity(intent);
dismiss(); dismiss();
// TODO
// ((MainActivity) getActivity()).addAccount();
}); });
binding.manageSettings.setOnClickListener(v -> { binding.manageSettings.setOnClickListener(v -> {
Intent intent = new Intent(getContext(), SettingsActivity.class); Intent intent = new Intent(getContext(), SettingsActivity.class);

1
app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt
View File

@ -87,4 +87,5 @@ object BundleKeys {
const val KEY_DISMISS_RECORDING_URL = "KEY_DISMISS_RECORDING_URL" const val KEY_DISMISS_RECORDING_URL = "KEY_DISMISS_RECORDING_URL"
const val KEY_SHARE_RECORDING_TO_CHAT_URL = "KEY_SHARE_RECORDING_TO_CHAT_URL" const val KEY_SHARE_RECORDING_TO_CHAT_URL = "KEY_SHARE_RECORDING_TO_CHAT_URL"
const val KEY_GEOCODING_RESULT = "KEY_GEOCODING_RESULT" const val KEY_GEOCODING_RESULT = "KEY_GEOCODING_RESULT"
const val ADD_ACCOUNT = "ADD_ACCOUNT" // temp workaround until conductor is removed
} }