simplify indexing a little

Author: or-else

README.md

@@ -60,5 +60,5 @@ Pull requests with translations are welcome. See [Russian translation](app/src/m
 
 
 ## Screenshots
-<img src="android-contacts.png" alt="App screenshot - contacts" width="270" /> <img src="android-chat.png" alt="App screenshot - chat" width="270" /> <img src="android-topic-info.png" alt="App screenshot - chat settings" width="270" />
+<img src="android-contacts.png" alt="App screenshot - chat list" width="270" /> <img src="android-chat.png" alt="App screenshot - chat" width="270" /> <img src="android-topic-info.png" alt="App screenshot - chat settings" width="270" />
 <img src="android-account.png" alt="App screenshot - account info" width="270" /> <img src="android-find-people.png" alt="App screenshot - searching for contacts" width="270" /> <img src="android-new-topic.png" alt="App screenshot - creating new topic" width="270" />

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

@@ -74,10 +74,8 @@ public boolean isIncluded(Topic t) {
         });
 
         final HashMap<String,Integer> newTopicIndex = new HashMap<>(newTopics.size());
-        int i = 0;
         for (Topic t : newTopics) {
-            newTopicIndex.put(t.getName(), i);
-            i++;
+            newTopicIndex.put(t.getName(), newTopicIndex.size());
         }
 
         activity.runOnUiThread(new Runnable() {

app/src/main/java/co/tinode/tindroid/widgets/CircleImageView.java

@@ -29,18 +29,20 @@
 import android.view.animation.Animation;
 
 import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 
 /**
  * This ImageView is used to display circular progress indicator. It matches the one in SwipeRefreshLayout.
  *
- * Copied from android/9.0.0/androidx/swiperefreshlayout/widget/circleimageview.java
+ * Adopted from android/9.0.0/androidx/swiperefreshlayout/widget/circleimageview.java
  */
 public class CircleImageView extends AppCompatImageView {
 
     private static final int CIRCLE_BG_LIGHT = 0xFFFAFAFA;
 
+    // Default offset in dips from the top of the view to where the progress spinner should appear.
+    private static final int DEFAULT_CIRCLE_TARGET = 64;
+
     private static final int KEY_SHADOW_COLOR = 0x1E000000;
     private static final int FILL_SHADOW_COLOR = 0x3D000000;
     // PX
@@ -115,15 +117,6 @@ public void onAnimationEnd() {
         }
     }
 
-    /**
-     * Update the background color of the circle image view.
-     *
-     * @param colorRes Id of a color resource.
-     */
-    public void setBackgroundColorRes(int colorRes) {
-        setBackgroundColor(ContextCompat.getColor(getContext(), colorRes));
-    }
-
     @Override
     public void setBackgroundColor(int color) {
         if (getBackground() instanceof ShapeDrawable) {

tinodesdk/src/main/java/co/tinode/tinodesdk/Tinode.java

@@ -1504,7 +1504,7 @@ public <T extends Topic> List<T> getFilteredTopics(TopicFilter filter) {
     }
 
     /**
-     * Start tracking topic.
+     * Start tracking topic: add it to in-memory cache.
      */
     void startTrackingTopic(final Topic topic) {
         final String name = topic.getName();
@@ -1516,7 +1516,7 @@ void startTrackingTopic(final Topic topic) {
     }
 
     /**
-     * Stop tracking the topic, delete it from local storage.
+     * Stop tracking the topic: remove it from in-memory cache.
      */
     void stopTrackingTopic(String topicName) {
         mTopics.remove(topicName);