diff --git a/art/render.rb b/art/render.rb
index beff11d28..326311895 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -13,6 +13,7 @@ resolutions = {
images = {
'ic_launcher.svg' => ['ic_launcher', 48],
'main_logo.svg' => ['main_logo', 200],
+ 'main_logo.svg' => ['splash_logo', 144],
'play_video.svg' => ['play_video', 128],
'play_gif.svg' => ['play_gif', 128],
'conversations_mono.svg' => ['ic_notification', 24],
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 28072d444..adbc294ff 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -47,17 +47,20 @@
+ android:theme="@style/SplashTheme">
+
pendingViewIntent = new PendingItem<>();
- private final PendingItem postponedActivityResult = new PendingItem<>();
- private ActivityConversationsBinding binding;
- private boolean mActivityPaused = true;
- private AtomicBoolean mRedirectInProcess = new AtomicBoolean(false);
-
- private static boolean isViewIntent(Intent i) {
- return i != null && ACTION_VIEW_CONVERSATION.equals(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
- }
-
- private static Intent createLauncherIntent(Context context) {
- final Intent intent = new Intent(context, ConversationActivity.class);
- intent.setAction(Intent.ACTION_MAIN);
- intent.addCategory(Intent.CATEGORY_LAUNCHER);
- return intent;
- }
+public class ConversationActivity extends AppCompatActivity {
@Override
- protected void refreshUiReal() {
- for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
- refreshFragment(id);
- }
- }
-
- @Override
- void onBackendConnected() {
- if (performRedirectIfNecessary(true)) {
- return;
- }
- xmppConnectionService.getNotificationService().setIsInForeground(true);
- Intent intent = pendingViewIntent.pop();
- if (intent != null) {
- if (processViewIntent(intent)) {
- if (binding.secondaryFragment != null) {
- notifyFragmentOfBackendConnected(R.id.main_fragment);
- }
- invalidateActionBarTitle();
- return;
- }
- }
- for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
- notifyFragmentOfBackendConnected(id);
- }
-
- ActivityResult activityResult = postponedActivityResult.pop();
- if (activityResult != null) {
- handleActivityResult(activityResult);
- }
-
- invalidateActionBarTitle();
- if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
- Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
- if (conversation != null) {
- openConversation(conversation, null);
- }
- }
- showDialogsIfMainIsOverview();
- }
-
- private boolean performRedirectIfNecessary(boolean noAnimation) {
- return performRedirectIfNecessary(null, noAnimation);
- }
-
- private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
- if (xmppConnectionService == null) {
- return false;
- }
- boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
- if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
- final Intent intent = getRedirectionIntent(noAnimation);
- runOnUiThread(() -> {
- startActivity(intent);
- if (noAnimation) {
- overridePendingTransition(0, 0);
- }
- });
- }
- return mRedirectInProcess.get();
- }
-
- private Intent getRedirectionIntent(boolean noAnimation) {
- Account pendingAccount = xmppConnectionService.getPendingAccount();
- Intent intent;
- if (pendingAccount != null) {
- intent = new Intent(this, EditAccountActivity.class);
- intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
- } else {
- if (xmppConnectionService.getAccounts().size() == 0) {
- if (Config.X509_VERIFICATION) {
- intent = new Intent(this, ManageAccountActivity.class);
- } else if (Config.MAGIC_CREATE_DOMAIN != null) {
- intent = new Intent(this, WelcomeActivity.class);
- WelcomeActivity.addInviteUri(intent, getIntent());
- } else {
- intent = new Intent(this, EditAccountActivity.class);
- }
- } else {
- intent = new Intent(this, StartConversationActivity.class);
- }
- }
- intent.putExtra("init", true);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
- if (noAnimation) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
- }
- return intent;
- }
-
- private void showDialogsIfMainIsOverview() {
- if (xmppConnectionService == null) {
- return;
- }
- final Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
- if (ExceptionHelper.checkForCrash(this)) {
- return;
- }
- openBatteryOptimizationDialogIfNeeded();
- }
- }
-
- private String getBatteryOptimizationPreferenceKey() {
- @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
- return "show_battery_optimization" + (device == null ? "" : device);
- }
-
- private void setNeverAskForBatteryOptimizationsAgain() {
- getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
- }
-
- private void openBatteryOptimizationDialogIfNeeded() {
- if (hasAccountWithoutPush()
- && isOptimizingBattery()
- && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.battery_optimizations_enabled);
- builder.setMessage(R.string.battery_optimizations_enabled_dialog);
- builder.setPositiveButton(R.string.next, (dialog, which) -> {
- Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
- Uri uri = Uri.parse("package:" + getPackageName());
- intent.setData(uri);
- try {
- startActivityForResult(intent, REQUEST_BATTERY_OP);
- } catch (ActivityNotFoundException e) {
- Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
- }
- });
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
- builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
- }
- AlertDialog dialog = builder.create();
- dialog.setCanceledOnTouchOutside(false);
- dialog.show();
- }
- }
-
- private boolean hasAccountWithoutPush() {
- for (Account account : xmppConnectionService.getAccounts()) {
- if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
- return true;
- }
- }
- return false;
- }
-
- private void notifyFragmentOfBackendConnected(@IdRes int id) {
- final Fragment fragment = getFragmentManager().findFragmentById(id);
- if (fragment != null && fragment instanceof XmppFragment) {
- ((XmppFragment) fragment).onBackendConnected();
- }
- }
-
- private void refreshFragment(@IdRes int id) {
- final Fragment fragment = getFragmentManager().findFragmentById(id);
- if (fragment != null && fragment instanceof XmppFragment) {
- ((XmppFragment) fragment).refresh();
- }
- }
-
- private boolean processViewIntent(Intent intent) {
- Log.d(Config.LOGTAG,"process view intent");
- String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
- Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
- if (conversation == null) {
- Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
- return false;
- }
- openConversation(conversation, intent.getExtras());
- return true;
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode,@NonNull String permissions[], @NonNull int[] grantResults) {
- UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
- if (grantResults.length > 0) {
- if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- switch(requestCode) {
- case REQUEST_OPEN_MESSAGE:
- refreshUiReal();
- ConversationFragment.openPendingMessage(this);
- break;
- case REQUEST_PLAY_PAUSE:
- ConversationFragment.startStopPending(this);
- break;
- }
- }
- }
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, final Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- ActivityResult activityResult = ActivityResult.of(requestCode, resultCode, data);
- if (xmppConnectionService != null) {
- handleActivityResult(activityResult);
- } else {
- this.postponedActivityResult.push(activityResult);
- }
- }
-
- private void handleActivityResult(ActivityResult activityResult) {
- if (activityResult.resultCode == Activity.RESULT_OK) {
- handlePositiveActivityResult(activityResult.requestCode, activityResult.data);
- } else {
- handleNegativeActivityResult(activityResult.requestCode);
- }
- }
-
- private void handleNegativeActivityResult(int requestCode) {
- Conversation conversation = ConversationFragment.getConversationReliable(this);
- switch (requestCode) {
- case REQUEST_DECRYPT_PGP:
- if (conversation == null) {
- break;
- }
- conversation.getAccount().getPgpDecryptionService().giveUpCurrentDecryption();
- break;
- case REQUEST_BATTERY_OP:
- setNeverAskForBatteryOptimizationsAgain();
- break;
- }
- }
-
- private void handlePositiveActivityResult(int requestCode, final Intent data) {
- Log.d(Config.LOGTAG,"positive activity result");
- Conversation conversation = ConversationFragment.getConversationReliable(this);
- if (conversation == null) {
- Log.d(Config.LOGTAG,"conversation not found");
- return;
- }
- switch (requestCode) {
- case REQUEST_DECRYPT_PGP:
- conversation.getAccount().getPgpDecryptionService().continueDecryption(data);
- break;
- case REQUEST_CHOOSE_PGP_ID:
- long id = data.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0);
- if (id != 0) {
- conversation.getAccount().setPgpSignId(id);
- announcePgp(conversation.getAccount(), null, null, onOpenPGPKeyPublished);
- } else {
- choosePgpSignId(conversation.getAccount());
- }
- break;
- case REQUEST_ANNOUNCE_PGP:
- announcePgp(conversation.getAccount(), conversation, data, onOpenPGPKeyPublished);
- break;
- }
- }
-
- @Override
- protected void onCreate(final Bundle savedInstanceState) {
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- new EmojiService(this).init();
- this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
- this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
- this.getFragmentManager().addOnBackStackChangedListener(this::showDialogsIfMainIsOverview);
- this.initializeFragments();
- this.invalidateActionBarTitle();
- final Intent intent;
- if (savedInstanceState == null) {
- intent = getIntent();
- } else {
- intent = savedInstanceState.getParcelable("intent");
- }
- if (isViewIntent(intent)) {
- pendingViewIntent.push(intent);
- setIntent(createLauncherIntent(this));
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.activity_conversations, menu);
- MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
- if (qrCodeScanMenuItem != null) {
- Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
- && fragment != null
- && fragment instanceof ConversationsOverviewFragment;
- qrCodeScanMenuItem.setVisible(visible);
- }
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public void onConversationSelected(Conversation conversation) {
- if (ConversationFragment.getConversation(this) == conversation) {
- Log.d(Config.LOGTAG,"ignore onConversationSelected() because conversation is already open");
- return;
- }
- openConversation(conversation, null);
- }
-
- private void openConversation(Conversation conversation, Bundle extras) {
- ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
- final boolean mainNeedsRefresh;
- if (conversationFragment == null) {
- mainNeedsRefresh = false;
- Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- if (mainFragment != null && mainFragment instanceof ConversationFragment) {
- conversationFragment = (ConversationFragment) mainFragment;
- } else {
- conversationFragment = new ConversationFragment();
- FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
- fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
- fragmentTransaction.addToBackStack(null);
- fragmentTransaction.commit();
- }
- } else {
- mainNeedsRefresh = true;
- }
- conversationFragment.reInit(conversation, extras == null ? new Bundle() : extras);
- if (mainNeedsRefresh) {
- refreshFragment(R.id.main_fragment);
- } else {
- invalidateActionBarTitle();
- }
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- FragmentManager fm = getFragmentManager();
- if (fm.getBackStackEntryCount() > 0) {
- fm.popBackStack();
- return true;
- }
- break;
- case R.id.action_scan_qr_code:
- UriHandlerActivity.scan(this);
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- public void onSaveInstanceState(Bundle savedInstanceState) {
- Intent pendingIntent = pendingViewIntent.peek();
- savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
- super.onSaveInstanceState(savedInstanceState);
- }
-
- @Override
- protected void onStart() {
- final int theme = findTheme();
- if (this.mTheme != theme) {
- this.mSkipBackgroundBinding = true;
- recreate();
- } else {
- this.mSkipBackgroundBinding = false;
- }
- mRedirectInProcess.set(false);
- super.onStart();
- }
-
- @Override
- protected void onNewIntent(final Intent intent) {
- if (isViewIntent(intent)) {
- if (xmppConnectionService != null) {
- processViewIntent(intent);
- } else {
- pendingViewIntent.push(intent);
- }
- }
- setIntent(createLauncherIntent(this));
- }
-
- @Override
- public void onPause() {
- this.mActivityPaused = true;
- super.onPause();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- this.mActivityPaused = false;
- }
-
- private void initializeFragments() {
- FragmentTransaction transaction = getFragmentManager().beginTransaction();
- Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
- if (mainFragment != null) {
- Log.d(Config.LOGTAG, "initializeFragment(). main fragment exists");
- if (binding.secondaryFragment != null) {
- if (mainFragment instanceof ConversationFragment) {
- Log.d(Config.LOGTAG, "gained secondary fragment. moving...");
- getFragmentManager().popBackStack();
- transaction.remove(mainFragment);
- transaction.commit();
- getFragmentManager().executePendingTransactions();
- transaction = getFragmentManager().beginTransaction();
- transaction.replace(R.id.secondary_fragment, mainFragment);
- transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
- transaction.commit();
- return;
- }
- } else {
- if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
- Log.d(Config.LOGTAG, "lost secondary fragment. moving...");
- transaction.remove(secondaryFragment);
- transaction.commit();
- getFragmentManager().executePendingTransactions();
- transaction = getFragmentManager().beginTransaction();
- transaction.replace(R.id.main_fragment, secondaryFragment);
- transaction.addToBackStack(null);
- transaction.commit();
- return;
- }
- }
- } else {
- transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
- }
- if (binding.secondaryFragment != null && secondaryFragment == null) {
- transaction.replace(R.id.secondary_fragment, new ConversationFragment());
- }
- transaction.commit();
- }
-
- private void invalidateActionBarTitle() {
- final ActionBar actionBar = getSupportActionBar();
- if (actionBar != null) {
- Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- if (mainFragment != null && mainFragment instanceof ConversationFragment) {
- final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
- if (conversation != null) {
- actionBar.setTitle(conversation.getName());
- actionBar.setDisplayHomeAsUpEnabled(true);
- return;
- }
- }
- actionBar.setTitle(R.string.app_name);
- actionBar.setDisplayHomeAsUpEnabled(false);
- }
- }
-
- @Override
- public void onConversationArchived(Conversation conversation) {
- if (performRedirectIfNecessary(conversation, false)) {
- return;
- }
- Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- if (mainFragment != null && mainFragment instanceof ConversationFragment) {
- getFragmentManager().popBackStack();
- return;
- }
- Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
- if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
- if (((ConversationFragment) secondaryFragment).getConversation() == conversation) {
- Conversation suggestion = ConversationsOverviewFragment.getSuggestion(this, conversation);
- if (suggestion != null) {
- openConversation(suggestion, null);
- }
- }
- }
- }
-
- @Override
- public void onConversationsListItemUpdated() {
- Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
- if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
- ((ConversationsOverviewFragment) fragment).refresh();
- }
- }
-
- @Override
- public void switchToConversation(Conversation conversation) {
- Log.d(Config.LOGTAG,"override");
- openConversation(conversation,null);
- }
-
- @Override
- public void onConversationRead(Conversation conversation) {
- if (!mActivityPaused && pendingViewIntent.peek() == null) {
- xmppConnectionService.sendReadMarker(conversation);
- } else {
- Log.d(Config.LOGTAG,"ignoring read callback. mActivityPaused="+Boolean.toString(mActivityPaused));
- }
- }
-
- @Override
- public void onAccountUpdate() {
- this.refreshUi();
- }
-
- @Override
- public void onConversationUpdate() {
- if (performRedirectIfNecessary(false)) {
- return;
- }
- this.refreshUi();
- }
-
- @Override
- public void onRosterUpdate() {
- this.refreshUi();
- }
-
- @Override
- public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
- this.refreshUi();
- }
-
- @Override
- public void onShowErrorToast(int resId) {
- runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
+ startActivity(new Intent(this, ConversationsActivity.class));
+ finish();
}
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 650fa0e25..c527eba8d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -28,7 +28,6 @@ import android.support.v13.view.inputmethod.InputConnectionCompat;
import android.support.v13.view.inputmethod.InputContentInfoCompat;
import android.text.Editable;
import android.util.Log;
-import android.util.Pair;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Gravity;
@@ -140,7 +139,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
private Conversation conversation;
private FragmentConversationBinding binding;
private Toast messageLoaderToast;
- private ConversationActivity activity;
+ private ConversationsActivity activity;
private boolean reInitRequiredOnStart = true;
@@ -794,10 +793,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
public void onAttach(Activity activity) {
super.onAttach(activity);
Log.d(Config.LOGTAG, "ConversationFragment.onAttach()");
- if (activity instanceof ConversationActivity) {
- this.activity = (ConversationActivity) activity;
+ if (activity instanceof ConversationsActivity) {
+ this.activity = (ConversationsActivity) activity;
} else {
- throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationActivity");
+ throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationsActivity");
}
}
@@ -1844,10 +1843,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
}
private void processExtras(Bundle extras) {
- final String downloadUuid = extras.getString(ConversationActivity.EXTRA_DOWNLOAD_UUID);
- final String text = extras.getString(ConversationActivity.EXTRA_TEXT);
- final String nick = extras.getString(ConversationActivity.EXTRA_NICK);
- final boolean pm = extras.getBoolean(ConversationActivity.EXTRA_IS_PRIVATE_MESSAGE, false);
+ final String downloadUuid = extras.getString(ConversationsActivity.EXTRA_DOWNLOAD_UUID);
+ final String text = extras.getString(ConversationsActivity.EXTRA_TEXT);
+ final String nick = extras.getString(ConversationsActivity.EXTRA_NICK);
+ final boolean pm = extras.getBoolean(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, false);
if (nick != null) {
if (pm) {
Jid jid = conversation.getJid();
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
new file mode 100644
index 000000000..39d2540e1
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -0,0 +1,618 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package eu.siacs.conversations.ui;
+
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.databinding.DataBindingUtil;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.openintents.openpgp.util.OpenPgpApi;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.databinding.ActivityConversationsBinding;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.ui.interfaces.OnConversationArchived;
+import eu.siacs.conversations.ui.interfaces.OnConversationRead;
+import eu.siacs.conversations.ui.interfaces.OnConversationSelected;
+import eu.siacs.conversations.ui.interfaces.OnConversationsListItemUpdated;
+import eu.siacs.conversations.ui.service.EmojiService;
+import eu.siacs.conversations.ui.util.ActivityResult;
+import eu.siacs.conversations.ui.util.PendingItem;
+import eu.siacs.conversations.utils.ExceptionHelper;
+import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
+
+import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
+
+public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
+
+ public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.action.VIEW";
+ public static final String EXTRA_CONVERSATION = "conversationUuid";
+ public static final String EXTRA_DOWNLOAD_UUID = "eu.siacs.conversations.download_uuid";
+ public static final String EXTRA_TEXT = "text";
+ public static final String EXTRA_NICK = "nick";
+ public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm";
+
+ public static final int REQUEST_OPEN_MESSAGE = 0x9876;
+ public static final int REQUEST_PLAY_PAUSE = 0x5432;
+
+
+ //secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
+ private static final @IdRes
+ int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
+ private final PendingItem pendingViewIntent = new PendingItem<>();
+ private final PendingItem postponedActivityResult = new PendingItem<>();
+ private ActivityConversationsBinding binding;
+ private boolean mActivityPaused = true;
+ private AtomicBoolean mRedirectInProcess = new AtomicBoolean(false);
+
+ private static boolean isViewIntent(Intent i) {
+ return i != null && ACTION_VIEW_CONVERSATION.equals(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
+ }
+
+ private static Intent createLauncherIntent(Context context) {
+ final Intent intent = new Intent(context, ConversationsActivity.class);
+ intent.setAction(Intent.ACTION_MAIN);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ return intent;
+ }
+
+ @Override
+ protected void refreshUiReal() {
+ for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+ refreshFragment(id);
+ }
+ }
+
+ @Override
+ void onBackendConnected() {
+ if (performRedirectIfNecessary(true)) {
+ return;
+ }
+ xmppConnectionService.getNotificationService().setIsInForeground(true);
+ Intent intent = pendingViewIntent.pop();
+ if (intent != null) {
+ if (processViewIntent(intent)) {
+ if (binding.secondaryFragment != null) {
+ notifyFragmentOfBackendConnected(R.id.main_fragment);
+ }
+ invalidateActionBarTitle();
+ return;
+ }
+ }
+ for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+ notifyFragmentOfBackendConnected(id);
+ }
+
+ ActivityResult activityResult = postponedActivityResult.pop();
+ if (activityResult != null) {
+ handleActivityResult(activityResult);
+ }
+
+ invalidateActionBarTitle();
+ if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
+ Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
+ if (conversation != null) {
+ openConversation(conversation, null);
+ }
+ }
+ showDialogsIfMainIsOverview();
+ }
+
+ private boolean performRedirectIfNecessary(boolean noAnimation) {
+ return performRedirectIfNecessary(null, noAnimation);
+ }
+
+ private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
+ if (xmppConnectionService == null) {
+ return false;
+ }
+ boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
+ if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
+ final Intent intent = getRedirectionIntent(noAnimation);
+ runOnUiThread(() -> {
+ startActivity(intent);
+ if (noAnimation) {
+ overridePendingTransition(0, 0);
+ }
+ });
+ }
+ return mRedirectInProcess.get();
+ }
+
+ private Intent getRedirectionIntent(boolean noAnimation) {
+ Account pendingAccount = xmppConnectionService.getPendingAccount();
+ Intent intent;
+ if (pendingAccount != null) {
+ intent = new Intent(this, EditAccountActivity.class);
+ intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
+ } else {
+ if (xmppConnectionService.getAccounts().size() == 0) {
+ if (Config.X509_VERIFICATION) {
+ intent = new Intent(this, ManageAccountActivity.class);
+ } else if (Config.MAGIC_CREATE_DOMAIN != null) {
+ intent = new Intent(this, WelcomeActivity.class);
+ WelcomeActivity.addInviteUri(intent, getIntent());
+ } else {
+ intent = new Intent(this, EditAccountActivity.class);
+ }
+ } else {
+ intent = new Intent(this, StartConversationActivity.class);
+ }
+ }
+ intent.putExtra("init", true);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ if (noAnimation) {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ }
+ return intent;
+ }
+
+ private void showDialogsIfMainIsOverview() {
+ if (xmppConnectionService == null) {
+ return;
+ }
+ final Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+ if (ExceptionHelper.checkForCrash(this)) {
+ return;
+ }
+ openBatteryOptimizationDialogIfNeeded();
+ }
+ }
+
+ private String getBatteryOptimizationPreferenceKey() {
+ @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+ return "show_battery_optimization" + (device == null ? "" : device);
+ }
+
+ private void setNeverAskForBatteryOptimizationsAgain() {
+ getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
+ }
+
+ private void openBatteryOptimizationDialogIfNeeded() {
+ if (hasAccountWithoutPush()
+ && isOptimizingBattery()
+ && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.battery_optimizations_enabled);
+ builder.setMessage(R.string.battery_optimizations_enabled_dialog);
+ builder.setPositiveButton(R.string.next, (dialog, which) -> {
+ Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+ Uri uri = Uri.parse("package:" + getPackageName());
+ intent.setData(uri);
+ try {
+ startActivityForResult(intent, REQUEST_BATTERY_OP);
+ } catch (ActivityNotFoundException e) {
+ Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
+ }
+ });
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+ builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
+ }
+ AlertDialog dialog = builder.create();
+ dialog.setCanceledOnTouchOutside(false);
+ dialog.show();
+ }
+ }
+
+ private boolean hasAccountWithoutPush() {
+ for (Account account : xmppConnectionService.getAccounts()) {
+ if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void notifyFragmentOfBackendConnected(@IdRes int id) {
+ final Fragment fragment = getFragmentManager().findFragmentById(id);
+ if (fragment != null && fragment instanceof XmppFragment) {
+ ((XmppFragment) fragment).onBackendConnected();
+ }
+ }
+
+ private void refreshFragment(@IdRes int id) {
+ final Fragment fragment = getFragmentManager().findFragmentById(id);
+ if (fragment != null && fragment instanceof XmppFragment) {
+ ((XmppFragment) fragment).refresh();
+ }
+ }
+
+ private boolean processViewIntent(Intent intent) {
+ String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
+ Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
+ if (conversation == null) {
+ Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
+ return false;
+ }
+ openConversation(conversation, intent.getExtras());
+ return true;
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode,@NonNull String permissions[], @NonNull int[] grantResults) {
+ UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
+ if (grantResults.length > 0) {
+ if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ switch(requestCode) {
+ case REQUEST_OPEN_MESSAGE:
+ refreshUiReal();
+ ConversationFragment.openPendingMessage(this);
+ break;
+ case REQUEST_PLAY_PAUSE:
+ ConversationFragment.startStopPending(this);
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, final Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ ActivityResult activityResult = ActivityResult.of(requestCode, resultCode, data);
+ if (xmppConnectionService != null) {
+ handleActivityResult(activityResult);
+ } else {
+ this.postponedActivityResult.push(activityResult);
+ }
+ }
+
+ private void handleActivityResult(ActivityResult activityResult) {
+ if (activityResult.resultCode == Activity.RESULT_OK) {
+ handlePositiveActivityResult(activityResult.requestCode, activityResult.data);
+ } else {
+ handleNegativeActivityResult(activityResult.requestCode);
+ }
+ }
+
+ private void handleNegativeActivityResult(int requestCode) {
+ Conversation conversation = ConversationFragment.getConversationReliable(this);
+ switch (requestCode) {
+ case REQUEST_DECRYPT_PGP:
+ if (conversation == null) {
+ break;
+ }
+ conversation.getAccount().getPgpDecryptionService().giveUpCurrentDecryption();
+ break;
+ case REQUEST_BATTERY_OP:
+ setNeverAskForBatteryOptimizationsAgain();
+ break;
+ }
+ }
+
+ private void handlePositiveActivityResult(int requestCode, final Intent data) {
+ Conversation conversation = ConversationFragment.getConversationReliable(this);
+ if (conversation == null) {
+ Log.d(Config.LOGTAG,"conversation not found");
+ return;
+ }
+ switch (requestCode) {
+ case REQUEST_DECRYPT_PGP:
+ conversation.getAccount().getPgpDecryptionService().continueDecryption(data);
+ break;
+ case REQUEST_CHOOSE_PGP_ID:
+ long id = data.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0);
+ if (id != 0) {
+ conversation.getAccount().setPgpSignId(id);
+ announcePgp(conversation.getAccount(), null, null, onOpenPGPKeyPublished);
+ } else {
+ choosePgpSignId(conversation.getAccount());
+ }
+ break;
+ case REQUEST_ANNOUNCE_PGP:
+ announcePgp(conversation.getAccount(), conversation, data, onOpenPGPKeyPublished);
+ break;
+ }
+ }
+
+ @Override
+ protected void onCreate(final Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ new EmojiService(this).init();
+ this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
+ this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
+ this.getFragmentManager().addOnBackStackChangedListener(this::showDialogsIfMainIsOverview);
+ this.initializeFragments();
+ this.invalidateActionBarTitle();
+ final Intent intent;
+ if (savedInstanceState == null) {
+ intent = getIntent();
+ } else {
+ intent = savedInstanceState.getParcelable("intent");
+ }
+ if (isViewIntent(intent)) {
+ pendingViewIntent.push(intent);
+ setIntent(createLauncherIntent(this));
+ }
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.activity_conversations, menu);
+ MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
+ if (qrCodeScanMenuItem != null) {
+ Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
+ && fragment != null
+ && fragment instanceof ConversationsOverviewFragment;
+ qrCodeScanMenuItem.setVisible(visible);
+ }
+ return super.onCreateOptionsMenu(menu);
+ }
+
+ @Override
+ public void onConversationSelected(Conversation conversation) {
+ if (ConversationFragment.getConversation(this) == conversation) {
+ Log.d(Config.LOGTAG,"ignore onConversationSelected() because conversation is already open");
+ return;
+ }
+ openConversation(conversation, null);
+ }
+
+ private void openConversation(Conversation conversation, Bundle extras) {
+ ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
+ final boolean mainNeedsRefresh;
+ if (conversationFragment == null) {
+ mainNeedsRefresh = false;
+ Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+ conversationFragment = (ConversationFragment) mainFragment;
+ } else {
+ conversationFragment = new ConversationFragment();
+ FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+ fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
+ fragmentTransaction.addToBackStack(null);
+ fragmentTransaction.commit();
+ }
+ } else {
+ mainNeedsRefresh = true;
+ }
+ conversationFragment.reInit(conversation, extras == null ? new Bundle() : extras);
+ if (mainNeedsRefresh) {
+ refreshFragment(R.id.main_fragment);
+ } else {
+ invalidateActionBarTitle();
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ FragmentManager fm = getFragmentManager();
+ if (fm.getBackStackEntryCount() > 0) {
+ fm.popBackStack();
+ return true;
+ }
+ break;
+ case R.id.action_scan_qr_code:
+ UriHandlerActivity.scan(this);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle savedInstanceState) {
+ Intent pendingIntent = pendingViewIntent.peek();
+ savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
+ super.onSaveInstanceState(savedInstanceState);
+ }
+
+ @Override
+ protected void onStart() {
+ final int theme = findTheme();
+ if (this.mTheme != theme) {
+ this.mSkipBackgroundBinding = true;
+ recreate();
+ } else {
+ this.mSkipBackgroundBinding = false;
+ }
+ mRedirectInProcess.set(false);
+ super.onStart();
+ }
+
+ @Override
+ protected void onNewIntent(final Intent intent) {
+ if (isViewIntent(intent)) {
+ if (xmppConnectionService != null) {
+ processViewIntent(intent);
+ } else {
+ pendingViewIntent.push(intent);
+ }
+ }
+ setIntent(createLauncherIntent(this));
+ }
+
+ @Override
+ public void onPause() {
+ this.mActivityPaused = true;
+ super.onPause();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ this.mActivityPaused = false;
+ }
+
+ private void initializeFragments() {
+ FragmentTransaction transaction = getFragmentManager().beginTransaction();
+ Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
+ if (mainFragment != null) {
+ if (binding.secondaryFragment != null) {
+ if (mainFragment instanceof ConversationFragment) {
+ getFragmentManager().popBackStack();
+ transaction.remove(mainFragment);
+ transaction.commit();
+ getFragmentManager().executePendingTransactions();
+ transaction = getFragmentManager().beginTransaction();
+ transaction.replace(R.id.secondary_fragment, mainFragment);
+ transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
+ transaction.commit();
+ return;
+ }
+ } else {
+ if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
+ transaction.remove(secondaryFragment);
+ transaction.commit();
+ getFragmentManager().executePendingTransactions();
+ transaction = getFragmentManager().beginTransaction();
+ transaction.replace(R.id.main_fragment, secondaryFragment);
+ transaction.addToBackStack(null);
+ transaction.commit();
+ return;
+ }
+ }
+ } else {
+ transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
+ }
+ if (binding.secondaryFragment != null && secondaryFragment == null) {
+ transaction.replace(R.id.secondary_fragment, new ConversationFragment());
+ }
+ transaction.commit();
+ }
+
+ private void invalidateActionBarTitle() {
+ final ActionBar actionBar = getSupportActionBar();
+ if (actionBar != null) {
+ Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+ final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
+ if (conversation != null) {
+ actionBar.setTitle(conversation.getName());
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ return;
+ }
+ }
+ actionBar.setTitle(R.string.app_name);
+ actionBar.setDisplayHomeAsUpEnabled(false);
+ }
+ }
+
+ @Override
+ public void onConversationArchived(Conversation conversation) {
+ if (performRedirectIfNecessary(conversation, false)) {
+ return;
+ }
+ Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+ getFragmentManager().popBackStack();
+ return;
+ }
+ Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
+ if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
+ if (((ConversationFragment) secondaryFragment).getConversation() == conversation) {
+ Conversation suggestion = ConversationsOverviewFragment.getSuggestion(this, conversation);
+ if (suggestion != null) {
+ openConversation(suggestion, null);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onConversationsListItemUpdated() {
+ Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+ ((ConversationsOverviewFragment) fragment).refresh();
+ }
+ }
+
+ @Override
+ public void switchToConversation(Conversation conversation) {
+ Log.d(Config.LOGTAG,"override");
+ openConversation(conversation,null);
+ }
+
+ @Override
+ public void onConversationRead(Conversation conversation) {
+ if (!mActivityPaused && pendingViewIntent.peek() == null) {
+ xmppConnectionService.sendReadMarker(conversation);
+ } else {
+ Log.d(Config.LOGTAG,"ignoring read callback. mActivityPaused="+Boolean.toString(mActivityPaused));
+ }
+ }
+
+ @Override
+ public void onAccountUpdate() {
+ this.refreshUi();
+ }
+
+ @Override
+ public void onConversationUpdate() {
+ if (performRedirectIfNecessary(false)) {
+ return;
+ }
+ this.refreshUi();
+ }
+
+ @Override
+ public void onRosterUpdate() {
+ this.refreshUi();
+ }
+
+ @Override
+ public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
+ this.refreshUi();
+ }
+
+ @Override
+ public void onShowErrorToast(int resId) {
+ runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
+ }
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index d6eee773a..a6d6b0e09 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -61,7 +61,6 @@ import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.MucOptions;
import eu.siacs.conversations.entities.Presences;
import eu.siacs.conversations.services.AvatarService;
import eu.siacs.conversations.services.BarcodeProvider;
@@ -497,15 +496,15 @@ public abstract class XmppActivity extends AppCompatActivity {
}
private void switchToConversation(Conversation conversation, String text, String nick, boolean pm, boolean newTask) {
- Intent intent = new Intent(this, ConversationActivity.class);
- intent.setAction(ConversationActivity.ACTION_VIEW_CONVERSATION);
- intent.putExtra(ConversationActivity.EXTRA_CONVERSATION, conversation.getUuid());
+ Intent intent = new Intent(this, ConversationsActivity.class);
+ intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION);
+ intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
if (text != null) {
- intent.putExtra(ConversationActivity.EXTRA_TEXT, text);
+ intent.putExtra(ConversationsActivity.EXTRA_TEXT, text);
}
if (nick != null) {
- intent.putExtra(ConversationActivity.EXTRA_NICK, nick);
- intent.putExtra(ConversationActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
+ intent.putExtra(ConversationsActivity.EXTRA_NICK, nick);
+ intent.putExtra(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
}
if (newTask) {
intent.setFlags(intent.getFlags()
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5cf8efb36..42e3ffe13 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -35,7 +35,6 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.ArrayAdapter;
@@ -66,7 +65,7 @@ import eu.siacs.conversations.entities.Transferable;
import eu.siacs.conversations.persistance.FileBackend;
import eu.siacs.conversations.services.MessageArchiveService;
import eu.siacs.conversations.services.NotificationService;
-import eu.siacs.conversations.ui.ConversationActivity;
+import eu.siacs.conversations.ui.ConversationsActivity;
import eu.siacs.conversations.ui.ConversationFragment;
import eu.siacs.conversations.ui.XmppActivity;
import eu.siacs.conversations.ui.service.AudioPlayer;
@@ -915,7 +914,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie
public void openDownloadable(Message message) {
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ConversationFragment.registerPendingMessage(activity, message);
- ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ConversationActivity.REQUEST_OPEN_MESSAGE);
+ ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ConversationsActivity.REQUEST_OPEN_MESSAGE);
return;
}
DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
diff --git a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java
index 699e042ba..ce845df36 100644
--- a/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java
+++ b/src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java
@@ -3,7 +3,6 @@ package eu.siacs.conversations.ui.service;
import android.Manifest;
import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
-import android.media.Image;
import android.media.MediaPlayer;
import android.os.Build;
import android.os.Handler;
@@ -20,7 +19,7 @@ import java.util.Locale;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.ui.ConversationActivity;
+import eu.siacs.conversations.ui.ConversationsActivity;
import eu.siacs.conversations.ui.adapter.MessageAdapter;
import eu.siacs.conversations.ui.util.PendingItem;
import eu.siacs.conversations.utils.WeakReferenceSet;
@@ -107,7 +106,7 @@ public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompleti
private void startStop(ImageButton playPause) {
if (ContextCompat.checkSelfPermission(messageAdapter.getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
pendingOnClickView.push(new WeakReference<>(playPause));
- ActivityCompat.requestPermissions(messageAdapter.getActivity(), new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ConversationActivity.REQUEST_PLAY_PAUSE);
+ ActivityCompat.requestPermissions(messageAdapter.getActivity(), new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, ConversationsActivity.REQUEST_PLAY_PAUSE);
return;
}
final RelativeLayout audioPlayer = (RelativeLayout) playPause.getParent();
diff --git a/src/main/res/drawable-hdpi/splash_logo.png b/src/main/res/drawable-hdpi/splash_logo.png
new file mode 100644
index 000000000..d8efc71af
Binary files /dev/null and b/src/main/res/drawable-hdpi/splash_logo.png differ
diff --git a/src/main/res/drawable-mdpi/splash_logo.png b/src/main/res/drawable-mdpi/splash_logo.png
new file mode 100644
index 000000000..1b10d1f91
Binary files /dev/null and b/src/main/res/drawable-mdpi/splash_logo.png differ
diff --git a/src/main/res/drawable-xhdpi/splash_logo.png b/src/main/res/drawable-xhdpi/splash_logo.png
new file mode 100644
index 000000000..9458b791c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/splash_logo.png differ
diff --git a/src/main/res/drawable-xxhdpi/splash_logo.png b/src/main/res/drawable-xxhdpi/splash_logo.png
new file mode 100644
index 000000000..83c2abe6a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/splash_logo.png differ
diff --git a/src/main/res/drawable-xxxhdpi/splash_logo.png b/src/main/res/drawable-xxxhdpi/splash_logo.png
new file mode 100644
index 000000000..349070ba2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/splash_logo.png differ
diff --git a/src/main/res/drawable/background.xml b/src/main/res/drawable/background.xml
new file mode 100644
index 000000000..f9c1fa73a
--- /dev/null
+++ b/src/main/res/drawable/background.xml
@@ -0,0 +1,11 @@
+
+
+
+ -
+
+
+
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 2f8cbdad1..2039bfc64 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -160,4 +160,8 @@
- @android:color/black
+
\ No newline at end of file