bug fix: allow accepting group ownership

tinode · Dec 29, 2022 · 54147c7 · 54147c7
1 parent 632561b
commit 54147c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/co/tinode/tindroid/TopicGeneralFragment.java b/app/src/main/java/co/tinode/tindroid/TopicGeneralFragment.java
@@ -115,10 +115,10 @@ public void onViewCreated(@NonNull View view, Bundle savedInstance) {
     @SuppressWarnings("unchecked")
     // onResume sets up the form with values and views which do not change + sets up listeners.
     public void onResume() {
-        final Activity activity = getActivity();
+        final Activity activity = requireActivity();
         final Bundle args = getArguments();
 
-        if (activity == null || args == null) {
+        if (args == null) {
             return;
         }
 

diff --git a/app/src/main/java/co/tinode/tindroid/TopicSecurityFragment.java b/app/src/main/java/co/tinode/tindroid/TopicSecurityFragment.java
@@ -71,10 +71,10 @@ public void onViewCreated(@NonNull View fragment, Bundle savedInstance) {
         mFailureListener = new UiUtils.ToastFailureListener(activity);
 
         // Set up listeners
-
         fragment.findViewById(R.id.permissionsSingle).setOnClickListener(v ->
                 UiUtils.showEditPermissions(activity, mTopic, mTopic.getAccessMode().getWant(), null,
-                        UiUtils.ACTION_UPDATE_SELF_SUB, "O"));
+                    UiUtils.ACTION_UPDATE_SELF_SUB,
+                    mTopic.getAccessMode().getGivenHelper().isOwner() ? "" : "O"));
 
         fragment.findViewById(R.id.authPermissions).setOnClickListener(v ->
                 UiUtils.showEditPermissions(activity, mTopic, mTopic.getAuthAcsStr(), null,