Skip to content

Commit dfebcd9

Browse files
committed
wip
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent d9c48af commit dfebcd9

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,28 @@ class FileDisplayActivity :
300300
setupDrawer(menuItemId)
301301
}
302302

303+
@Suppress("DEPRECATION")
304+
private fun logOcsCredentials() {
305+
306+
lifecycleScope.launch(Dispatchers.IO) {
307+
val user = accountManager.user
308+
val serverUrl = user.server.uri.toString()
309+
val accountName = user.accountName
310+
311+
try {
312+
val client = clientFactory.create(user)
313+
val username = client.userIdPlain
314+
val authToken = client.credentials.authToken
315+
Log_OC.d(TAG, "OCS credentials — serverUrl=$serverUrl")
316+
Log_OC.d(TAG, "OCS credentials — accountName=$accountName username=$username authToken=$authToken")
317+
318+
} catch (e: CreationException) {
319+
Log_OC.e(TAG, "OCS credentials — serverUrl=$serverUrl accountName=$accountName (client creation failed)", e)
320+
}
321+
}
322+
323+
}
324+
303325
/**
304326
* Determines which navigation drawer item should be selected.
305327
*

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
7070
import com.owncloud.android.ui.fragment.share.RemoteShareRepository;
7171
import com.owncloud.android.ui.fragment.share.ShareRepository;
72+
import com.owncloud.android.ui.fragment.share.UnifiedShareViewKt;
7273
import com.owncloud.android.ui.fragment.util.FileDetailSharingFragmentHelper;
7374
import com.owncloud.android.ui.helpers.FileOperationsHelper;
7475
import com.owncloud.android.utils.ClipboardUtil;
@@ -208,11 +209,30 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
208209
binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
209210

210211
// start loading process
211-
fetchSharees();
212-
212+
// TODO: REPLACE FAKE CONDITION
213+
if (user.getServer().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_34) || 2 < 4) {
214+
showUnifiedShare();
215+
} else {
216+
fetchSharees();
217+
}
213218
setupView();
214219
}
215220

221+
private void showUnifiedShare() {
222+
if (binding == null) {
223+
return;
224+
}
225+
226+
binding.shareContainer.setVisibility(View.GONE);
227+
binding.unifiedShare.setVisibility(View.VISIBLE);
228+
229+
final LinearLayout shimmerLayout = binding.shimmerLayout.getRoot();
230+
shimmerLayout.clearAnimation();
231+
shimmerLayout.setVisibility(View.GONE);
232+
233+
UnifiedShareViewKt.setupUnifiedShare(binding.unifiedShare, viewThemeUtils, requireContext());
234+
}
235+
216236
private void fetchSharees() {
217237
final var activity = fileActivity;
218238
if (activity == null) {

0 commit comments

Comments
 (0)