Use safe fragment handling for AllMediaActivity page changes

Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/27346299-b840-4970-893f-f438f9b94981 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>
Lazy-create pager fragments in AllMediaActivity without tag lookup
2026-07-03 14:05:24 +02:00 · 2026-05-11 20:49:33 +00:00 · 2026-05-11 20:47:27 +00:00 · 2026-05-11 20:45:32 +00:00 · 2026-05-11 17:20:41 +00:00 · 2026-05-11 14:16:37 +00:00
189 changed files with 2051 additions and 1051 deletions
@@ -4,14 +4,20 @@ on:
    workflows: ["Upload Preview APK"]
    types: [completed]

+permissions: {}
+
 jobs:
  artifacts-url-comments:
    name: add artifact links to pull request
+    permissions:
+      pull-requests: write
+      actions: read
+      contents: read
    runs-on: ubuntu-latest
    if: ${{ github.event.workflow_run.conclusion == 'success' }}
    steps:
      - name: add artifact links to pull request
-        uses: tonyhallett/artifacts-url-comments@v1.1.0
+        uses: tonyhallett/artifacts-url-comments@0965ff1a7ae03c5c1644d3c30f956effea4e05ef # v1.1.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
@@ -10,6 +10,8 @@ on:
      - 'jni/dc_wrapper.c'
      - 'scripts/ndk-make.sh'

+permissions: {}
+
 jobs:
  build:
    runs-on: ubuntu-latest
@@ -17,14 +19,15 @@ jobs:
      - uses: actions/checkout@v5
        with:
          submodules: recursive
+          persist-credentials: false

-      - uses: android-actions/setup-android@v3
-      - uses: nttld/setup-ndk@v1
+      - uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4.0.1
+      - uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0
        id: setup-ndk
        with:
          ndk-version: r27

-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
        with:
          workspaces: jni/deltachat-core-rust

@@ -5,6 +5,8 @@ on:
    branches: [main]
  pull_request:

+permissions: {}
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
@@ -17,6 +19,8 @@ jobs:
      contents: read
    steps:
      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
      - uses: actions/setup-java@v5
        with:
          java-version: 17
@@ -30,6 +34,6 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-gradle-
      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
      - name: Check formatting
        run: ./gradlew spotlessCheck
@@ -6,6 +6,8 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

+permissions: {}
+
 jobs:
  build:
    name: Upload Preview APK
@@ -14,6 +16,7 @@ jobs:
      - uses: actions/checkout@v5
        with:
          submodules: recursive
+          persist-credentials: false

      - name: Validate Fastlane Metadata
        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
@@ -33,15 +36,15 @@ jobs:
            ${{ runner.os }}-gradle-

      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0

-      - uses: android-actions/setup-android@v3
-      - uses: nttld/setup-ndk@v1
+      - uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4.0.1
+      - uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0
        id: setup-ndk
        with:
          ndk-version: r27

-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
        with:
          workspaces: jni/deltachat-core-rust

@@ -0,0 +1,26 @@
+name: GitHub Actions Security Analysis with zizmor
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+
+permissions: {}
+
+jobs:
+  zizmor:
+    name: Run zizmor
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
+      contents: read
+      actions: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
@@ -0,0 +1,6 @@
+rules:
+  unpinned-uses:
+    config:
+      policies:
+        actions/*: ref-pin
+        dependabot/*: ref-pin
@@ -243,3 +243,15 @@ $ANDROID_NDK_ROOT/ndk-stack --sym obj/local/armeabi-v7a --dump crash.txt > decod
 `obj/local/armeabi-v7a` is the extracted path from `deltachat-gplay-release-X.X.X.apk-symbols.zip` file from https://download.delta.chat/android/symbols/

 Replace `armeabi-v7a` by the correct architecture the logs come from (can be guessed by trial and error)
+
+
+### Deobfuscating Java Stack Traces
+
+Because the app uses code minification (ProGuard/R8), Java stack traces in crash reports are obfuscated.
+To decode them, use `retrace` with the `mapping.txt` file that is included in the symbols zip:
+
+```
+retrace mapping.txt crash.txt > decoded-crash.txt
+```
+
+`mapping.txt` is extracted from the same `deltachat-gplay-release-X.X.X.apk-symbols.zip` file available at https://download.delta.chat/android/symbols/
@@ -4,6 +4,18 @@

 * Better incoming call system integration
 * Calls are not experimental anymore and don't need to be manually enabled
+* Channels are no longer experimental and are available by default
+* Display a permanent notification when doing location streaming and get rid of dangerous "Access Location in Background" permission
+* Autoplay all voice messages in a chat
+* Allow to share location for 24 hours
+* Allow mini-apps to play audio without user interaction
+* Mark chats as unread (long tap a chat and select the corresponding option from the three-dot-menu)
+* Add "Mark all as read" option to profile menu in the profile switcher
+* Fix process of upgrading from a very old version of the app
+* Show more recent added stickers at the top of the sticker picker
+* Allow to open links in messages via actions in TalkBack menu
+* Allow to open map if user clicks "Location streaming enabled" system message
+* Fix: do not accidentally set draft in chats that don't allow sending messages

 ## v2.49.0
 2026-04
@@ -223,7 +223,7 @@ spotless {
    }
    format 'xml', {
        target 'src/*/res/**/*.xml', 'src/*/AndroidManifest.xml'
-        targetExclude 'src/*/res/values*/strings.xml' // line-break changes invalidate translations
+        targetExclude 'src/*/res/values*/strings*.xml' // line-break changes invalidate translations
        eclipseWtp('xml').configFile('spotless/eclipse-wtp-xml.prefs')
        trimTrailingWhitespace()
        endWithNewline()
@@ -279,6 +279,7 @@ dependencies {
    implementation "androidx.media3:media3-session:$media3_version"
    implementation "androidx.media3:media3-ui:$media3_version"
    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
    implementation 'com.google.zxing:core:3.3.0' // fixed version to support SDK<24
    implementation ('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false } // QR Code scanner
    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' // used as JSON library
@@ -307,6 +308,7 @@ dependencies {
        exclude group: 'com.google.firebase', module: 'firebase-analytics'
        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
    }
+    gplayImplementation 'com.google.android.gms:play-services-location:21.3.0'

    testImplementation 'junit:junit:4.13.2'
    testImplementation 'org.assertj:assertj-core:3.27.3'
@@ -25,7 +25,7 @@ ArcaneChat is a Delta Chat client and was created with a focus on usability, goo
 <li>Multiple color themes/skins</li>
 <li>It is possible to disable profiles to completely disconnect them saving data/bandwidth</li>
 <li>You can easily see the connection status of all your profiles in the profile switcher</li>
-<li>Extra option to share location for 12 hours</li>
+<li>Extra option to share location for 24 hours</li>
 <li>Clicking on a message with a POI location, will open the POI on the map</li>
 <li>Last-seen status of contacts is shown in your contact list, like in WhatsApp, Telegram, etc.</li>
 <li>Videos are played in loop, useful for short GIF videos</li>
@@ -1393,6 +1393,7 @@ JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getId(JNIEnv *env, jobject obj)
    return dc_msg_get_id(get_dc_msg(env, obj));
 }

+
 JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getText(JNIEnv *env, jobject obj)
 {
    char* temp = dc_msg_get_text(get_dc_msg(env, obj));
@@ -34,6 +34,7 @@ cd ../..
 SYMBOLS_ZIP="$APK-symbols.zip"
 rm $SYMBOLS_ZIP
 zip -r $SYMBOLS_ZIP obj
+zip $SYMBOLS_ZIP build/outputs/mapping/gplayRelease/mapping.txt
 ls -l $SYMBOLS_ZIP
 rsync --progress $SYMBOLS_ZIP jekyll@download.delta.chat:/var/www/html/download/android/symbols/

@@ -39,7 +39,7 @@ public class EnterChatsBenchmark {
  // PLEASE BACKUP YOUR ACCOUNT BEFORE RUNNING THIS!
  // ==============================================================================================

-  private static final String TAG = EnterChatsBenchmark.class.getSimpleName();
+  private static final String TAG = "EnterChatsBenchmark";

  @Rule
  public ActivityScenarioRule<ConversationListActivity> activityRule =
@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.util.Log;
+
+/** Non-GMS, always uses the platform LocationManager. */
+public final class LocationSourceFactory {
+
+  private static final String TAG = "LocationSourceFactory";
+
+  private LocationSourceFactory() {}
+
+  public static LocationSource create(Context context) {
+    Log.i(TAG, "Non-GMS build, Using platform LocationManager");
+    return new PlatformLocationSource();
+  }
+}
@@ -0,0 +1,61 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.location.Location;
+import android.os.Looper;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.Priority;
+
+public class GmsLocationSource implements LocationSource {
+
+  private static final String TAG = "GmsLocationSource";
+  private static final long UPDATE_INTERVAL_MS = 3_000;
+  private static final long FASTEST_INTERVAL_MS = 1_000;
+
+  private FusedLocationProviderClient client;
+  private LocationCallback locationCallback;
+
+  @Override
+  public void startUpdates(@NonNull Context context, @NonNull Callback callback) {
+    client = LocationServices.getFusedLocationProviderClient(context);
+
+    LocationRequest request =
+        new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, UPDATE_INTERVAL_MS)
+            .setMinUpdateIntervalMillis(FASTEST_INTERVAL_MS)
+            .setMinUpdateDistanceMeters(0)
+            .setWaitForAccurateLocation(false)
+            .build();
+
+    locationCallback =
+        new LocationCallback() {
+          @Override
+          public void onLocationResult(@NonNull LocationResult result) {
+            Location loc = result.getLastLocation();
+            if (loc != null) {
+              callback.onLocationUpdate(loc);
+            }
+          }
+        };
+
+    try {
+      client.requestLocationUpdates(request, locationCallback, Looper.getMainLooper());
+    } catch (SecurityException e) {
+      Log.e(TAG, "Missing location permission", e);
+    }
+  }
+
+  @Override
+  public void stopUpdates() {
+    if (client != null && locationCallback != null) {
+      client.removeLocationUpdates(locationCallback);
+      client = null;
+      locationCallback = null;
+    }
+  }
+}
@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.util.Log;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
+/**
+ * Prefers FusedLocationProviderClient, falls back to platform LocationManager if Play Services are
+ * somehow unavailable.
+ */
+public final class LocationSourceFactory {
+
+  private static final String TAG = "LocationSourceFactory";
+
+  private LocationSourceFactory() {}
+
+  public static LocationSource create(Context context) {
+    if (isGmsAvailable(context)) {
+      Log.i(TAG, "Using FusedLocationProviderClient");
+      return new GmsLocationSource();
+    }
+    Log.i(TAG, "GMS unavailable, falling back to LocationManager");
+    return new PlatformLocationSource();
+  }
+
+  private static boolean isGmsAvailable(Context context) {
+    try {
+      return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context)
+          == ConnectionResult.SUCCESS;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+}
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.service.FetchForegroundService;
 import org.thoughtcrime.securesms.util.Util;

 public class FcmReceiveService extends FirebaseMessagingService {
-  private static final String TAG = FcmReceiveService.class.getSimpleName();
+  private static final String TAG = "FcmReceiveService";
  private static final Object INIT_LOCK = new Object();
  private static boolean initialized;
  private static volatile boolean triedRegistering;
@@ -71,6 +71,8 @@
        android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />

    <!-- force compiling libs on older sdk than supported; runtime checks are required -->
@@ -81,7 +83,6 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
-        tools:replace="android:allowBackup"
        android:allowBackup="false"
        android:theme="@style/TextSecure.LightTheme"
        android:largeHeap="true"
@@ -464,10 +465,6 @@
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        </activity>

-        <service
-            android:name=".geolocation.LocationBackgroundService"
-            android:foregroundServiceType="location" />
-
        <service
            android:name=".service.GenericForegroundService"
            android:foregroundServiceType="dataSync" />
@@ -476,6 +473,11 @@
            android:name=".service.FetchForegroundService"
            android:foregroundServiceType="dataSync" />

+        <service
+            android:name=".geolocation.LocationStreamingService"
+            android:foregroundServiceType="location"
+            android:exported="false" />
+
        <service
            android:name=".service.AudioPlaybackService"
            android:foregroundServiceType="mediaPlayback"
@@ -489,7 +491,7 @@
            android:name=".calls.CallService"
            android:enabled="true"
            android:exported="false"
-            android:foregroundServiceType="camera|microphone" />
+            android:foregroundServiceType="camera|microphone|phoneCall" />

        <receiver
            android:name=".notifications.MarkReadReceiver"
@@ -59,8 +59,6 @@ public class DcMsg {
  public static final int DC_VIDEOCHATTYPE_UNKNOWN = 0;
  public static final int DC_VIDEOCHATTYPE_BASICWEBRTC = 1;

-  private static final String TAG = DcMsg.class.getSimpleName();
-
  public DcMsg(DcContext context, int viewtype) {
    msgCPtr = context.createMsgCPtr(viewtype);
  }
@@ -4,7 +4,6 @@ import android.content.ComponentName;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuItem;
-import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -12,21 +11,23 @@ import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.session.MediaController;
 import androidx.media3.session.SessionCommand;
 import androidx.media3.session.SessionToken;
-import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcMsg;
 import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
+import org.thoughtcrime.securesms.components.audioplay.ChatAudioQueueProvider;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.service.AudioPlaybackService;
@@ -35,7 +36,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = AllMediaActivity.class.getSimpleName();
+  private static final String TAG = "AllMediaActivity";

  public static final String CHAT_ID_EXTRA = "chat_id";
  public static final String CONTACT_ID_EXTRA = "contact_id";
@@ -63,7 +64,7 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
  private final ArrayList<TabData> tabs = new ArrayList<>();
  private Toolbar toolbar;
  private TabLayout tabLayout;
-  private ViewPager viewPager;
+  private ViewPager2 viewPager;

  private @Nullable MediaController mediaController;
  private ListenableFuture<MediaController> mediaControllerFuture;
@@ -97,8 +98,20 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
          isGlobalGallery() ? R.string.menu_all_media : R.string.apps_and_media);
    }

-    this.tabLayout.setupWithViewPager(viewPager);
-    this.viewPager.setAdapter(new AllMediaPagerAdapter(getSupportFragmentManager()));
+    AllMediaPagerAdapter adapter = new AllMediaPagerAdapter(this);
+    this.viewPager.setAdapter(adapter);
+    this.viewPager.registerOnPageChangeCallback(
+        new ViewPager2.OnPageChangeCallback() {
+          @Override
+          public void onPageSelected(int position) {
+            adapter.onPageChanged(position);
+          }
+        });
+    new TabLayoutMediator(
+            this.tabLayout,
+            this.viewPager,
+            (tab, position) -> tab.setText(getString(tabs.get(position).title)))
+        .attach();
    if (getIntent().getBooleanExtra(FORCE_GALLERY, false)) {
      this.viewPager.setCurrentItem(1, false);
    }
@@ -107,7 +120,9 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
    eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);

+    int accountId = DcHelper.getAccounts(this).getSelectedAccount().getAccountId();
    playbackViewModel = new ViewModelProvider(this).get(AudioPlaybackViewModel.class);
+    playbackViewModel.setQueueProvider(new ChatAudioQueueProvider(this, chatId, accountId));
    initializeMediaController();
  }

@@ -119,6 +134,7 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
      mediaController = null;
      playbackViewModel.setMediaController(null);
    }
