Merge branch 'dev' into strings-squashed

oxen-io · Jul 29, 2024 · 79cd878 · 79cd878
2 parents 3b62e47 + dec02ce
commit 79cd878
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
@@ -22,7 +22,7 @@ public static ParcelFileDescriptor getParcelFileDescriptor(MemoryFile file) thro
 
  int fd = field.getInt(fileDescriptor);
 
- return ParcelFileDescriptor.adoptFd(fd);
+ return ParcelFileDescriptor.fromFd(fd);
  } catch (IllegalAccessException e) {
  throw new IOException(e);
  } catch (InvocationTargetException e) {