commit 770ef47e6a5d369b1b47228d292f74d88315c789
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Oct 19 16:47:14 2020 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Tue Oct 20 16:32:39 2020 -0400
tree 3bb5cac12221c646c6ea5067245f00e835e19d1b
parent a2811236b393e7f39a9e1a50cb64c6681a3bb4d1

conversation: use new path for ContactDetails

Change-Id: Id7dc3205a17aacb67eebcf0da5644b26d710178c

ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.java

diff --git a/ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.java b/ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.java
index 409b6fa..7634f3b 100644
--- a/ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.java
@@ -130,7 +130,7 @@
         }
     }
 
-    static class ContactActionAdapter extends RecyclerView.Adapter<ContactActionView> {
+    private static class ContactActionAdapter extends RecyclerView.Adapter<ContactActionView> {
         private final ArrayList<ContactAction> actions = new ArrayList<>();
 
         @NonNull

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 5ecbf72..defec2d 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -943,9 +943,9 @@
     }
 
     @Override
-    public void goToContactActivity(String accountId, String contactRingId) {
-        startActivity(new Intent(Intent.ACTION_VIEW, android.net.Uri.withAppendedPath(android.net.Uri.withAppendedPath(ContentUriHandler.CONTACT_CONTENT_URI, accountId), contactRingId))
-                .setClass(requireActivity().getApplicationContext(), ContactDetailsActivity.class));
+    public void goToContactActivity(String accountId, String contactId) {
+        startActivity(new Intent(Intent.ACTION_VIEW, ConversationPath.toUri(accountId, contactId),
+                requireActivity().getApplicationContext(), ContactDetailsActivity.class));
     }
 
     @Override