+    playbackViewModel.setQueueProvider(null);
    super.onDestroy();
  }

@@ -182,31 +198,16 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    return contactId == 0 && chatId == 0;
  }

-  private class AllMediaPagerAdapter extends FragmentStatePagerAdapter {
-    private Object currentFragment = null;
+  private class AllMediaPagerAdapter extends FragmentStateAdapter {
+    private int currentPosition = -1;

-    AllMediaPagerAdapter(FragmentManager fragmentManager) {
-      super(fragmentManager);
-    }
-
-    @Override
-    public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      super.setPrimaryItem(container, position, object);
-      if (currentFragment != null && currentFragment != object) {
-        ActionMode action = null;
-        if (currentFragment instanceof MessageSelectorFragment) {
-          action = ((MessageSelectorFragment) currentFragment).getActionMode();
-        }
-        if (action != null) {
-          action.finish();
-        }
-      }
-      currentFragment = object;
+    AllMediaPagerAdapter(FragmentActivity activity) {
+      super(activity);
    }

    @NonNull
    @Override
-    public Fragment getItem(int position) {
+    public Fragment createFragment(int position) {
      TabData data = tabs.get(position);
      Fragment fragment;
      Bundle args = new Bundle();
@@ -229,13 +230,24 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
    }

    @Override
-    public int getCount() {
+    public int getItemCount() {
      return tabs.size();
    }

-    @Override
-    public CharSequence getPageTitle(int position) {
-      return getString(tabs.get(position).title);
+    void onPageChanged(int newPosition) {
+      if (currentPosition != -1 && currentPosition != newPosition) {
+        for (Fragment fragment : getSupportFragmentManager().getFragments()) {
+          if (!(fragment instanceof MessageSelectorFragment)) {
+            continue;
+          }
+
+          ActionMode action = ((MessageSelectorFragment) fragment).getActionMode();
+          if (action != null) {
+            action.finish();
+          }
+        }
+      }
+      currentPosition = newPosition;
    }
  }

@@ -40,7 +40,6 @@ import org.thoughtcrime.securesms.connect.KeepAliveService;
 import org.thoughtcrime.securesms.connect.NetworkStateReceiver;
 import org.thoughtcrime.securesms.crypto.DatabaseSecret;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
-import org.thoughtcrime.securesms.geolocation.DcLocationManager;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.notifications.FcmReceiveService;
 import org.thoughtcrime.securesms.notifications.InChatSounds;
@@ -53,7 +52,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.webxdc.WebxdcGarbageCollectionWorker;

 public class ApplicationContext extends MultiDexApplication {
-  private static final String TAG = ApplicationContext.class.getSimpleName();
+  private static final String TAG = "ApplicationContext";
  private static final Object initLock = new Object();
  private static volatile boolean isInitialized = false;

@@ -61,7 +60,6 @@ public class ApplicationContext extends MultiDexApplication {
  private Rpc rpc;
  private DcContext dcContext;

-  private DcLocationManager dcLocationManager;
  private DcEventCenter eventCenter;
  private NotificationCenter notificationCenter;
  private JobManager jobManager;
@@ -126,15 +124,6 @@ public class ApplicationContext extends MultiDexApplication {
    }
  }

-  /**
-   * Get DcLocationManager instance, waiting for initialization if necessary. This method is
-   * thread-safe and will block until initialization is complete.
-   */
-  public DcLocationManager getLocationManager() {
-    ensureInitialized();
-    return dcLocationManager;
-  }
-
  /**
   * Get DcEventCenter instance, waiting for initialization if necessary. This method is thread-safe
   * and will block until initialization is complete.
@@ -229,7 +218,7 @@ public class ApplicationContext extends MultiDexApplication {
              Log.i(TAG, "DcAccounts created");
              rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
              Log.i(TAG, "Rpc created");
-              AccountManager.getInstance().migrateToDcAccounts(this);
+              AccountManager.getInstance().migrateToDcAccounts(this, dcAccounts);

              int[] allAccounts = dcAccounts.getAll();
              Log.i(TAG, "Number of profiles: " + allAccounts.length);
@@ -282,7 +271,6 @@ public class ApplicationContext extends MultiDexApplication {
              }
              dcContext = dcAccounts.getSelectedAccount();
              notificationCenter = new NotificationCenter(this);
-              dcLocationManager = new DcLocationManager(this, dcContext);

              isInitialized = true;
              initLock.notifyAll();
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public abstract class BaseActionBarActivity extends AppCompatActivity {

-  private static final String TAG = BaseActionBarActivity.class.getSimpleName();
+  private static final String TAG = "BaseActionBarActivity";
  protected DynamicTheme dynamicTheme = new DynamicTheme();

  protected void onPreCreate() {
@@ -13,6 +13,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -26,6 +27,8 @@ import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.fragment.app.Fragment;
+import chat.delta.rpc.Rpc;
+import chat.delta.rpc.RpcException;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
@@ -44,6 +47,7 @@ import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 import org.thoughtcrime.securesms.util.views.ProgressDialog;

 public abstract class BaseConversationListFragment extends Fragment implements ActionMode.Callback {
+  private static final String TAG = "BaseConversationListFragment";
  protected ActionMode actionMode;
  protected PulsingFloatingActionButton fab;

@@ -170,6 +174,17 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    return false;
  }

+  private boolean areSomeSelectedChatsFresh() {
+    DcContext dcContext = DcHelper.getContext(requireActivity());
+    final Set<Long> selectedChats = getListAdapter().getBatchSelections();
+    for (long chatId : selectedChats) {
+      if (dcContext.getFreshMsgCount((int) chatId) > 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+
  private void handlePinAllSelected() {
    final DcContext dcContext = DcHelper.getContext(requireActivity());
    final Set<Long> selectedConversations =
@@ -229,6 +244,26 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    }
  }

+  private void handleMarkfreshSelected() {
+    final Set<Long> selectedConversations =
+        new HashSet<Long>(getListAdapter().getBatchSelections());
+
+    final Rpc rpc = DcHelper.getRpc(requireActivity());
+    try {
+      int accId = rpc.getSelectedAccountId();
+      for (long chatId : selectedConversations) {
+        rpc.markfreshChat(accId, (int) chatId);
+      }
+    } catch (RpcException e) {
+      Log.e(TAG, "RPC error", e);
+    }
+
+    if (actionMode != null) {
+      actionMode.finish();
+      actionMode = null;
+    }
+  }
+
  @SuppressLint("StaticFieldLeak")
  private void handleArchiveAllSelected() {
    final DcContext dcContext = DcHelper.getContext(requireActivity());
@@ -409,6 +444,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    if (!isRelayingMessageContent(requireActivity())) {
      final int selectedCount = getListAdapter().getBatchSelections().size();
      menu.findItem(R.id.menu_add_to_home_screen).setVisible(selectedCount == 1);
+
      MenuItem archiveItem = menu.findItem(R.id.menu_archive_selected);
      if (offerToArchive()) {
        archiveItem.setIcon(R.drawable.ic_archive_white_24dp);
@@ -417,6 +453,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A
        archiveItem.setIcon(R.drawable.ic_unarchive_white_24dp);
        archiveItem.setTitle(R.string.menu_unarchive_chat);
      }
+
      MenuItem pinItem = menu.findItem(R.id.menu_pin_selected);
      if (areSomeSelectedChatsUnpinned()) {
        pinItem.setIcon(R.drawable.ic_pin_white);
@@ -425,12 +462,17 @@ public abstract class BaseConversationListFragment extends Fragment implements A
        pinItem.setIcon(R.drawable.ic_unpin_white);
        pinItem.setTitle(R.string.unpin_chat);
      }
+
      MenuItem muteItem = menu.findItem(R.id.menu_mute_selected);
      if (areSomeSelectedChatsUnmuted()) {
        muteItem.setTitle(R.string.menu_mute);
      } else {
        muteItem.setTitle(R.string.menu_unmute);
      }
+
+      final boolean someAreFresh = areSomeSelectedChatsFresh();
+      menu.findItem(R.id.menu_marknoticed_selected).setVisible(someAreFresh);
+      menu.findItem(R.id.menu_markfresh_selected).setVisible(!someAreFresh);
    }
  }

@@ -484,6 +526,9 @@ public abstract class BaseConversationListFragment extends Fragment implements A
    } else if (itemId == R.id.menu_marknoticed_selected) {
      handleMarknoticedSelected();
      return true;
+    } else if (itemId == R.id.menu_markfresh_selected) {
+      handleMarkfreshSelected();
+      return true;
    } else if (itemId == R.id.menu_add_to_home_screen) {
      handleAddToHomeScreen();
      return true;
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 */
 public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
    implements ContactSelectionListFragment.OnContactSelectedListener {
-  private static final String TAG = ContactSelectionActivity.class.getSimpleName();
+  private static final String TAG = "ContactSelectionActivity";

  protected ContactSelectionListFragment contactsFragment;

@@ -67,7 +67,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 */
 public class ContactSelectionListFragment extends Fragment
    implements LoaderManager.LoaderCallbacks<DcContactsLoader.Ret>, DcEventCenter.DcEventDelegate {
-  private static final String TAG = ContactSelectionListFragment.class.getSimpleName();
+  private static final String TAG = "ContactSelectionListFragment";

  public static final String MULTI_SELECT = "multi_select";
  public static final String SELECT_UNENCRYPTED_EXTRA = "select_unencrypted_extra";
@@ -101,6 +101,7 @@ import org.thoughtcrime.securesms.components.ScaleStableImageView;
 import org.thoughtcrime.securesms.components.SendButton;
 import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
 import org.thoughtcrime.securesms.components.audioplay.AudioView;
+import org.thoughtcrime.securesms.components.audioplay.ChatAudioQueueProvider;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -148,7 +149,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
        InputPanel.Listener,
        InputPanel.MediaListener,
        AudioView.OnActionListener {
-  private static final String TAG = ConversationActivity.class.getSimpleName();
+  private static final String TAG = "ConversationActivity";

  public static final String ACCOUNT_ID_EXTRA = "account_id";
  public static final String CHAT_ID_EXTRA = "chat_id";
@@ -223,7 +224,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    initializeViews();
    initializeResources();

+    int accountId = DcHelper.getAccounts(this).getSelectedAccount().getAccountId();
    playbackViewModel = new ViewModelProvider(this).get(AudioPlaybackViewModel.class);
+    playbackViewModel.setQueueProvider(new ChatAudioQueueProvider(this, chatId, accountId));
    initializeMediaController();

    initializeSecurity(false, isDefaultSms)
@@ -413,6 +416,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
      mediaController = null;
      playbackViewModel.setMediaController(null);
    }
+    playbackViewModel.setQueueProvider(null);
    super.onDestroy();
  }

@@ -672,8 +676,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
  }

  public void setDraftText(String txt) {
-    composeText.setText(txt);
-    composeText.setSelection(composeText.getText().length());
+    try {
+      if (rpc.canSend(rpc.getSelectedAccountId(), chatId)) {
+        composeText.setText(txt);
+        composeText.setSelection(composeText.getText().length());
+      }
+    } catch (RpcException e) {
+      Log.e(TAG, "Rpc error", e);
+    }
  }

  public void hideSoftKeyboard() {
@@ -1119,6 +1129,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    if (chatId == DcChat.DC_CHAT_NO_CHAT)
      throw new IllegalStateException("can't display a conversation for no chat.");
    dcChat = DcHelper.getContext(context).getChat(chatId);
+    attachmentTypeSelector = null;
    recipient = new Recipient(this, dcChat);
    glideRequests = GlideApp.with(this);

@@ -1267,6 +1278,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity

    DcContext dcContext = DcHelper.getContext(context);
    final int currentChatId = dcChat.getId();
+    final boolean canSend = dcChat.canSend();
    Util.runOnAnyBackgroundThread(
        () -> {
          DcMsg msg = null;
@@ -1389,7 +1401,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
              }
            }
          } else {
-            dcContext.setDraft(currentChatId, msg);
+            // set or clear draft if user can't send in chat since they can't delete it otherwise
+            dcContext.setDraft(currentChatId, canSend ? msg : null);
          }
          future.set(currentChatId);
        });
@@ -80,7 +80,7 @@ import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar;

@SuppressLint("StaticFieldLeak")
 public class ConversationFragment extends MessageSelectorFragment {
-  private static final String TAG = ConversationFragment.class.getSimpleName();
+  private static final String TAG = "ConversationFragment";

  private static final int SCROLL_ANIMATION_THRESHOLD = 50;

@@ -944,6 +944,8 @@ public class ConversationFragment extends MessageSelectorFragment {
          WebxdcActivity.openWebxdcActivity(
              getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref());
        }
+      } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_LOCATIONSTREAMING_ENABLED) {
+        WebxdcActivity.openMaps(getContext(), (int) chatId);
      } else if (messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_DESCRIPTION_CHANGED) {
        Intent intent = new Intent(getContext(), ProfileActivity.class);
        intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, (int) chatId);
@@ -24,6 +24,7 @@ import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.os.Build;
 import android.text.Spannable;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -36,6 +37,7 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.ViewCompat;
 import chat.delta.rpc.RpcException;
 import chat.delta.rpc.types.CallInfo;
 import chat.delta.rpc.types.CallState;
@@ -44,6 +46,7 @@ import chat.delta.rpc.types.VcardContact;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcMsg;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import org.thoughtcrime.securesms.calls.CallCoordinator;
@@ -72,6 +75,7 @@ import org.thoughtcrime.securesms.mms.VcardSlide;
 import org.thoughtcrime.securesms.reactions.ReactionsConversationView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Linkifier;
+import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.MarkdownUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -86,7 +90,7 @@ import org.thoughtcrime.securesms.util.views.Stub;
 * @author Moxie Marlinspike
 */
 public class ConversationItem extends BaseConversationItem {
-  private static final String TAG = ConversationItem.class.getSimpleName();
+  private static final String TAG = "ConversationItem";

  private static final Rect SWIPE_RECT = new Rect();

@@ -120,6 +124,9 @@ public class ConversationItem extends BaseConversationItem {
  private Stub<CallItemView> callViewStub;
  private @Nullable EventListener eventListener;

+  // IDs of accessibility actions registered via ViewCompat.addAccessibilityAction
+  private final List<Integer> linkActionIds = new ArrayList<>();
+
  private int measureCalls;

  private int incomingBubbleColor;
@@ -424,6 +431,12 @@ public class ConversationItem extends BaseConversationItem {
    bodyText.setClickable(false);
    bodyText.setFocusable(false);

+    // Remove any link actions registered for the previous message binding
+    for (int id : linkActionIds) {
+      ViewCompat.removeAccessibilityAction(this, id);
+    }
+    linkActionIds.clear();
+
    String subject = messageRecord.getSubject();
    String text = messageRecord.getText();

@@ -433,12 +446,33 @@ public class ConversationItem extends BaseConversationItem {
    if (messageRecord.getType() == DcMsg.DC_MSG_CALL || text.isEmpty()) {
      bodyText.setVisibility(View.GONE);
    } else {
-      Spannable spannable = (Spannable) MarkdownUtil.toMarkdown(context, text);
+      Spannable spannable = MarkdownUtil.toMarkdown(context, text);
      if (batchSelected.isEmpty()) {
-        spannable = Linkifier.linkify(spannable);
+        Linkifier.linkify(spannable);
      }
      bodyText.setText(spannable);
      bodyText.setVisibility(View.VISIBLE);
+
+      // Register a TalkBack "Actions" entry for each link in the message
+      Spanned spanned = (Spanned) spannable;
+      final TextView tv = bodyText;
+      for (LongClickCopySpan span :
+          spanned.getSpans(0, spanned.length(), LongClickCopySpan.class)) {
+        int start = spanned.getSpanStart(span);
+        int end = spanned.getSpanEnd(span);
+        if (start >= 0 && end > start && end <= spanned.length()) {
+          String linkText = spanned.subSequence(start, end).toString();
+          String label = context.getString(R.string.accessibility_link_action, linkText);
+          linkActionIds.add(
+              ViewCompat.addAccessibilityAction(
+                  this,
+                  label,
+                  (v, args) -> {
+                    span.onClick(tv);
+                    return true;
+                  }));
+        }
+      }
    }

    int downloadState = messageRecord.getDownloadState();
@@ -69,6 +69,7 @@ import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.connect.DirectShareUtil;
+import org.thoughtcrime.securesms.geolocation.LocationStreamingService;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
@@ -90,7 +91,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public class ConversationListActivity extends PassphraseRequiredActionBarActivity
    implements ConversationListFragment.ConversationSelectedListener {
-  private static final String TAG = ConversationListActivity.class.getSimpleName();
+  private static final String TAG = "ConversationListActivity";
  private static final String OPENPGP4FPR = "openpgp4fpr";
  private static final String NDK_ARCH_WARNED = "ndk_arch_warned";
  public static final String CLEAR_NOTIFICATIONS = "clear_notifications";
@@ -449,6 +450,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
    refreshTitle();
    invalidateOptionsMenu();
    DirectShareUtil.triggerRefreshDirectShare(this);
+    if (DcHelper.getContext(this).isSendingLocationsToChat(0)) {
+      LocationStreamingService.ensureRunning(this);
+    }
  }

  @Override
@@ -688,7 +692,11 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
          // Util.copy(inputStream, new FileOutputStream(outputFile));
          // msg.setFile(outputFile, "image/jpeg");

-          msg.setText(getString(R.string.update_2_46ac, "https://arcanechat.me/#contribute", "https://i.delta.chat/#0A45953086F0C166D3BAF1D4BB2025496E4C2704&x=MVPi07rQBEmHO4FRb3brpwDe&j=n8mkKqu42WAKKUCx1bQOVh23&s=AM1YCd_2hKuiSiTEb-2177On&a=arcanechat%40arcanechat.me&n=ArcaneChat&b=ArcaneChat+Channel"));
+          msg.setText(
+              getString(
+                  R.string.update_2_46ac,
+                  "https://arcanechat.me/#contribute",
+                  "https://i.delta.chat/#0A45953086F0C166D3BAF1D4BB2025496E4C2704&x=MVPi07rQBEmHO4FRb3brpwDe&j=n8mkKqu42WAKKUCx1bQOVh23&s=AM1YCd_2hKuiSiTEb-2177On&a=arcanechat%40arcanechat.me&n=ArcaneChat&b=ArcaneChat+Channel"));
        }
        dcContext.addDeviceMsg(deviceMsgLabel, msg);

@@ -56,7 +56,7 @@ public class ConversationListFragment extends BaseConversationListFragment
  public static final String ARCHIVE = "archive";
  public static final String RELOAD_LIST = "reload_list";

-  private static final String TAG = ConversationListFragment.class.getSimpleName();
+  private static final String TAG = "ConversationListFragment";

  private RecyclerView list;
  private View emptyState;
@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
@SuppressLint("StaticFieldLeak")
 public class CreateProfileActivity extends BaseActionBarActivity {

-  private static final String TAG = CreateProfileActivity.class.getSimpleName();
+  private static final String TAG = "CreateProfileActivity";

  private static final int REQUEST_CODE_AVATAR = 1;

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public class EphemeralMessagesDialog {

-  private static final String TAG = EphemeralMessagesDialog.class.getSimpleName();
+  private static final String TAG = "EphemeralMessagesDialog";

  public static void show(
      final Context context,
@@ -46,7 +46,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
    implements ItemClickListener {

-  private static final String TAG = GroupCreateActivity.class.getSimpleName();
+  private static final String TAG = "GroupCreateActivity";
  public static final String EDIT_GROUP_CHAT_ID = "edit_group_chat_id";
  public static final String CREATE_BROADCAST = "create_broadcast";
  public static final String UNENCRYPTED = "unencrypted";
@@ -307,8 +307,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity

  private boolean showGroupNameEmptyToast(String groupName) {
    if (groupName == null) {
-      Toast.makeText(this, getString(R.string.group_please_enter_group_name), Toast.LENGTH_LONG)
-          .show();
+      Toast.makeText(this, getString(R.string.please_enter_chat_name), Toast.LENGTH_LONG).show();
      return true;
    }
    return false;
@@ -65,7 +65,7 @@ import org.thoughtcrime.securesms.util.views.ProgressDialog;
 public class InstantOnboardingActivity extends BaseActionBarActivity
    implements DcEventCenter.DcEventDelegate {

-  private static final String TAG = InstantOnboardingActivity.class.getSimpleName();
+  private static final String TAG = "InstantOnboardingActivity";
  private static final String DCACCOUNT = "dcaccount";
  private static final String DCLOGIN = "dclogin";
  private static final String INSTANCES_URL = "https://chatmail.at/relays";
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.util.FileProviderUtil;

 public class LogViewActivity extends BaseActionBarActivity {

-  private static final String TAG = LogViewActivity.class.getSimpleName();
+  private static final String TAG = "LogViewActivity";

  LogViewFragment logViewFragment;

@@ -33,14 +33,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
 import com.b44t.messenger.DcChat;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcMediaGalleryElement;
@@ -69,7 +68,7 @@ import org.thoughtcrime.securesms.util.Util;
 public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    implements RecipientModifiedListener, LoaderManager.LoaderCallbacks<DcMediaGalleryElement> {

-  private static final String TAG = MediaPreviewActivity.class.getSimpleName();
+  private static final String TAG = "MediaPreviewActivity";

  public static final String ACTIVITY_TITLE_EXTRA = "activity_title";
  public static final String EDIT_AVATAR_CHAT_ID = "avatar_for_chat_id";
@@ -88,7 +87,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  @Nullable private DcMsg messageRecord;
  private DcContext dcContext;
  private MediaItem initialMedia;
-  private ViewPager mediaPager;
+  private ViewPager2 mediaPager;
  private Recipient conversationRecipient;
  private boolean leftIsRecent;

@@ -190,7 +189,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  private void initializeViews() {
    mediaPager = findViewById(R.id.media_pager);
    mediaPager.setOffscreenPageLimit(1);
-    mediaPager.addOnPageChangeListener(new ViewPagerListener());
+    mediaPager.registerOnPageChangeCallback(new ViewPagerListener());
  }

  private void initializeResources() {
@@ -261,7 +260,6 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
  private int cleanupMedia() {
    int restartItem = mediaPager.getCurrentItem();

-    mediaPager.removeAllViews();
    mediaPager.setAdapter(null);

    return restartItem;
@@ -483,11 +481,11 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
      @SuppressWarnings("ConstantConditions")
      DcMediaPagerAdapter adapter =
          new DcMediaPagerAdapter(this, GlideApp.with(this), getWindow(), data, leftIsRecent);
-      mediaPager.setAdapter(adapter);
      adapter.setActive(true);
+      mediaPager.setAdapter(adapter);

-      if (restartItem < 0) mediaPager.setCurrentItem(data.getPosition());
-      else mediaPager.setCurrentItem(restartItem);
+      if (restartItem < 0) mediaPager.setCurrentItem(data.getPosition(), false);
+      else mediaPager.setCurrentItem(restartItem, false);
    }
  }

@@ -526,7 +524,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    }
  }

-  private static class SingleItemPagerAdapter extends PagerAdapter implements MediaItemAdapter {
+  private static class SingleItemPagerAdapter extends RecyclerView.Adapter<SingleItemPagerAdapter.MediaViewHolder> implements MediaItemAdapter {

    private final GlideRequests glideRequests;
    private final Window window;
@@ -555,37 +553,29 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    }

    @Override
-    public int getCount() {
+    public int getItemCount() {
      return 1;
    }

+    @NonNull
    @Override
-    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-      return view == object;
+    public MediaViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+      return new MediaViewHolder(inflater.inflate(R.layout.media_view_page, parent, false));
    }

    @Override
-    public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      View itemView = inflater.inflate(R.layout.media_view_page, container, false);
-      MediaView mediaView = itemView.findViewById(R.id.media_view);
-
+    public void onBindViewHolder(@NonNull MediaViewHolder holder, int position) {
      try {
-        mediaView.set(glideRequests, window, uri, name, mediaType, size, true);
+        holder.mediaView.set(glideRequests, window, uri, name, mediaType, size, true);
      } catch (IOException e) {
        Log.w(TAG, e);
      }
-
-      container.addView(itemView);
-
-      return itemView;
    }

    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      MediaView mediaView = ((FrameLayout) object).findViewById(R.id.media_view);
-      mediaView.cleanup();
-
-      container.removeView((FrameLayout) object);
+    public void onViewRecycled(@NonNull MediaViewHolder holder) {
+      super.onViewRecycled(holder);
+      holder.mediaView.cleanup();
    }

    @Override
@@ -595,9 +585,18 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

    @Override
    public void pause(int position) {}
+
+    static class MediaViewHolder extends RecyclerView.ViewHolder {
+      final MediaView mediaView;
+
+      MediaViewHolder(@NonNull View itemView) {
+        super(itemView);
+        mediaView = itemView.findViewById(R.id.media_view);
+      }
+    }
  }

-  private static class DcMediaPagerAdapter extends PagerAdapter implements MediaItemAdapter {
+  private static class DcMediaPagerAdapter extends RecyclerView.Adapter<DcMediaPagerAdapter.MediaViewHolder> implements MediaItemAdapter {

    private final WeakHashMap<Integer, MediaView> mediaViews = new WeakHashMap<>();

@@ -630,21 +629,21 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
    }

    @Override
-    public int getCount() {
+    public int getItemCount() {
      if (!active) return 0;
      else return gallery.getCount();
    }

+    @NonNull
    @Override
-    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-      return view == object;
+    public MediaViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+      View itemView =
+          LayoutInflater.from(context).inflate(R.layout.media_view_page, parent, false);
+      return new MediaViewHolder(itemView);
    }

    @Override
-    public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      View itemView =
-          LayoutInflater.from(context).inflate(R.layout.media_view_page, container, false);
-      MediaView mediaView = itemView.findViewById(R.id.media_view);
+    public void onBindViewHolder(@NonNull MediaViewHolder holder, int position) {
      boolean autoplay = position == autoPlayPosition;
      int cursorPosition = getCursorPosition(position);

@@ -656,7 +655,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity

      try {
        //noinspection ConstantConditions
-        mediaView.set(
+        holder.mediaView.set(
            glideRequests,
            window,
            Uri.fromFile(msg.getFileAsFile()),
@@ -668,19 +667,17 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
        Log.w(TAG, e);
      }

-      mediaViews.put(position, mediaView);
-      container.addView(itemView);
-
-      return itemView;
+      mediaViews.put(position, holder.mediaView);
    }

    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      MediaView mediaView = ((FrameLayout) object).findViewById(R.id.media_view);
-      mediaView.cleanup();
-
-      mediaViews.remove(position);
-      container.removeView((FrameLayout) object);
+    public void onViewRecycled(@NonNull MediaViewHolder holder) {
+      super.onViewRecycled(holder);
+      int pos = holder.getBindingAdapterPosition();
+      if (pos != RecyclerView.NO_POSITION) {
+        mediaViews.remove(pos);
+      }
+      holder.mediaView.cleanup();
    }

    public MediaItem getMediaItemFor(int position) {
@@ -710,6 +707,15 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
      if (leftIsRecent) return position;
      else return gallery.getCount() - 1 - position;
    }
+
+    static class MediaViewHolder extends RecyclerView.ViewHolder {
+      final MediaView mediaView;
+
+      MediaViewHolder(@NonNull View itemView) {
+        super(itemView);
+        mediaView = itemView.findViewById(R.id.media_view);
+      }
+    }
  }

  private static class MediaItem {
@@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.qr.QrCodeHandler;
 */
 public class NewConversationActivity extends ContactSelectionActivity {

-  private static final String TAG = NewConversationActivity.class.getSimpleName();
+  private static final String TAG = "NewConversationActivity";

  @Override
  public void onCreate(Bundle bundle, boolean ready) {
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.service.GenericForegroundService;

 public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity {
-  private static final String TAG = PassphraseRequiredActionBarActivity.class.getSimpleName();
+  private static final String TAG = "PassphraseRequiredActionBarActivity";

  @Override
  protected final void onCreate(Bundle savedInstanceState) {
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.Util;

 public class ProfileAdapter extends RecyclerView.Adapter {
-  private static final String TAG = ProfileAdapter.class.getSimpleName();
+  private static final String TAG = "ProfileAdapter";

  public static final int ITEM_AVATAR = 10;
  public static final int ITEM_DIVIDER = 20;
@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 public class ProfileFragment extends Fragment
    implements ProfileAdapter.ItemClickListener, DcEventCenter.DcEventDelegate {

-  private static final String TAG = ProfileFragment.class.getSimpleName();
+  private static final String TAG = "ProfileFragment";
  public static final String CHAT_ID_EXTRA = "chat_id";
  public static final String CONTACT_ID_EXTRA = "contact_id";

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.providers.PersistentBlobProvider;

 public class ResolveMediaTask extends AsyncTask<Uri, Void, Uri> {

-  private static final String TAG = ResolveMediaTask.class.getSimpleName();
+  private static final String TAG = "ResolveMediaTask";

  interface OnMediaResolvedListener {
    void onMediaResolved(Uri uri);
@@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.util.ShareUtil;
 */
 public class ShareActivity extends PassphraseRequiredActionBarActivity
    implements ResolveMediaTask.OnMediaResolvedListener {
-  private static final String TAG = ShareActivity.class.getSimpleName();
+  private static final String TAG = "ShareActivity";

  public static final String EXTRA_ACC_ID = "acc_id";
  public static final String EXTRA_CHAT_ID = "chat_id";
@@ -18,22 +18,19 @@ public class ShareLocationDialog {
          switch (which) {
            default:
            case 0:
-              shareLocationUnit = 5 * 60;
-              break;
-            case 1:
              shareLocationUnit = 30 * 60;
              break;
-            case 2:
+            case 1:
              shareLocationUnit = 60 * 60;
              break;
-            case 3:
+            case 2:
              shareLocationUnit = 2 * 60 * 60;
              break;
-            case 4:
+            case 3:
              shareLocationUnit = 6 * 60 * 60;
              break;
-            case 5:
-              shareLocationUnit = 12 * 60 * 60;
+            case 4:
+              shareLocationUnit = 24 * 60 * 60;
              break;
          }

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public class WebViewActivity extends PassphraseRequiredActionBarActivity
    implements SearchView.OnQueryTextListener, WebView.FindListener {
-  private static final String TAG = WebViewActivity.class.getSimpleName();
+  private static final String TAG = "WebViewActivity";
  // Regex to extract the host from a URL for IDN conversion.
  private static final Pattern URL_PATTERN =
      Pattern.compile("^((?:[a-zA-Z0-9]+://)?)([^/?#]+)(.*)$");
@@ -59,7 +59,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;

 public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = WebxdcActivity.class.getSimpleName();
+  private static final String TAG = "WebxdcActivity";
  private static final String EXTRA_ACCOUNT_ID = "accountId";
  private static final String EXTRA_APP_MSG_ID = "appMessageId";
  private static final String EXTRA_HIDE_ACTION_BAR = "hideActionBar";
@@ -240,6 +240,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE

    WebSettings webSettings = webView.getSettings();
    webSettings.setJavaScriptEnabled(true);
+    webSettings.setMediaPlaybackRequiresUserGesture(false);
    webSettings.setAllowFileAccess(false);
    webSettings.setBlockNetworkLoads(!internetAccess);
    webSettings.setAllowContentAccess(false);
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

 public class WebxdcStoreActivity extends PassphraseRequiredActionBarActivity {
-  private static final String TAG = WebxdcStoreActivity.class.getSimpleName();
+  private static final String TAG = "WebxdcStoreActivity";

  private DcContext dcContext;
  private Rpc rpc;
@@ -48,7 +48,7 @@ public class WelcomeActivity extends BaseActionBarActivity
    implements DcEventCenter.DcEventDelegate {
  public static final String BACKUP_QR_EXTRA = "backup_qr_extra";
  public static final int PICK_BACKUP = 20574;
-  private static final String TAG = WelcomeActivity.class.getSimpleName();
+  private static final String TAG = "WelcomeActivity";
  public static final String TMP_BACKUP_FILE = "tmp-backup-file";

  private ProgressDialog progressDialog = null;
@@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;

 public class AccountSelectionListFragment extends DialogFragment
    implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = AccountSelectionListFragment.class.getSimpleName();
+  private static final String TAG = "AccountSelectionListFragment";
  private static final String ARG_SELECT_ONLY = "select_only";
  private RecyclerView recyclerView;
  private AccountSelectionListAdapter adapter;
@@ -157,6 +157,12 @@ public class AccountSelectionListFragment extends DialogFragment
      onSetTag(accountId);
    } else if (itemId == R.id.menu_move_to_top) {
      onMoveToTop(accountId);
+    } else if (itemId == R.id.menu_mark_all_as_read) {
+      try {
+        DcHelper.getRpc(requireActivity()).marknoticedAllChats(accountId);
+      } catch (RpcException e) {
+        Log.e(TAG, "Error calling rpc.marknoticedAllChats()", e);
+      }
    }
  }

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.Prefs;

 public class AudioCodec {

-  private static final String TAG = AudioCodec.class.getSimpleName();
+  private static final String TAG = "AudioCodec";

  private static final int SAMPLE_RATE_BALANCED = 44100;
  private static final int BIT_RATE_BALANCED = 32000;
@@ -196,7 +196,7 @@ public class AudioCodec {
                setFinished();
              }
            },
-            AudioCodec.class.getSimpleName())
+            "AudioCodec")
        .start();
  }

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class AudioRecorder {

-  private static final String TAG = AudioRecorder.class.getSimpleName();
+  private static final String TAG = "AudioRecorder";

  private static final ExecutorService executor = ThreadUtil.newDynamicSingleThreadedExecutor();

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.R;
 /** Bottom sheet dialog for selecting audio output device */
@RequiresApi(Build.VERSION_CODES.O)
 public class AudioDevicePickerDialog extends BottomSheetDialog {
-  private static final String TAG = AudioDevicePickerDialog.class.getSimpleName();
+  private static final String TAG = "AudioDevicePickerDialog";

  public interface OnDeviceSelectedListener {
    void onDeviceSelected(CallEndpointCompat endpoint);
@@ -51,7 +51,7 @@ import org.webrtc.VideoTrack;
@RequiresApi(api = Build.VERSION_CODES.O)
 public class CallActivity extends AppCompatActivity {

-  private static final String TAG = CallActivity.class.getSimpleName();
+  private static final String TAG = "CallActivity";
  private static final int MIC_PERMISSION_REQUEST_CODE = 1001;
  private static final int CAMERA_PERMISSION_REQUEST_CODE = 1002;

@@ -63,7 +63,7 @@ import org.webrtc.VideoTrack;

@RequiresApi(api = Build.VERSION_CODES.O)
 public class CallCoordinator implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = CallCoordinator.class.getSimpleName();
+  private static final String TAG = "CallCoordinator";

  // Notification channels
  private static final String CHANNEL_ID_INCOMING = "voip_incoming_calls";
@@ -215,7 +215,8 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
                  calleeName = "Unknown";
                }

-                showOrUpdateOngoingNotification("Calling " + calleeName + "...");
+                showOrUpdateOngoingNotification(
+                    appContext.getString(R.string.calling_person, calleeName));
              }

              // Initialize call
@@ -402,6 +403,15 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
      callService.stopRingtone();
    }

+    // Promote the service to foreground immediately. Waiting until onIncomingCallAccepted
+    // on executor pool thread is too late on stricter OEM.
+    //
+    // Do not cancel() but use showOrUpdateOngoingNotification to replace incoming
+    // notification without a gap.
+    String callerName = displayName.getValue();
+    if (callerName == null) callerName = "Unknown";
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, callerName));
+
    // Notify Android system with CallControlScope
    CallControlScope scope = activeCallControlScope;
    if (scope != null) {
@@ -425,8 +435,6 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
            }
          });
    }
-
-    notificationManager.cancel(NOTIFICATION_ID_CALL);
  }

  public void answerWebRTC() {
@@ -921,7 +929,7 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
      callerName = "Unknown";
    }

-    showOrUpdateOngoingNotification("Call with " + callerName);
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, callerName));
  }

  private synchronized void onCallAnsweredOnOtherDevice() {
@@ -1008,7 +1016,7 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
    if (calleeName == null) {
      calleeName = "Unknown";
    }
-    showOrUpdateOngoingNotification("Call with " + calleeName);
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, calleeName));
  }

  private synchronized void onCallEnded(int accId, int callId) {
@@ -1101,6 +1109,14 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
      return;
    }

+    if (callService != null) {
+      try {
+        callService.stopForegroundAndDismiss();
+      } catch (Exception e) {
+        Log.w(TAG, "stopForegroundAndDismiss failed", e);
+      }
+    }
+
    // Clear state
    this.activeAccId = null;
    this.activeCallId = null;
@@ -4,6 +4,7 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.media.AudioAttributes;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
@@ -13,7 +14,9 @@ import android.media.ToneGenerator;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -33,7 +36,7 @@ import org.webrtc.VideoTrack;
@RequiresApi(api = Build.VERSION_CODES.O)
 public class CallService extends Service implements WebRTCClient.Callbacks {

-  private static final String TAG = CallService.class.getSimpleName();
+  private static final String TAG = "CallService";

  private final IBinder binder = new LocalBinder();

@@ -432,6 +435,12 @@ public class CallService extends Service implements WebRTCClient.Callbacks {

    disposeWebRTC();

+    try {
+      stopForeground(STOP_FOREGROUND_REMOVE);
+    } catch (Exception e) {
+      Log.w(TAG, "stopForeground failed", e);
+    }
+
    stopService();
  }

@@ -494,13 +503,44 @@ public class CallService extends Service implements WebRTCClient.Callbacks {
  // Foreground Notification

  public void startForegroundWithNotification(int id, Notification notification) {
-    Log.d(TAG, "Starting foreground with notification id: " + id);
-    startForeground(id, notification);
+    // Always run on main thread
+    if (Looper.myLooper() != Looper.getMainLooper()) {
+      new Handler(Looper.getMainLooper())
+          .post(() -> startForegroundWithNotification(id, notification));
+      return;
+    }
+
+    Log.d(TAG, "Starting call FGS with notification id: " + id);
+    try {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        startForeground(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL);
+      } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        int types =
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
+                | ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA;
+        startForeground(id, notification, types);
+      } else {
+        startForeground(id, notification);
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "startForeground failed", e);
+      if (callCoordinator != null) {
+        callCoordinator.reportError("Failed to activate call FGS: " + e.getMessage());
+      }
+    }
  }

  public void stopForegroundAndDismiss() {
-    Log.d(TAG, "Stopping foreground and dismissing notification");
-    stopForeground(STOP_FOREGROUND_REMOVE);
+    if (Looper.myLooper() != Looper.getMainLooper()) {
+      new Handler(Looper.getMainLooper()).post(this::stopForegroundAndDismiss);
+      return;
+    }
+    Log.d(TAG, "Stopping call FGS and dismissing notification");
+    try {
+      stopForeground(STOP_FOREGROUND_REMOVE);
+    } catch (Exception e) {
+      Log.w(TAG, "stopForeground failed", e);
+    }
  }

  // Cleanup
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;

 public class CallUtil {
-  private static final String TAG = CallUtil.class.getSimpleName();
+  private static final String TAG = "CallUtil";

  @RequiresApi(api = Build.VERSION_CODES.O)
  public static void startAudioCall(Context context, int chatId) {
@@ -20,7 +20,7 @@ import org.webrtc.VideoTrack;
@RequiresApi(api = Build.VERSION_CODES.O)
 public class CallViewModel extends AndroidViewModel {

-  private static final String TAG = CallViewModel.class.getSimpleName();
+  private static final String TAG = "CallViewModel";

  private final CallCoordinator callCoordinator;

@@ -24,7 +24,7 @@ import org.webrtc.VideoTrack;

 public class MediaStreamManager {

-  private static final String TAG = MediaStreamManager.class.getSimpleName();
+  private static final String TAG = "MediaStreamManager";
  private static final String STREAM_ID = "local_stream";
  private static final String AUDIO_TRACK_ID = "audio_track";
  private static final String VIDEO_TRACK_ID = "video_track";
@@ -26,6 +26,7 @@ import androidx.loader.app.LoaderManager;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ViewUtil;

 public class AttachmentTypeSelector extends PopupWindow {
@@ -45,7 +46,7 @@ public class AttachmentTypeSelector extends PopupWindow {
  private final @NonNull ImageView imageButton;
  private final @NonNull ImageView documentButton;
  private final @NonNull ImageView contactButton;
-  // private final @NonNull ImageView           cameraButton;
+  // private final @NonNull ImageView cameraButton;
  private final @NonNull ImageView videoButton;
  private final @NonNull ImageView locationButton;
  private final @NonNull ImageView webxdcButton;
@@ -87,11 +88,13 @@ public class AttachmentTypeSelector extends PopupWindow {
    this.webxdcButton.setOnClickListener(new PropagatingClickListener(ADD_WEBXDC));
    this.recentRail.setListener(new RecentPhotoSelectedListener());

-    // disable location streaming button for now
-    // if (!Prefs.isLocationStreamingEnabled(context)) {
-    this.locationButton.setVisibility(View.GONE);
-    ViewUtil.findById(layout, R.id.location_button_label).setVisibility(View.GONE);
-    // }
+    if (!Prefs.isLocationStreamingEnabled(context)) {
+      ViewUtil.findById(layout, R.id.location_linear_layout).setVisibility(View.GONE);
+    }
+
+    if (DcHelper.getContext(context).getChat(chatId).isOutBroadcast()) {
+      ViewUtil.findById(layout, R.id.webxdc_linear_layout).setVisibility(View.GONE);
+    }

    setLocationButtonImage(context);

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.DateUtils;

 public class CallItemView extends FrameLayout {
-  private static final String TAG = CallItemView.class.getSimpleName();
+  private static final String TAG = "CallItemView";

  private final @NonNull ImageView icon;
  private final @NonNull TextView title;
@@ -1,31 +0,0 @@
-package org.thoughtcrime.securesms.components;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.ViewPager;
-import org.thoughtcrime.securesms.components.viewpager.HackyViewPager;
-
-/** An implementation of {@link ViewPager} that disables swiping when the view is disabled. */
-public class ControllableViewPager extends HackyViewPager {
-
-  public ControllableViewPager(@NonNull Context context) {
-    super(context);
-  }
-
-  public ControllableViewPager(@NonNull Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  @Override
-  public boolean onTouchEvent(MotionEvent ev) {
-    return isEnabled() && super.onTouchEvent(ev);
-  }
-
-  @Override
-  public boolean onInterceptTouchEvent(MotionEvent ev) {
-    return isEnabled() && super.onInterceptTouchEvent(ev);
-  }
-}
@@ -43,7 +43,7 @@ public class InputPanel extends ConstraintLayout
        KeyboardAwareLinearLayout.OnKeyboardShownListener,
        MediaKeyboard.MediaKeyboardListener {

-  private static final String TAG = InputPanel.class.getSimpleName();
+  private static final String TAG = "InputPanel";

  private static final int FADE_TIME = 150;

@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 * been opened and what its height would be.
 */
 public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
-  private static final String TAG = KeyboardAwareLinearLayout.class.getSimpleName();
+  private static final String TAG = "KeyboardAwareLinearLayout";

  private static final long KEYBOARD_DEBOUNCE = 150;

@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class QuoteView extends FrameLayout implements RecipientForeverObserver {

-  private static final String TAG = QuoteView.class.getSimpleName();
+  private static final String TAG = "QuoteView";

  private static final int MESSAGE_TYPE_PREVIEW = 0;

@@ -30,7 +30,7 @@ public class ScaleStableImageView extends AppCompatImageView
    implements KeyboardAwareLinearLayout.OnKeyboardShownListener,
        KeyboardAwareLinearLayout.OnKeyboardHiddenListener {

-  private static final String TAG = ScaleStableImageView.class.getSimpleName();
+  private static final String TAG = "ScaleStableImageView";

  private Drawable defaultDrawable;
  private Drawable currentDrawable;
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.animation.AnimationCompleteListener;

 public class SearchToolbar extends LinearLayout {

-  private static final String TAG = SearchToolbar.class.getSimpleName();
+  private static final String TAG = "SearchToolbar";
  private float x, y;
  private MenuItem searchItem;
  private EditText searchText;
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class ThumbnailView extends FrameLayout {

-  private static final String TAG = ThumbnailView.class.getSimpleName();
+  private static final String TAG = "ThumbnailView";
  private static final int WIDTH = 0;
  private static final int HEIGHT = 1;
  private static final int MIN_WIDTH = 0;
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.mms.VcardSlide;
 import org.thoughtcrime.securesms.recipients.Recipient;

 public class VcardView extends FrameLayout {
-  private static final String TAG = VcardView.class.getSimpleName();
+  private static final String TAG = "VcardView";

  private final @NonNull AvatarView avatar;
  private final @NonNull TextView name;
@@ -6,22 +6,26 @@ import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 import androidx.media3.common.MediaItem;
+import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
 import androidx.media3.session.MediaController;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

 public class AudioPlaybackViewModel extends ViewModel {
-  private static final String TAG = AudioPlaybackViewModel.class.getSimpleName();
+  private static final String TAG = "AudioPlaybackViewModel";

  private static final int NON_MESSAGE_AUDIO_MSG_ID =
      0; // Audios not attached to a message doesn't have message id.
@@ -34,6 +38,8 @@ public class AudioPlaybackViewModel extends ViewModel {
  private final ExecutorService extractionExecutor = Executors.newFixedThreadPool(2);

  private @Nullable MediaController mediaController;
+  private @Nullable ChatAudioQueueProvider queueProvider;
+  private @Nullable Player.Listener playerListener;
  private final Handler handler;
  private boolean isUserSeeking = false;

@@ -47,6 +53,11 @@ public class AudioPlaybackViewModel extends ViewModel {
  }

  public void setMediaController(@Nullable MediaController controller) {
+    if (this.mediaController != null && playerListener != null) {
+      this.mediaController.removeListener(playerListener);
+    }
+    playerListener = null;
+
    this.mediaController = controller;
    if (mediaController != null && mediaController.isPlaying()) {
      startUpdateProgress();
@@ -59,30 +70,41 @@ public class AudioPlaybackViewModel extends ViewModel {
  public void loadAudioAndPlay(int msgId, Uri audioUri) {
    if (mediaController == null) return;

-    // Set media item if we have a different audio.
-    if (isDifferentAudio(msgId, audioUri)) {
-      updateState(msgId, audioUri, AudioPlaybackState.PlaybackStatus.LOADING, 0, 0);
+    String mediaId = String.valueOf(msgId);

-      MediaItem mediaItem =
-          new MediaItem.Builder().setMediaId(String.valueOf(msgId)).setUri(audioUri).build();
-      mediaController.setMediaItem(mediaItem);
-      mediaController.prepare();
+    MediaItem current = mediaController.getCurrentMediaItem();
+    if (current != null && mediaId.equals(current.mediaId)) {
+      mediaController.play();
+      return;
    }

-    play(msgId, audioUri);
+    updateState(msgId, audioUri, AudioPlaybackState.PlaybackStatus.LOADING, 0, 0);
+
+    List<MediaItem> items = null;
+    int startIndex = -1;
+
+    if (queueProvider != null) {
+      items = queueProvider.buildAudioQueue();
+      startIndex = indexOfMediaId(items, mediaId);
+    }
+
+    if (startIndex < 0) {
+      items =
+          Collections.singletonList(
+              new MediaItem.Builder().setMediaId(mediaId).setUri(audioUri).build());
+      startIndex = 0;
+    }
+
+    mediaController.setMediaItems(items, startIndex, 0);
+    mediaController.prepare();
+    mediaController.play();
  }

-  private boolean isSameAudio(int msgId, Uri audioUri) {
-    return !isDifferentAudio(msgId, audioUri);
-  }
-
-  private boolean isDifferentAudio(int msgId, Uri audioUri) {
-    AudioPlaybackState currentState = playbackState.getValue();
-
-    return currentState != null
-        && (msgId != currentState.getMsgId()
-            || currentState.getAudioUri() == null
-            || currentState.getAudioUri() != null && !currentState.getAudioUri().equals(audioUri));
+  private static int indexOfMediaId(List<MediaItem> items, String mediaId) {
+    for (int i = 0; i < items.size(); i++) {
+      if (mediaId.equals(items.get(i).mediaId)) return i;
+    }
+    return -1;
  }

  public LiveData<Map<Integer, Long>> getDurations() {
@@ -138,46 +160,72 @@ public class AudioPlaybackViewModel extends ViewModel {
    }
  }

-  public void pause(int msgId, Uri audioUri) {
-    if (mediaController != null && isSameAudio(msgId, audioUri)) {
+  public void pause(int msgId) {
+    if (isCurrentItem(msgId)) {
      mediaController.pause();
    }
  }

-  public void play(int msgId, Uri audioUri) {
-    if (mediaController != null && isSameAudio(msgId, audioUri)) {
+  public void play(int msgId) {
+    if (isCurrentItem(msgId)) {
      mediaController.play();
    }
  }

-  public void seekTo(long position, int msgId, Uri audioUri) {
-    if (mediaController != null && isSameAudio(msgId, audioUri)) {
+  public void seekTo(long position, int msgId) {
+    if (isCurrentItem(msgId)) {
      mediaController.seekTo(position);
    }
  }

-  public void stop(int msgId, Uri audioUri) {
-    if (mediaController != null && isSameAudio(msgId, audioUri)) {
+  public void stop(int msgId) {
+    if (isCurrentItem(msgId)) {
      mediaController.stop();
+      mediaController.clearMediaItems();
      stopUpdateProgress();
      playbackState.setValue(AudioPlaybackState.idle());
    }
  }

+  private boolean isCurrentItem(int msgId) {
+    if (mediaController == null) return false;
+    MediaItem current = mediaController.getCurrentMediaItem();
+    return current != null && String.valueOf(msgId).equals(current.mediaId);
+  }
+
  public void stopNonMessageAudioPlayback() {
    stopByIds(NON_MESSAGE_AUDIO_MSG_ID);
  }

  // A special method for deleting message, where we only use message Ids
  public void stopByIds(int... msgIds) {
-    AudioPlaybackState currentState = playbackState.getValue();
+    if (mediaController == null) return;

-    if (mediaController != null && currentState != null) {
+    AudioPlaybackState currentState = playbackState.getValue();
+    boolean stoppedCurrent = false;
+
+    if (currentState != null) {
      for (int msgId : msgIds) {
        if (msgId == currentState.getMsgId()) {
          mediaController.stop();
+          mediaController.clearMediaItems();
          stopUpdateProgress();
          playbackState.setValue(AudioPlaybackState.idle());
+          stoppedCurrent = true;
+          break;
+        }
+      }
+    }
+
+    if (!stoppedCurrent) {
+      Set<String> deletedMediaIds = new HashSet<>();
+      for (int msgId : msgIds) {
+        deletedMediaIds.add(String.valueOf(msgId));
+      }
+      for (int i = mediaController.getMediaItemCount() - 1; i >= 0; i--) {
+        MediaItem item = mediaController.getMediaItemAt(i);
+        if (deletedMediaIds.contains(item.mediaId)) {
+          mediaController.removeMediaItem(i);
        }
      }
    }
@@ -191,10 +239,10 @@ public class AudioPlaybackViewModel extends ViewModel {
  private void setupPlayerListener() {
    if (mediaController == null) return;

-    mediaController.addListener(
+    playerListener =
        new Player.Listener() {
          @Override
-          public void onEvents(Player player, Player.Events events) {
+          public void onEvents(@NonNull Player player, @NonNull Player.Events events) {
            if (events.containsAny(Player.EVENT_IS_PLAYING_CHANGED)) {
              if (player.isPlaying()) {
                startUpdateProgress();
@@ -203,20 +251,40 @@ public class AudioPlaybackViewModel extends ViewModel {
              }
              updateCurrentState(false);
            }
+            if (events.containsAny(Player.EVENT_MEDIA_ITEM_TRANSITION)) {
+              updateCurrentState(true);
+            }
            if (events.containsAny(Player.EVENT_PLAYBACK_STATE_CHANGED)) {
              if (player.getPlaybackState() == Player.STATE_READY) {
                updateCurrentState(false);
-              } else if (player.getPlaybackState() == Player.STATE_ENDED) {
-                // This is to prevent automatically playing after the audio
-                // has been play to the end once, then user dragged the seek bar again
+              } else if (player.getPlaybackState() == Player.STATE_ENDED
+                  && !player.hasNextMediaItem()) {
                mediaController.setPlayWhenReady(false);
              }
            }
-            if (events.containsAny(Player.EVENT_PLAYER_ERROR)) {
+          }
+
+          @Override
+          public void onPlayerError(@NonNull PlaybackException error) {
+            Log.w(
+                TAG,
+                "Playback error on msgId="
+                    + (mediaController.getCurrentMediaItem() != null
+                        ? mediaController.getCurrentMediaItem().mediaId
+                        : "null"),
+                error);
+
+            if (mediaController.hasNextMediaItem()) {
+              mediaController.seekToNextMediaItem();
+              mediaController.prepare();
+              mediaController.play();
+            } else {
              updateCurrentAudioState(AudioPlaybackState.PlaybackStatus.ERROR, 0, 0);
+              mediaController.clearMediaItems();
            }
          }
-        });
+        };
+    mediaController.addListener(playerListener);
  }

  private void updateCurrentState(boolean queryPlaying) {
@@ -285,6 +353,11 @@ public class AudioPlaybackViewModel extends ViewModel {
    }
  }

+  // Playing Queue
+  public void setQueueProvider(@Nullable ChatAudioQueueProvider provider) {
+    this.queueProvider = provider;
+  }
+
  // Progress tracking
  private final Runnable progressRunnable =
      new Runnable() {
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.util.DateUtils;

 public class AudioView extends FrameLayout {

-  private static final String TAG = AudioView.class.getSimpleName();
+  private static final String TAG = "AudioView";

  private final @NonNull ImageView playPauseButton;
  private final AnimatedVectorDrawableCompat playToPauseDrawable;
@@ -109,12 +109,12 @@ public class AudioView extends FrameLayout {

          AudioPlaybackState state = viewModel.getPlaybackState().getValue();

-          if (state != null && msgId == state.getMsgId() && audioUri.equals(state.getAudioUri())) {
+          if (state != null && msgId == state.getMsgId()) {
            // Same audio
            if (state.getStatus() == AudioPlaybackState.PlaybackStatus.PLAYING) {
-              viewModel.pause(msgId, audioUri);
+              viewModel.pause(msgId);
            } else {
-              viewModel.play(msgId, audioUri);
+              viewModel.play(msgId);
            }
          } else {
            // Different audio
@@ -145,7 +145,7 @@ public class AudioView extends FrameLayout {
          @Override
          public void onStopTrackingTouch(SeekBar seekBar) {
            viewModel.setUserSeeking(false);
-            viewModel.seekTo(seekBar.getProgress(), msgId, audioUri);
+            viewModel.seekTo(seekBar.getProgress(), msgId);
          }
        });

@@ -305,7 +305,7 @@ public class AudioView extends FrameLayout {
    if (audioUri == null || state == null) return;

    // Check if this state is about this message
-    boolean isThisMessage = msgId == state.getMsgId() && audioUri.equals(state.getAudioUri());
+    boolean isThisMessage = msgId == state.getMsgId();

    if (isThisMessage) {
      updateUIForPlaybackState(state);
@@ -340,13 +340,9 @@ public class AudioView extends FrameLayout {
  private void onDurationsChanged(Map<Integer, Long> durations) {
    AudioPlaybackState state = viewModel.getPlaybackState().getValue();

-    // When there is no playback happening, msgId can be -1 and audioUri is null
-    if (state != null
-        && msgId >= 0
-        && msgId == state.getMsgId()
-        && audioUri != null
-        && audioUri.equals(state.getAudioUri())) {
-      return; // Is playing this message
+    // When there is no playback happening, msgId can be -1
+    if (state != null && msgId >= 0 && msgId == state.getMsgId()) {
+      return;
    }

    Long duration = durations.get(msgId);
@@ -0,0 +1,41 @@
+package org.thoughtcrime.securesms.components.audioplay;
+
+import android.content.Context;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.media3.common.MediaItem;
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcMsg;
+import java.util.ArrayList;
+import java.util.List;
+import org.thoughtcrime.securesms.connect.DcHelper;
+
+public class ChatAudioQueueProvider {
+
+  private final Context context;
+  private final int chatId;
+  private final int accountId;
+
+  public ChatAudioQueueProvider(@NonNull Context context, int chatId, int accountId) {
+    this.context = context.getApplicationContext();
+    this.chatId = chatId;
+    this.accountId = accountId;
+  }
+
+  @NonNull
+  public List<MediaItem> buildAudioQueue() {
+    DcContext dcContext = DcHelper.getContext(context);
+    int[] msgIds = dcContext.getChatMedia(chatId, DcMsg.DC_MSG_AUDIO, DcMsg.DC_MSG_VOICE, 0);
+
+    List<MediaItem> items = new ArrayList<>(msgIds.length);
+    for (int msgId : msgIds) {
+      String id = String.valueOf(msgId);
+      items.add(
+          new MediaItem.Builder()
+              .setMediaId(id)
+              .setUri(Uri.parse("dcmsg://" + accountId + "/" + id))
+              .build());
+    }
+    return items;
+  }
+}
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.util.ResUtil;
 public class MediaKeyboard extends LinearLayout
    implements InputView, Consumer<EmojiViewItem>, StickerPickerView.StickerPickerListener {

-  private static final String TAG = MediaKeyboard.class.getSimpleName();
+  private static final String TAG = "MediaKeyboard";

  @Nullable private MediaKeyboardListener keyboardListener;
  private EmojiPickerView emojiPicker;
@@ -71,7 +71,7 @@ public class StickerPickerView extends RecyclerView {
    }

    // Sort stickers just to provide consistent order
-    Collections.sort(stickerFiles, (f1, f2) -> f1.getName().compareToIgnoreCase(f2.getName()));
+    Collections.sort(stickerFiles, (f1, f2) -> f2.getName().compareToIgnoreCase(f1.getName()));

    return stickerFiles;
  }
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.util.Prefs;

@SuppressLint("BatteryLife")
 public class DozeReminder {
-  private static final String TAG = DozeReminder.class.getSimpleName();
+  private static final String TAG = "DozeReminder";

  public static boolean isEligible(Context context) {
    if (context == null) {
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components.viewpager;

-import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager2.widget.ViewPager2;

-public abstract class ExtendedOnPageChangedListener implements ViewPager.OnPageChangeListener {
+public abstract class ExtendedOnPageChangedListener extends ViewPager2.OnPageChangeCallback {

  private Integer currentPage = null;

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.components.viewpager;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import androidx.viewpager.widget.ViewPager;
-
-/**
- * Hacky fix for http://code.google.com/p/android/issues/detail?id=18990
- *
- * <p>ScaleGestureDetector seems to mess up the touch events, which means that ViewGroups which make
- * use of onInterceptTouchEvent throw a lot of IllegalArgumentException: pointerIndex out of range.
- *
- * <p>There's not much I can do in my code for now, but we can mask the result by just catching the
- * problem and ignoring it.
- *
- * @author Chris Banes
- */
-public class HackyViewPager extends ViewPager {
-
-  private static final String TAG = HackyViewPager.class.getSimpleName();
-
-  public HackyViewPager(Context context) {
-    super(context);
-  }
-
-  public HackyViewPager(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  @Override
-  public boolean onInterceptTouchEvent(MotionEvent ev) {
-    try {
-      return super.onInterceptTouchEvent(ev);
-    } catch (IllegalArgumentException e) {
-      Log.w(TAG, e);
-      return false;
-    }
-  }
-}
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.accounts.AccountSelectionListFragment;

 public class AccountManager {

-  private static final String TAG = AccountManager.class.getSimpleName();
+  private static final String TAG = "AccountManager";
  private static final String LAST_ACCOUNT_ID = "last_account_id";
  private static AccountManager self;

@@ -38,7 +38,7 @@ public class AccountManager {
    return self;
  }

-  public void migrateToDcAccounts(ApplicationContext context) {
+  public void migrateToDcAccounts(Context context, DcAccounts dcAccounts) {
    try {
      int selectAccountId = 0;

@@ -49,8 +49,7 @@ public class AccountManager {
          if (!file.isDirectory()
              && file.getName().startsWith("messenger")
              && file.getName().endsWith(".db")) {
-            int accountId =
-                ApplicationContext.getDcAccounts().migrateAccount(file.getAbsolutePath());
+            int accountId = dcAccounts.migrateAccount(file.getAbsolutePath());
            if (accountId != 0) {
              String selName =
                  PreferenceManager.getDefaultSharedPreferences(context)
@@ -67,7 +66,7 @@ public class AccountManager {
      }

      if (selectAccountId != 0) {
-        ApplicationContext.getDcAccounts().selectAccount(selectAccountId);
+        dcAccounts.selectAccount(selectAccountId);
      }
    } catch (Exception e) {
      Log.e(TAG, "Error in migrateToDcAccounts()", e);
@@ -5,7 +5,6 @@ import androidx.annotation.NonNull;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import org.thoughtcrime.securesms.util.AsyncLoader;
-import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;

 public class DcContactsLoader extends AsyncLoader<DcContactsLoader.Ret> {
@@ -53,10 +52,7 @@ public class DcContactsLoader extends AsyncLoader<DcContactsLoader.Ret> {
    }
    if (query == null && addCreateGroupLinks) {
      additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_GROUP);
-
-      final boolean broadcastsEnabled = Prefs.isNewBroadcastAvailable(getContext());
-      if (broadcastsEnabled)
-        additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST);
+      additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST);

      if (!dcContext.isChatmail()) {
        additional_items =
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.service.FetchForegroundService;
 import org.thoughtcrime.securesms.util.Util;

 public class DcEventCenter {
-  private static final String TAG = DcEventCenter.class.getSimpleName();
+  private static final String TAG = "DcEventCenter";
  private @NonNull final Hashtable<Integer, ArrayList<DcEventDelegate>> currentAccountObservers =
      new Hashtable<>();
  private @NonNull final Hashtable<Integer, ArrayList<DcEventDelegate>> multiAccountObservers =
@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class DcHelper {

-  private static final String TAG = DcHelper.class.getSimpleName();
+  private static final String TAG = "DcHelper";

  public static final String CONFIG_CONFIGURED_ADDRESS = "configured_addr";
  public static final String CONFIG_DISPLAY_NAME = "displayname";
@@ -225,6 +225,8 @@ public class DcHelper {
    dcContext.setStockTranslation(201, context.getString(R.string.qrshow_join_channel_hint));
    dcContext.setStockTranslation(202, context.getString(R.string.you_joined_the_channel));
    dcContext.setStockTranslation(203, context.getString(R.string.secure_join_channel_started));
+    dcContext.setStockTranslation(204, context.getString(R.string.channel_name_changed));
+    dcContext.setStockTranslation(205, context.getString(R.string.channel_image_changed));
    dcContext.setStockTranslation(210, context.getString(R.string.stats_msg_body));
    dcContext.setStockTranslation(220, context.getString(R.string.proxy_enabled));
    dcContext.setStockTranslation(221, context.getString(R.string.proxy_enabled_hint));
@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.util.Util;
 */
 public class DirectShareUtil {

-  private static final String TAG = DirectShareUtil.class.getSimpleName();
+  private static final String TAG = "DirectShareUtil";
  private static final String SHORTCUT_CATEGORY = "android.shortcut.conversation";

  public static void clearShortcut(@NonNull Context context, int chatId) {
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.connect;

-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -11,6 +10,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
 import android.util.Log;
+import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import org.thoughtcrime.securesms.ConversationListActivity;
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.util.Prefs;

 public class KeepAliveService extends Service {

-  private static final String TAG = KeepAliveService.class.getSimpleName();
+  private static final String TAG = "KeepAliveService";

  static KeepAliveService s_this = null;

@@ -119,7 +119,7 @@ public class KeepAliveService extends Service {

  private static boolean ch_created = false;

-  @TargetApi(Build.VERSION_CODES.O)
+  @RequiresApi(Build.VERSION_CODES.O)
  private static void createFgNotificationChannel(Context context) {
    if (!ch_created) {
      ch_created = true;
@@ -10,7 +10,7 @@ import android.util.Log;

 public class NetworkStateReceiver extends BroadcastReceiver {

-  private static final String TAG = NetworkStateReceiver.class.getSimpleName();
+  private static final String TAG = "NetworkStateReceiver";
  private int debugConnectedCount;

  @Override
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.thoughtcrime.securesms.ContactSelectionListFragment;
 import org.thoughtcrime.securesms.util.Hash;
 import org.thoughtcrime.securesms.util.Prefs;

@@ -37,7 +36,7 @@ import org.thoughtcrime.securesms.util.Prefs;
 * @author Moxie Marlinspike
 */
 public class ContactAccessor {
-  private static final String TAG = ContactSelectionListFragment.class.getSimpleName();
+  private static final String TAG = "ContactAccessor";

  private static final int CONTACT_CURSOR_NAME = 0;

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.AsyncLoader;

 public class PagingMediaLoader extends AsyncLoader<DcMediaGalleryElement> {

-  private static final String TAG = PagingMediaLoader.class.getSimpleName();
+  private static final String TAG = "PagingMediaLoader";

  private final DcMsg msg;
  private final boolean leftIsRecent;
@@ -0,0 +1,53 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import java.util.HashSet;
+import java.util.Set;
+
+public final class ActiveLocationChats {
+
+  private static final String PREFS_NAME = "location_streaming";
+  private static final String KEY_ACTIVE = "active_chat_ids";
+
+  private ActiveLocationChats() {}
+
+  private static SharedPreferences prefs(Context context) {
+    return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+  }
+
+  /**
+   * Add a chat. Uses commit() to guarantee the write reaches disk before the process can die to
+   * preserve the superset invariant.
+   */
+  static void add(Context context, int chatId) {
+    Set<String> current = new HashSet<>(getAll(context));
+    current.add(String.valueOf(chatId));
+    prefs(context).edit().putStringSet(KEY_ACTIVE, current).commit();
+  }
+
+  public static void remove(Context context, int chatId) {
+    Set<String> current = new HashSet<>(getAll(context));
+    current.remove(String.valueOf(chatId));
+    prefs(context).edit().putStringSet(KEY_ACTIVE, current).apply();
+  }
+
+  static void clear(Context context) {
+    prefs(context).edit().remove(KEY_ACTIVE).apply();
+  }
+
+  static Set<Integer> getAllIds(Context context) {
+    Set<Integer> ids = new HashSet<>();
+    for (String s : getAll(context)) {
+      try {
+        ids.add(Integer.parseInt(s));
+      } catch (NumberFormatException ignored) {
+      }
+    }
+    return ids;
+  }
+
+  private static Set<String> getAll(Context context) {
+    return prefs(context).getStringSet(KEY_ACTIVE, new HashSet<>());
+  }
+}
@@ -1,128 +0,0 @@
-package org.thoughtcrime.securesms.geolocation;
-
-import android.location.Location;
-import android.util.Log;
-import java.util.Observable;
-
-public class DcLocation extends Observable {
-  private static final String TAG = DcLocation.class.getSimpleName();
-  private Location lastLocation;
-  private static DcLocation instance;
-  private static final int TIMEOUT = 1000 * 15;
-  private static final int EARTH_RADIUS = 6371;
-
-  private DcLocation() {
-    lastLocation = getDefault();
-  }
-
-  public static DcLocation getInstance() {
-    if (instance == null) {
-      instance = new DcLocation();
-    }
-    return instance;
-  }
-
-  public Location getLastLocation() {
-    return lastLocation;
-  }
-
-  public boolean isValid() {
-    return !"?".equals(lastLocation.getProvider());
-  }
-
-  void updateLocation(Location location) {
-    if (isBetterLocation(location, lastLocation)) {
-      lastLocation = location;
-
-      instance.setChanged();
-      instance.notifyObservers();
-    }
-  }
-
-  void reset() {
-    updateLocation(getDefault());
-  }
-
-  private Location getDefault() {
-    return new Location("?");
-  }
-
-  /**
-   * https://developer.android.com/guide/topics/location/strategies Determines whether one Location
-   * reading is better than the current Location fix
-   *
-   * @param location The new Location that you want to evaluate
-   * @param currentBestLocation The current Location fix, to which you want to compare the new one
-   */
-  private boolean isBetterLocation(Location location, Location currentBestLocation) {
-    if (currentBestLocation == null) {
-      // A new location is always better than no location
-      return true;
-    }
-
-    // Check whether the new location fix is newer or older
-    long timeDelta = location.getTime() - currentBestLocation.getTime();
-    boolean isSignificantlyOlder = timeDelta < -TIMEOUT;
-
-    if (isSignificantlyOlder) {
-      return false;
-    }
-
-    // Check whether the new location fix is more or less accurate
-    int accuracyDelta = (int) (location.getAccuracy() - currentBestLocation.getAccuracy());
-    Log.d(TAG, "accuracyDelta: " + accuracyDelta);
-    boolean isSignificantlyMoreAccurate = accuracyDelta > 50;
-    boolean isSameProvider =
-        isSameProvider(location.getProvider(), currentBestLocation.getProvider());
-
-    if (isSignificantlyMoreAccurate && isSameProvider) {
-      return true;
-    }
-
-    boolean isMoreAccurate = accuracyDelta > 0;
-    double distance = distance(location, currentBestLocation);
-    return hasLocationChanged(distance) && isMoreAccurate
-        || hasLocationSignificantlyChanged(distance);
-  }
-
-  private boolean hasLocationSignificantlyChanged(double distance) {
-    return distance > 30D;
-  }
-
-  private boolean hasLocationChanged(double distance) {
-    return distance > 10D;
-  }
-
-  private double distance(Location location, Location currentBestLocation) {
-
-    double startLat = location.getLatitude();
-    double startLong = location.getLongitude();
-    double endLat = currentBestLocation.getLatitude();
-    double endLong = currentBestLocation.getLongitude();
-
-    double dLat = Math.toRadians(endLat - startLat);
-    double dLong = Math.toRadians(endLong - startLong);
-
-    startLat = Math.toRadians(startLat);
-    endLat = Math.toRadians(endLat);
-
-    double a = haversin(dLat) + Math.cos(startLat) * Math.cos(endLat) * haversin(dLong);
-    double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
-    double distance = EARTH_RADIUS * c * 1000;
-    Log.d(TAG, "Distance between location updates: " + distance);
-    return distance;
-  }
-
-  private double haversin(double val) {
-    return Math.pow(Math.sin(val / 2), 2);
-  }
-
-  /** Checks whether two providers are the same */
-  private boolean isSameProvider(String provider1, String provider2) {
-    if (provider1 == null) {
-      return provider2 == null;
-    }
-    return provider1.equals(provider2);
-  }
-}
@@ -1,125 +0,0 @@
-package org.thoughtcrime.securesms.geolocation;
-
-import static android.content.Context.BIND_AUTO_CREATE;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.location.Location;
-import android.os.IBinder;
-import android.util.Log;
-import com.b44t.messenger.DcContext;
-import java.util.LinkedList;
-import java.util.Observable;
-import java.util.Observer;
-import org.thoughtcrime.securesms.connect.DcHelper;
-
-public class DcLocationManager implements Observer {
-
-  private static final String TAG = DcLocationManager.class.getSimpleName();
-  private LocationBackgroundService.LocationBackgroundServiceBinder serviceBinder;
-  private final Context context;
-  private DcLocation dcLocation = DcLocation.getInstance();
-  private final LinkedList<Integer> pendingShareLastLocation = new LinkedList<>();
-  private final ServiceConnection serviceConnection =
-      new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-          Log.d(TAG, "background service connected");
-          serviceBinder = (LocationBackgroundService.LocationBackgroundServiceBinder) service;
-          while (!pendingShareLastLocation.isEmpty()) {
-            shareLastLocation(pendingShareLastLocation.pop());
-          }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-          Log.d(TAG, "background service disconnected");
-          serviceBinder = null;
-        }
-      };
-
-  public DcLocationManager(Context context, DcContext dcContext) {
-    this.context = context.getApplicationContext();
-    DcLocation.getInstance().addObserver(this);
-    if (dcContext.isSendingLocationsToChat(0)) {
-      startLocationEngine();
-    }
-  }
-
-  public void startLocationEngine() {
-    if (serviceBinder == null) {
-      Intent intent = new Intent(context.getApplicationContext(), LocationBackgroundService.class);
-      context.bindService(intent, serviceConnection, BIND_AUTO_CREATE);
-    }
-  }
-
-  public void stopLocationEngine() {
-    if (serviceBinder == null) {
-      return;
-    }
-    context.unbindService(serviceConnection);
-    serviceBinder.stop();
-    serviceBinder = null;
-  }
-
-  public void stopSharingLocation(int chatId) {
-    DcHelper.getContext(context).sendLocationsToChat(chatId, 0);
-    if (!DcHelper.getContext(context).isSendingLocationsToChat(0)) {
-      stopLocationEngine();
-    }
-  }
-
-  public void shareLocation(int duration, int chatId) {
-    startLocationEngine();
-    Log.d(TAG, String.format("Share location in chat %d for %d seconds", chatId, duration));
-    DcHelper.getContext(context).sendLocationsToChat(chatId, duration);
-    if (dcLocation.isValid()) {
-      writeDcLocationUpdateMessage();
-    }
-  }
-
-  public void shareLastLocation(int chatId) {
-    if (serviceBinder == null) {
-      pendingShareLastLocation.push(chatId);
-      startLocationEngine();
-      return;
-    }
-
-    if (dcLocation.isValid()) {
-      DcHelper.getContext(context).sendLocationsToChat(chatId, 1);
-      writeDcLocationUpdateMessage();
-    }
-  }
-
-  @Override
-  public void update(Observable o, Object arg) {
-    if (o instanceof DcLocation) {
-      dcLocation = (DcLocation) o;
-      if (dcLocation.isValid()) {
-        writeDcLocationUpdateMessage();
-      }
-    }
-  }
-
-  private void writeDcLocationUpdateMessage() {
-    Log.d(
-        TAG,
-        "Share location: "
-            + dcLocation.getLastLocation().getLatitude()
-            + ", "
-            + dcLocation.getLastLocation().getLongitude());
-    Location lastLocation = dcLocation.getLastLocation();
-
-    boolean continueLocationStreaming =
-        DcHelper.getContext(context)
-            .setLocation(
-                (float) lastLocation.getLatitude(),
-                (float) lastLocation.getLongitude(),
-                lastLocation.getAccuracy());
-    if (!continueLocationStreaming) {
-      stopLocationEngine();
-    }
-  }
-}
@@ -1,142 +0,0 @@
-package org.thoughtcrime.securesms.geolocation;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-import androidx.annotation.NonNull;
-
-public class LocationBackgroundService extends Service {
-
-  private static final int INITIAL_TIMEOUT = 1000 * 60 * 2;
-  private static final String TAG = LocationBackgroundService.class.getSimpleName();
-  private LocationManager locationManager = null;
-  private static final int LOCATION_INTERVAL = 1000;
-  private static final float LOCATION_DISTANCE = 25F;
-  ServiceLocationListener locationListener;
-
-  private final IBinder mBinder = new LocationBackgroundServiceBinder();
-
-  @Override
-  public boolean bindService(Intent service, ServiceConnection conn, int flags) {
-    return super.bindService(service, conn, flags);
-  }
-
-  @Override
-  public IBinder onBind(Intent intent) {
-    return mBinder;
-  }
-
-  @Override
-  public void onCreate() {
-    locationManager =
-        (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
-    if (locationManager == null) {
-      Log.e(TAG, "Unable to initialize location service");
-      return;
-    }
-
-    locationListener = new ServiceLocationListener();
-    Location lastLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-    if (lastLocation != null) {
-      long locationAge = System.currentTimeMillis() - lastLocation.getTime();
-      if (locationAge <= 600 * 1000) { // not older than 10 minutes
-        DcLocation.getInstance().updateLocation(lastLocation);
-      }
-    }
-    // requestLocationUpdate(LocationManager.NETWORK_PROVIDER);
-    requestLocationUpdate(LocationManager.GPS_PROVIDER);
-    initialLocationUpdate();
-  }
-
-  @Override
-  public int onStartCommand(Intent intent, int flags, int startId) {
-    super.onStartCommand(intent, flags, startId);
-    return START_STICKY;
-  }
-
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-
-    if (locationManager == null) {
-      return;
-    }
-
-    try {
-      locationManager.removeUpdates(locationListener);
-    } catch (Exception ex) {
-      Log.i(TAG, "fail to remove location listeners, ignore", ex);
-    }
-  }
-
-  private void requestLocationUpdate(String provider) {
-    try {
-      locationManager.requestLocationUpdates(
-          provider, LOCATION_INTERVAL, LOCATION_DISTANCE, locationListener);
-    } catch (SecurityException | IllegalArgumentException ex) {
-      Log.e(
-          TAG,
-          String.format("Unable to request %s provider based location updates.", provider),
-          ex);
-    }
-  }
-
-  private void initialLocationUpdate() {
-    try {
-      Location gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-      if (gpsLocation != null
-          && System.currentTimeMillis() - gpsLocation.getTime() < INITIAL_TIMEOUT) {
-        locationListener.onLocationChanged(gpsLocation);
-      }
-
-    } catch (NullPointerException | SecurityException e) {
-      e.printStackTrace();
-    }
-  }
-
-  class LocationBackgroundServiceBinder extends Binder {
-    LocationBackgroundServiceBinder getService() {
-      return LocationBackgroundServiceBinder.this;
-    }
-
-    void stop() {
-      DcLocation.getInstance().reset();
-      stopSelf();
-    }
-  }
-
-  private class ServiceLocationListener implements LocationListener {
-
-    @Override
-    public void onLocationChanged(@NonNull Location location) {
-      Log.d(TAG, "onLocationChanged: " + location);
-      if (location == null) {
-        return;
-      }
-      DcLocation.getInstance().updateLocation(location);
-    }
-
-    @Override
-    public void onProviderDisabled(@NonNull String provider) {
-      Log.e(TAG, "onProviderDisabled: " + provider);
-    }
-
-    @Override
-    public void onProviderEnabled(@NonNull String provider) {
-      Log.e(TAG, "onProviderEnabled: " + provider);
-    }
-
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-      Log.e(TAG, "onStatusChanged: " + provider + " status: " + status);
-    }
-  }
-}
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.location.Location;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+/**
+ * Process-wide holder for the current streamed location. Foreground service writes, UI observes.
+ */
+public final class LocationData {
+
+  private static final LocationData INSTANCE = new LocationData();
+
+  private final MutableLiveData<Location> liveLocation = new MutableLiveData<>();
+
+  private LocationData() {}
+
+  public static LocationData getInstance() {
+    return INSTANCE;
+  }
+
+  public LiveData<Location> observable() {
+    return liveLocation;
+  }
+
+  @Nullable
+  public Location current() {
+    return liveLocation.getValue();
+  }
+
+  void post(@NonNull Location location) {
+    liveLocation.postValue(location);
+  }
+
+  void clear() {
+    liveLocation.postValue(null);
+  }
+}
@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.location.Location;
+import androidx.annotation.NonNull;
+
+/** Abstraction over platform LocationManager and GMS FusedLocationProviderClient. */
+public interface LocationSource {
+
+  void startUpdates(@NonNull Context context, @NonNull Callback callback);
+
+  void stopUpdates();
+
+  interface Callback {
+    void onLocationUpdate(@NonNull Location location);
+  }
+}
@@ -0,0 +1,231 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.location.Location;
+import android.os.Build;
+import android.os.IBinder;
+import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.ServiceCompat;
+import androidx.core.content.ContextCompat;
+import org.thoughtcrime.securesms.ConversationListActivity;
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.connect.DcHelper;
+
+public class LocationStreamingService extends Service {
+
+  private static final String TAG = "LocationStreamingService";
+  private static final String ACTION_STOP = "org.thoughtcrime.securesms.geolocation.STOP_STREAMING";
+  private static final int NOTIFICATION_ID = 8801;
+  private static final String CHANNEL_ID = "location_streaming";
+
+  private static volatile boolean running = false;
+
+  private LocationSource source;
+  private Location lastPublished;
+
+  // static API
+
+  /** Register a chat for location updates, then ensure the service is running. */
+  public static void startSharing(Context context, int chatId, int durationSeconds) {
+    ActiveLocationChats.add(context, chatId);
+    DcHelper.getContext(context).sendLocationsToChat(chatId, durationSeconds);
+    ContextCompat.startForegroundService(
+        context, new Intent(context, LocationStreamingService.class));
+  }
+
+  /** Unregister a chat. If no chats remain, stop the service. */
+  public static void stopSharing(Context context, int chatId) {
+    ActiveLocationChats.remove(context, chatId);
+    DcHelper.getContext(context).sendLocationsToChat(chatId, 0);
+    if (!DcHelper.getContext(context).isSendingLocationsToChat(0)) {
+      context.stopService(new Intent(context, LocationStreamingService.class));
+    }
+  }
+
+  public static void ensureRunning(Context context) {
+    if (!hasLocationPermission(context)) {
+      for (int chatId : ActiveLocationChats.getAllIds(context)) {
+        DcHelper.getContext(context).sendLocationsToChat(chatId, 0);
+      }
+      ActiveLocationChats.clear(context);
+      return;
+    }
+    ContextCompat.startForegroundService(
+        context, new Intent(context, LocationStreamingService.class));
+  }
+
+  public static boolean isRunning() {
+    return running;
+  }
+
+  // lifecycle
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    if (!hasLocationPermission(this)) {
+      Log.w(TAG, "Location permission not granted, stopping");
+      stopSelf();
+      return;
+    }
+    running = true;
+    promoteToForeground();
+    beginLocationUpdates();
+  }
+
+  @Override
+  public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
+    if (intent != null && ACTION_STOP.equals(intent.getAction())) {
+      stopAllSharing();
+      stopSelf();
+      return START_NOT_STICKY;
+    }
+
+    // If the service is already running, and we already have a fix,
+    // push it immediately.
+    if (lastPublished != null) {
+      publishAndWrite(lastPublished);
+    }
+
+    return START_STICKY;
+  }
+
+  private void stopAllSharing() {
+    for (int chatId : ActiveLocationChats.getAllIds(this)) {
+      DcHelper.getContext(this).sendLocationsToChat(chatId, 0);
+    }
+    ActiveLocationChats.clear(this);
+  }
+
+  @Nullable
+  @Override
+  public IBinder onBind(Intent intent) {
+    return null;
+  }
+
+  @Override
+  public void onDestroy() {
+    running = false;
+    if (source != null) {
+      source.stopUpdates();
+      source = null;
+    }
+    LocationData.getInstance().clear();
+    super.onDestroy();
+  }
+
+  @Override
+  public void onTimeout(int startId) {
+    stopSelf();
+  }
+
+  @Override
+  public void onTimeout(int startId, int fgsType) {
+    stopSelf();
+  }
+
+  // location
+
+  private void beginLocationUpdates() {
+    source = LocationSourceFactory.create(this);
+    source.startUpdates(this, this::onNewLocation);
+  }
+
+  private void onNewLocation(Location location) {
+    Log.d(TAG, "onNewLocation raw: " + location);
+    publishAndWrite(location);
+    lastPublished = location;
+  }
+
+  private void publishAndWrite(Location location) {
+    LocationData.getInstance().post(location);
+
+    boolean keepGoing =
+        DcHelper.getContext(this)
+            .setLocation(
+                (float) location.getLatitude(),
+                (float) location.getLongitude(),
+                location.getAccuracy());
+    Log.d(TAG, "keepGoing: " + keepGoing);
+
+    if (!keepGoing) {
+      stopAllSharing();
+      stopSelf();
+    }
+  }
+
+  // foreground / notification
+
+  private void promoteToForeground() {
+    ensureNotificationChannel();
+    Notification notification = buildNotification();
+    try {
+      int type =
+          Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+              ? ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
+              : 0;
+      ServiceCompat.startForeground(this, NOTIFICATION_ID, notification, type);
+    } catch (Exception e) {
+      // SecurityException on API 34+ if permission missing,
+      // ForegroundServiceStartNotAllowedException on API 31+ if in background.
+      Log.e(TAG, "Cannot promote to foreground", e);
+      stopSelf();
+    }
+  }
+
+  private void ensureNotificationChannel() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      NotificationChannel channel =
+          new NotificationChannel(
+              CHANNEL_ID,
+              getString(R.string.location_streaming_notification_title),
+              NotificationManager.IMPORTANCE_LOW);
+      channel.setDescription(getString(R.string.location_streaming_channel_desc));
+      channel.setShowBadge(false);
+      NotificationManager nm = getSystemService(NotificationManager.class);
+      if (nm != null) nm.createNotificationChannel(channel);
+    }
+  }
+
+  private Notification buildNotification() {
+    Intent tapIntent = new Intent(this, ConversationListActivity.class);
+    PendingIntent contentPendingIntent =
+        PendingIntent.getActivity(
+            this, 0, tapIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+    Intent stopIntent = new Intent(this, LocationStreamingService.class);
+    stopIntent.setAction(ACTION_STOP);
+    PendingIntent stopPendingIntent =
+        PendingIntent.getService(this, 1, stopIntent, PendingIntent.FLAG_IMMUTABLE);
+
+    return new NotificationCompat.Builder(this, CHANNEL_ID)
+        .setContentTitle(getString(R.string.location_streaming_notification_title))
+        .setContentText(getString(R.string.location_streaming_notification_text))
+        .setSmallIcon(R.drawable.ic_location_on_white_24dp)
+        .setOngoing(true)
+        .setContentIntent(contentPendingIntent)
+        .addAction(
+            R.drawable.ic_stop_circle, getString(R.string.stop_sharing_location), stopPendingIntent)
+        .setPriority(NotificationCompat.PRIORITY_LOW)
+        .build();
+  }
+
+  private static boolean hasLocationPermission(Context context) {
+    return ContextCompat.checkSelfPermission(
+                context, android.Manifest.permission.ACCESS_FINE_LOCATION)
+            == PackageManager.PERMISSION_GRANTED
+        || ContextCompat.checkSelfPermission(
+                context, android.Manifest.permission.ACCESS_COARSE_LOCATION)
+            == PackageManager.PERMISSION_GRANTED;
+  }
+}
@@ -0,0 +1,88 @@
+package org.thoughtcrime.securesms.geolocation;
+
+import android.content.Context;
+import android.location.LocationManager;
+import android.os.Build;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.location.LocationListenerCompat;
+import androidx.core.location.LocationManagerCompat;
+import androidx.core.location.LocationRequestCompat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+public class PlatformLocationSource implements LocationSource {
+
+  private static final String TAG = "PlatformLocationSource";
+  private static final long UPDATE_INTERVAL_MS = 0;
+
+  private LocationManager locationManager;
+  private final List<LocationListenerCompat> activeListeners = new ArrayList<>();
+
+  @Override
+  public void startUpdates(@NonNull Context context, @NonNull Callback callback) {
+    locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+    if (locationManager == null) {
+      Log.e(TAG, "LocationManager unavailable");
+      return;
+    }
+
+    boolean registered = false;
+
+    // API 31+: try the platform fused provider first
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      registered = requestProvider(context, LocationManager.FUSED_PROVIDER, callback);
+    }
+
+    // Fall back with individual providers
+    if (!registered) {
+      requestProvider(context, LocationManager.GPS_PROVIDER, callback);
+      requestProvider(context, LocationManager.NETWORK_PROVIDER, callback);
+    }
+  }
+
+  private boolean requestProvider(Context context, String provider, Callback callback) {
+    if (locationManager == null) return false;
+
+    if (!locationManager.isProviderEnabled(provider)) {
+      Log.d(TAG, "Provider " + provider + " not enabled, skipping");
+      return false;
+    }
+
+    try {
+      LocationRequestCompat request =
+          new LocationRequestCompat.Builder(UPDATE_INTERVAL_MS)
+              .setMinUpdateDistanceMeters(0)
+              .setQuality(LocationRequestCompat.QUALITY_HIGH_ACCURACY)
+              .build();
+
+      LocationListenerCompat listener = callback::onLocationUpdate;
+      Executor mainExecutor = ContextCompat.getMainExecutor(context);
+
+      LocationManagerCompat.requestLocationUpdates(
+          locationManager, provider, request, mainExecutor, listener);
+      activeListeners.add(listener);
+      Log.d(TAG, "Registered on provider: " + provider);
+      return true;
+    } catch (SecurityException | IllegalArgumentException e) {
+      Log.e(TAG, "Cannot request " + provider + " updates", e);
+      return false;
+    }
+  }
+
+  @Override
+  public void stopUpdates() {
+    if (locationManager != null) {
+      for (LocationListenerCompat listener : activeListeners) {
+        try {
+          locationManager.removeUpdates(listener);
+        } catch (Exception e) {
+          Log.w(TAG, "Error removing listener", e);
+        }
+      }
+      activeListeners.clear();
+    }
+  }
+}
@@ -19,7 +19,7 @@ import androidx.annotation.NonNull;

 class JobConsumer extends Thread {

-  private static final String TAG = JobConsumer.class.getSimpleName();
+  private static final String TAG = "JobConsumer";

  enum JobResult {
    SUCCESS,
@@ -47,7 +47,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.MediaPreviewActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.ShareLocationDialog;
@@ -64,7 +63,8 @@ import org.thoughtcrime.securesms.components.audioplay.AudioPlaybackViewModel;
 import org.thoughtcrime.securesms.components.audioplay.AudioView;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.geolocation.DcLocationManager;
+import org.thoughtcrime.securesms.geolocation.ActiveLocationChats;
+import org.thoughtcrime.securesms.geolocation.LocationStreamingService;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
 import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
@@ -75,7 +75,7 @@ import org.thoughtcrime.securesms.util.views.Stub;

 public class AttachmentManager {

-  private static final String TAG = AttachmentManager.class.getSimpleName();
+  private static final String TAG = "AttachmentManager";

  private final @NonNull Context context;
  private final @NonNull Stub<View> attachmentViewStub;
@@ -283,7 +283,7 @@ public class AttachmentManager {
            removableMediaView.display(audioView, false);
            removableMediaView.addRemoveClickListener(
                v -> {
-                  playbackViewModel.stop(audioView.getMsgId(), audioView.getAudioUri());
+                  playbackViewModel.stop(audioView.getMsgId());
                });
            result.set(true);
          } else if (slide.isVcard()) {
@@ -490,47 +490,36 @@ public class AttachmentManager {
  }

  public static void selectLocation(Activity activity, int chatId) {
-    ApplicationContext applicationContext = ApplicationContext.getInstance(activity);
-    DcLocationManager dcLocationManager = applicationContext.getLocationManager();
+    Context appContext = activity.getApplicationContext();

-    if (DcHelper.getContext(applicationContext).isSendingLocationsToChat(chatId)) {
-      dcLocationManager.stopSharingLocation(chatId);
-      return;
+    if (DcHelper.getContext(appContext).isSendingLocationsToChat(chatId)) {
+      if (LocationStreamingService.isRunning()) {
+        LocationStreamingService.stopSharing(appContext, chatId);
+        return;
+      }
+      // Stale — service is dead but chat layer still thinks it's sharing.
+      // Clean up this chat and fall through to the fresh start flow.
+      ActiveLocationChats.remove(appContext, chatId);
+      DcHelper.getContext(appContext).sendLocationsToChat(chatId, 0);
    }

-    // see
-    // https://support.google.com/googleplay/android-developer/answer/9799150#zippy=%2Cstep-provide-prominent-in-app-disclosure
-    // for rationale dialog requirements
-    Permissions.PermissionsBuilder permissionsBuilder =
-        Permissions.with(activity)
-            .ifNecessary()
-            .withRationaleDialog(
-                "To share your live location with chat members, allow ArcaneChat to use your location data.\n\nTo make live location work gaplessly, location data is used even when the app is closed or not in use.",
-                R.drawable.ic_location_on_white_24dp)
-            .withPermanentDenialDialog(
-                activity.getString(R.string.perm_explain_access_to_location_denied))
-            .onAllGranted(
-                () -> {
-                  ShareLocationDialog.show(
-                      activity,
-                      durationInSeconds -> {
-                        if (durationInSeconds == 1) {
-                          dcLocationManager.shareLastLocation(chatId);
-                        } else {
-                          dcLocationManager.shareLocation(durationInSeconds, chatId);
-                        }
-                      });
-                });
-    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-      permissionsBuilder.request(
-          Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-          Manifest.permission.ACCESS_FINE_LOCATION,
-          Manifest.permission.ACCESS_COARSE_LOCATION);
-    } else {
-      permissionsBuilder.request(
-          Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION);
-    }
-    permissionsBuilder.execute();
+    Permissions.with(activity)
+        .ifNecessary()
+        .withRationaleDialog(
+            activity.getString(R.string.location_rationale), R.drawable.ic_location_on_white_24dp)
+        .withPermanentDenialDialog(
+            activity.getString(R.string.perm_explain_access_to_location_denied))
+        .onAllGranted(
+            () -> {
+              ShareLocationDialog.show(
+                  activity,
+                  durationInSeconds ->
+                      LocationStreamingService.startSharing(appContext, chatId, durationInSeconds));
+            })
+        .request(
+            android.Manifest.permission.ACCESS_FINE_LOCATION,
+            android.Manifest.permission.ACCESS_COARSE_LOCATION)
+        .execute();
  }

  private @Nullable Uri getSlideUri() {
@@ -11,7 +11,7 @@ import java.io.InputStream;

 class DecryptableStreamLocalUriFetcher extends StreamLocalUriFetcher {

-  private static final String TAG = DecryptableStreamLocalUriFetcher.class.getSimpleName();
+  private static final String TAG = "DecryptableStreamLocalUriFetcher";

  private final Context context;

@@ -7,7 +7,7 @@ import android.util.Log;
 import org.thoughtcrime.securesms.R;

 public class InChatSounds {
-  private static final String TAG = InChatSounds.class.getSimpleName();
+  private static final String TAG = "InChatSounds";
  private static volatile InChatSounds instance;

  private SoundPool soundPool = null;
@@ -54,7 +54,7 @@ import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.Util;

 public class NotificationCenter {
-  private static final String TAG = NotificationCenter.class.getSimpleName();
+  private static final String TAG = "NotificationCenter";
  @NonNull private final ApplicationContext context;
  private volatile ChatData visibleChat = null;
  private volatile Pair<Integer, Integer> visibleWebxdc = null;
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.util.Util;
 /** Get the response text from the Wearable Device and sends an message as a reply */
 public class RemoteReplyReceiver extends BroadcastReceiver {

-  public static final String TAG = RemoteReplyReceiver.class.getSimpleName();
+  public static final String TAG = "RemoteReplyReceiver";
  public static final String REPLY_ACTION = "org.thoughtcrime.securesms.notifications.WEAR_REPLY";
  public static final String ACCOUNT_ID_EXTRA = "account_id";
  public static final String CHAT_ID_EXTRA = "chat_id";
@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
    implements DcEventCenter.DcEventDelegate {
-  private static final String TAG = AdvancedPreferenceFragment.class.getSimpleName();
+  private static final String TAG = "AdvancedPreferenceFragment";

  private ListPreference showEmails;
  CheckBoxPreference selfReportingCheckbox;
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.util.Prefs;
 public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragment
    implements Preference.OnPreferenceChangeListener {

-  private static final String TAG = NotificationsPreferenceFragment.class.getSimpleName();
+  private static final String TAG = "NotificationsPreferenceFragment";

  private CheckBoxPreference ignoreBattery;
  private CheckBoxPreference notificationsEnabled;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
copilot-swe-agent[bot]	db98b41aa7	Use safe fragment handling for AllMediaActivity page changes Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/27346299-b840-4970-893f-f438f9b94981 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 20:49:33 +00:00
copilot-swe-agent[bot]	877545518b	Lazy-create pager fragments in AllMediaActivity without tag lookup Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/27346299-b840-4970-893f-f438f9b94981 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 20:47:27 +00:00
copilot-swe-agent[bot]	0cff1066e1	Remove internal fragment tag lookup in AllMediaActivity pager Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/27346299-b840-4970-893f-f438f9b94981 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 20:45:32 +00:00
copilot-swe-agent[bot]	88f528e8b8	QrActivity: replace fragile fragment tag lookups with direct references Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/2ccd1bbb-e291-4d2d-b541-964679f4188e Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 17:20:41 +00:00
copilot-swe-agent[bot]	ee3dcd38a6	Fix review issues: NO_POSITION and setCurrentItem animate param Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/de374ae1-3e38-498d-8896-624a25191eb3 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 14:16:37 +00:00
copilot-swe-agent[bot]	1af9e87af0	Migrate from ViewPager to ViewPager2 Agent-Logs-Url: https://github.com/ArcaneChat/android/sessions/de374ae1-3e38-498d-8896-624a25191eb3 Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com>	2026-05-11 14:14:28 +00:00
adbenitez	dcaa19b29d	Merge remote-tracking branch 'upstream/main'	2026-05-05 21:01:48 +02:00
adb	11845da65f	Merge pull request #4407 from deltachat/adb/issue-4406 add "mark all as read" to account menu	2026-05-05 18:03:46 +02:00
adbenitez	82262cb166	update changelog	2026-05-05 15:41:55 +02:00
adbenitez	e85ae5247a	add "mark all as read" to account menu	2026-05-05 15:40:06 +02:00
adb	40cdeee47a	Merge pull request #4404 from deltachat/adb/issue-4396 don't set draft if user can't send	2026-05-05 15:09:37 +02:00
adb	5040fb4634	Merge branch 'main' into adb/issue-4396	2026-05-04 22:04:51 +02:00
adb	4313e8824b	Merge pull request #4395 from deltachat/adb/issue-4200 allow to open message links via actions in TalkBack menu	2026-05-04 20:42:37 +02:00
B. Petersen	102c3fd82a	make strings as deprecated	2026-05-04 20:14:19 +02:00
adbenitez	dc31eee4bc	Merge branch 'adb/issue-4200' of https://github.com/deltachat/deltachat-android into adb/issue-4200	2026-05-04 20:14:06 +02:00
adbenitez	875f0e5c86	remove unnecessary check	2026-05-04 20:13:37 +02:00
wchen342	2b36e2dc26	Hide webxdc attach button for channels (#4402 )	2026-05-04 20:02:37 +02:00
adbenitez	6a9c3ab8ca	update changelog	2026-05-04 19:57:10 +02:00
adbenitez	2ab544b18e	don't set draft if user can't send	2026-05-04 19:55:13 +02:00
adbenitez	2630e22421	Merge remote-tracking branch 'upstream/main'	2026-05-04 19:20:04 +02:00
wchen342	1b7e32ab44	Get channels out of experimental (#4403 ) * Get channels out of experimental * Update CHANGELOG.md Co-authored-by: adb <adb@merlinux.eu>	2026-05-04 18:28:51 +02:00
adb	8436909977	Merge branch 'main' into adb/issue-4200	2026-05-01 15:51:40 +02:00
adb	9dd44c24b3	Merge pull request #4394 from deltachat/adb/open-map-on-loc-streaming-enabled open map if user clicks the "Location streaming enabled by Foo/you" message	2026-05-01 15:47:14 +02:00
adbenitez	5d0e85b30d	update changelog	2026-05-01 15:41:06 +02:00
adbenitez	5193dfa412	allow to open message links via actions in TalkBack menu	2026-05-01 15:38:06 +02:00
adbenitez	96490e23f8	update changelog	2026-04-30 17:59:31 +02:00
adbenitez	7959b07d45	open map if user clicks the "Location streaming enabled by Foo/you" message	2026-04-30 17:57:35 +02:00
link2xt	c4ae7927ad	Setup zizmor workflow to check GitHub Actions workflows	2026-04-29 17:13:09 +00:00
wchen342	ba0515ebc5	Allow voice messages to be played continuously in a chat (#4376 ) * Allow voice messages to be played continuously in a chat --------- Co-authored-by: adb <adb@merlinux.eu>	2026-04-29 17:24:10 +02:00
adb	349bab9510	Merge pull request #4392 from deltachat/adb/issue-4391 change sticker sort order	2026-04-29 17:05:26 +02:00
adbenitez	e26f803d1f	update changelog	2026-04-29 17:01:36 +02:00
adbenitez	60ab7f2826	Merge remote-tracking branch 'upstream/main'	2026-04-29 16:48:31 +02:00
adbenitez	67d2c89bcc	change sticker sort order	2026-04-29 15:58:11 +02:00
adb	e511237e5e	Merge pull request #4384 from deltachat/adb/issue-4345 add highlight to input panel buttons for keyboard navigation	2026-04-28 17:17:27 +02:00
adb	f249fd6174	Merge pull request #4386 from deltachat/adb/issue-4342 add mapping.txt to symbols zip	2026-04-28 17:16:29 +02:00
B. Petersen	6db45c1911	add translator hints for new call strings	2026-04-28 17:01:47 +02:00
adb	06a1114744	Merge pull request #4388 from deltachat/adb/issue-4328 fix migration while upgrading from 1.10.1 and similar old versions	2026-04-28 16:54:19 +02:00
adb	3afff5625b	Merge branch 'main' into adb/issue-4328	2026-04-28 16:40:53 +02:00
adbenitez	cef8ddeedb	update changelog	2026-04-28 16:32:33 +02:00
adbenitez	2f0ac973c0	fix migration from 1.10.1 and similar old versions	2026-04-28 16:28:25 +02:00
adbenitez	9465776715	add mapping.txt to symbols zip	2026-04-28 16:04:07 +02:00
B. Petersen	39685a575d	feat: better wording for "Media Quality" option this changes "Worse quality, small size" to "Worse quality, save data". this makes it more clearer, what the advantage of that option is. also, the recently added hint about sending as original also speaks about "data" (https://github.com/deltachat/deltachat-android/pull/4259) which is more known to the average user, knowing that of "mobile data" etc.	2026-04-28 15:51:37 +02:00
B. Petersen	8601736387	update translations	2026-04-28 15:49:37 +02:00
adbenitez	98d8572baf	add highlight to input panel buttons for keyboard navigation	2026-04-28 15:16:36 +02:00
wchen342	917e764b6f	Promote call FGS asap (#4377 ) * Promote call FGS as soon as possible * Add resource strings for call notification * Launch with only phone call type on 14+	2026-04-27 20:34:51 +02:00
adb	52263150c8	Merge pull request #4374 from deltachat/adb/location-streaming-time-tweaks allow to share location for 24 hours, remove 5 minutes	2026-04-27 17:27:12 +02:00
B. Petersen	c2aba94b34	mark deprecated strings as such	2026-04-25 02:07:46 +02:00
adbenitez	1278dfd395	Merge remote-tracking branch 'upstream/main'	2026-04-24 19:55:16 +02:00
wchen342	44a688470f	Merge pull request #4370 from deltachat/wch423/change-tag-names Remove usages of `class.getSimpleName()`	2026-04-24 12:18:37 -04:00
wch423	e9a09d9c72	Correct tag name	2026-04-24 15:59:37 +02:00
wchen342	abc49a3b95	Update src/main/java/com/b44t/messenger/DcMsg.java Co-authored-by: adb <adb@merlinux.eu>	2026-04-23 17:55:20 +02:00
wch423	cdd4e5eccd	Code formatting	2026-04-23 17:55:18 +02:00
wch423	fa8ed2b881	Remove usages of `class.getSimpleName()`	2026-04-23 17:55:16 +02:00
B. Petersen	0731fe9447	fix warning string, make reuse of new explicit button strings	2026-04-23 15:57:42 +02:00
adbenitez	d3567d9f0c	fix arrays.xml	2026-04-23 14:51:48 +02:00
adbenitez	66ab1f8051	update changelog	2026-04-23 14:51:04 +02:00
adbenitez	872fd17f5e	allow to share location for 24 hours, remove 5 minutes	2026-04-23 14:49:18 +02:00
B. Petersen	af49018911	add strings from desktop, add some missing strings	2026-04-23 00:43:12 +02:00
adbenitez	f870e9c8fd	Merge remote-tracking branch 'upstream/main'	2026-04-22 21:48:58 +02:00
wchen342	d5982ba09f	Merge pull request #4361 from deltachat/wch423/location-streaming Add foreground service for location streaming	2026-04-18 17:30:56 -04:00
adbenitez	22d70d7bd4	Merge remote-tracking branch 'upstream/main'	2026-04-18 22:15:03 +02:00
adb	09bdc32a9c	Merge pull request #4315 from deltachat/r10s/markfresh feat: mark messages as "unread"	2026-04-18 21:09:18 +02:00
adb	7763ba17bf	Merge branch 'main' into r10s/markfresh	2026-04-18 20:15:57 +02:00
adb	965204c46f	Merge branch 'main' into wch423/location-streaming	2026-04-18 19:56:00 +02:00
adbenitez	815e4def6f	Merge branch 'wch423/location-streaming' of https://github.com/deltachat/deltachat-android into wch423/location-streaming	2026-04-18 19:54:17 +02:00
adbenitez	dc3ca8ff70	use "Location Streaming" for notification title and channel name	2026-04-18 19:48:39 +02:00
adb	3bccb3fb84	Apply suggestion from @adbenitez	2026-04-18 19:44:39 +02:00
adb	402d93b5a4	Merge pull request #4363 from deltachat/adb/allow-autoplay allow webxdc to auto-play audio without requiring user gesture/touch	2026-04-18 17:10:48 +02:00
adbenitez	927dc46431	update changelog	2026-04-18 00:02:19 +02:00
adbenitez	87c32b1904	allow webxdc to auto-play audio without requiring user gesture/touch	2026-04-17 23:59:51 +02:00
adbenitez	bb97213460	apply spotless	2026-04-17 23:52:22 +02:00
adbenitez	9ca9bf1acd	remove unnecessary entry in src/main/res/xml/file_provider_paths.xml	2026-04-17 23:45:36 +02:00
wch423	885c902b14	Allow fallback to different providers	2026-04-17 21:11:56 +02:00
wch423	61bf5aaad4	Change how location sources work	2026-04-17 20:30:57 +02:00
wch423	5d76586ac1	Add foreground service for location streaming	2026-04-15 19:07:34 +02:00
B. Petersen	beb45af440	prefer 'mark noticed' over 'mark fresh'	2026-04-02 15:50:40 +02:00
adbenitez	87a21eb0f2	apply spotless	2026-04-02 15:41:41 +02:00
adbenitez	dea51cd356	use RPC API instead of C API	2026-04-02 15:41:41 +02:00
B. Petersen	ed540e5584	update CHANGLOG	2026-04-02 15:41:38 +02:00
B. Petersen	9f80c9f35f	make spotless formatter happy	2026-04-02 15:40:32 +02:00
B. Petersen	5dec1b24cd	option to mark chat fresh	2026-04-02 15:40:32 +02:00