data race on login, enable stickers, bix sharing to tinode

Author: or-else

app/src/main/AndroidManifest.xml

@@ -141,7 +141,6 @@
 
         <activity
             android:name=".SendToActivity"
-            android:label="@string/send_to"
             android:theme="@style/AppTheme"
             android:exported="true">
             <intent-filter>

app/src/main/java/co/tinode/tindroid/AttachmentHandler.java

@@ -47,6 +47,7 @@
 import androidx.work.ListenableWorker;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.Operation;
 import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
@@ -172,7 +173,7 @@ static UploadDetails getFileDetails(@NonNull final Context context, @NonNull Uri
         return result;
     }
 
-    static void enqueueMsgAttachmentUploadRequest(AppCompatActivity activity, String operation, Bundle args) {
+    static Operation enqueueMsgAttachmentUploadRequest(AppCompatActivity activity, String operation, Bundle args) {
         String topicName = args.getString(AttachmentHandler.ARG_TOPIC_NAME);
         // Create a new message which will be updated with upload progress.
         Drafty content = new Drafty();
@@ -210,8 +211,11 @@ static void enqueueMsgAttachmentUploadRequest(AppCompatActivity activity, String
                     .addTag(TAG_UPLOAD_WORK)
                     .build();
 
-            WorkManager.getInstance(activity).enqueueUniqueWork(Long.toString(msg.getDbId()), ExistingWorkPolicy.REPLACE, upload);
+            return WorkManager.getInstance(activity).enqueueUniqueWork(Long.toString(msg.getDbId()),
+                    ExistingWorkPolicy.REPLACE, upload);
         }
+
+        return null;
     }
 
     @SuppressWarnings("UnusedReturnValue")

app/src/main/java/co/tinode/tindroid/FindFragment.java

@@ -61,6 +61,8 @@ public class FindFragment extends Fragment implements UiUtils.ProgressIndicator
     private FndTopic<VxCard> mFndTopic;
     private FndListener mFndListener;
 
+    private LoginEventListener mLoginListener;
+
     private String mSearchTerm; // Stores the current search query term
     private FindAdapter mAdapter = null;
 
@@ -135,6 +137,20 @@ public void onResume() {
             return;
         }
 
+        final Tinode tinode = Cache.getTinode();
+        mLoginListener = new LoginEventListener(tinode.isConnected());
+        tinode.addListener(mLoginListener);
+
+        if (!tinode.isAuthenticated()) {
+            // If connection is not ready, wait for completion. This method will be called again
+            // from the onLogin callback;
+            return;
+        }
+
+        topicAttach();
+    }
+
+    private void topicAttach() {
         Cache.attachFndTopic(mFndListener)
                 .thenApply(new PromisedReply.SuccessListener<ServerMessage>() {
                     @Override
@@ -172,6 +188,8 @@ public void onPause() {
         if (mFndTopic != null) {
             mFndTopic.setListener(null);
         }
+
+        Cache.getTinode().removeListener(mLoginListener);
     }
 
     @Override
@@ -440,4 +458,16 @@ public void onClick(String topicName) {
             activity.finish();
         }
     }
+
+    private class LoginEventListener extends UiUtils.EventListener {
+        LoginEventListener(boolean online) {
+            super(getActivity(), online);
+        }
+
+        @Override
+        public void onLogin(int code, String txt) {
+            super.onLogin(code, txt);
+            topicAttach();
+        }
+    }
 }

app/src/main/java/co/tinode/tindroid/MessageActivity.java

@@ -225,6 +225,9 @@ public void onResume() {
             return;
         }
 
+        // Resume message sender.
+        mMessageSender.resume();
+
         CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);
         //noinspection ConstantConditions
         mMessageText = TextUtils.isEmpty(text) ? null : text.toString();
@@ -243,6 +246,7 @@ public void onResume() {
                 showFragment(FRAGMENT_FILE_PREVIEW, args, true);
             }
         }
+        intent.setData(null);
 
         final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
 
@@ -385,8 +389,9 @@ private String readTopicNameFromIntent(Intent intent) {
     public void onPause() {
         super.onPause();
 
-        Cache.getTinode().removeListener(mTinodeListener);
+        mMessageSender.pause();
 
+        Cache.getTinode().removeListener(mTinodeListener);
         topicDetach();
 
         // Stop handling read messages
@@ -410,16 +415,13 @@ private Fragment maybeShowMessagesFragmentOnAttach() {
     }
 
     private void topicAttach(boolean interactive) {
-        setRefreshing(true);
-
-        Tinode tinode = Cache.getTinode();
-        if (!tinode.isAuthenticated()) {
+        if (!Cache.getTinode().isAuthenticated()) {
             // If connection is not ready, wait for completion. This method will be called again
             // from the onLogin callback;
-            Cache.getTinode().reconnectNow(interactive, false, false);
             return;
         }
 
+        setRefreshing(true);
         Topic.MetaGetBuilder builder = mTopic.getMetaGetBuilder()
                 .withDesc()
                 .withSub()
@@ -453,9 +455,8 @@ public PromisedReply<ServerMessage> onSuccess(ServerMessage result) {
                                         mTopicName, mTopic.getOnline(), mTopic.getLastSeen(), mTopic.isDeleted());
                             }
                         });
-                        // Resume message sender and submit pending messages for processing:
-                        // publish queued, delete marked for deletion.
-                        mMessageSender.resume();
+                        // Submit pending messages for processing: publish queued,
+                        // delete marked for deletion.
                         syncAllMessages(true);
                         return null;
                     }
@@ -485,7 +486,6 @@ public void onFinally() {
 
     // Clean up everything related to the topic being replaced of removed.
     private void topicDetach() {
-        mMessageSender.pause();
         if (mTypingAnimationTimer != null) {
             mTypingAnimationTimer.cancel();
             mTypingAnimationTimer = null;

app/src/main/java/co/tinode/tindroid/MessagesFragment.java

@@ -61,6 +61,8 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.core.view.ContentInfoCompat;
 import androidx.core.view.OnReceiveContentListener;
@@ -70,6 +72,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.work.Data;
+import androidx.work.Operation;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 
@@ -947,7 +950,7 @@ private void initAudioRecorder(Activity activity) {
             mAudioRecorder.prepare();
             mAudioSampler = new AudioSampler();
         } catch (IOException ex) {
-            Log.i(TAG, "Failed to initialize audio recording", ex);
+            Log.w(TAG, "Failed to initialize audio recording", ex);
             Toast.makeText(activity, R.string.audio_recording_failed, Toast.LENGTH_SHORT).show();
             mAudioRecorder.release();
             mAudioRecorder = null;
@@ -1376,18 +1379,34 @@ private int findItemPositionById(long id) {
         return mMessagesAdapter.findItemPositionById(id, first, last);
     }
 
-    private static class StickerReceiver implements OnReceiveContentListener {
+    private class StickerReceiver implements OnReceiveContentListener {
         @Nullable
         @Override
         public ContentInfoCompat onReceiveContent(@NonNull View view, @NonNull ContentInfoCompat payload) {
             Pair<ContentInfoCompat, ContentInfoCompat> split = payload.partition(item -> item.getUri() != null);
 
-            if (split.first != null) {
+            final MessageActivity activity = (MessageActivity) getActivity();
+            if (split.first != null && activity != null) {
                 // Handle posted URIs.
                 ClipData data = split.first.getClip();
                 if (data.getItemCount() > 0) {
-                    Uri uri = data.getItemAt(0).getUri();
-                    Log.i(TAG, "Uri from IME: " + uri.toString() + "; total=" + data.getItemCount());
+                    Uri stickerUri = data.getItemAt(0).getUri();
+                    Bundle args = new Bundle();
+                    args.putParcelable(AttachmentHandler.ARG_LOCAL_URI, stickerUri);
+                    args.putString(AttachmentHandler.ARG_OPERATION, AttachmentHandler.ARG_OPERATION_IMAGE);
+                    args.putString(AttachmentHandler.ARG_TOPIC_NAME, mTopicName);
+
+                    Operation op = AttachmentHandler.enqueueMsgAttachmentUploadRequest(activity,
+                            AttachmentHandler.ARG_OPERATION_IMAGE, args);
+                    if (op != null) {
+                        op.getResult().addListener((Runnable) () -> {
+                                    if (activity.isFinishing() || activity.isDestroyed()) {
+                                        return;
+                                    }
+                                    activity.syncAllMessages(true);
+                                    notifyDataSetChanged(false);
+                            }, ContextCompat.getMainExecutor(activity));
+                    }
                 }
             }
 

app/src/main/java/co/tinode/tindroid/TindroidApp.java

@@ -205,14 +205,11 @@ public void onReceive(Context context, Intent intent) {
         Cache.getTinode().addListener(new Tinode.EventListener() {
             @Override
             public void onDataMessage(MsgServerData data) {
-                Log.i(TAG, "Data message for " + data.topic);
                 if (Cache.getTinode().isMe(data.from)) {
                     return;
                 }
                 String webrtc = data.getStringHeader("webrtc");
-                Log.i(TAG, "Data.head.webrtc=" + webrtc);
                 if (MsgServerData.parseWebRTC(webrtc) != MsgServerData.WebRTC.STARTED) {
-                    Log.i(TAG, "Data.head.webrtc NOT started=" + MsgServerData.parseWebRTC(webrtc));
                     return;
                 }
                 ComTopic topic = (ComTopic) Cache.getTinode().getTopic(data.topic);