Skip to content

Commit 3f6af26

Browse files
committed
Improving clarify
1 parent b1b756b commit 3f6af26

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/dashboard/DashboardActivity.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,19 @@ private void setupViews() {
120120
startActivity(new Intent(DashboardActivity.this, InternalSettingsActivity.class));
121121
return true;
122122
});
123-
binding.deviceIdTextView.setOnClickListener(view -> {
124-
copyToClipboard(binding.deviceIdTextView.getText().toString().trim());
125-
});
123+
String deviceToken = CustomerIO.instance().getRegisteredDeviceToken();
124+
if (deviceToken != null && !deviceToken.isEmpty()) {
125+
binding.deviceIdTextView.setClickable(true);
126+
binding.deviceIdTextView.setFocusable(true);
127+
binding.deviceIdTextView.setText(deviceToken);
128+
binding.deviceIdTextView.setOnClickListener(view -> {
129+
copyToClipboard(binding.deviceIdTextView.getText().toString().trim());
130+
});
131+
} else {
132+
binding.deviceIdTextView.setClickable(false);
133+
binding.deviceIdTextView.setFocusable(false);
134+
binding.deviceIdTextView.setText(R.string.device_token_not_registered);
135+
}
126136
binding.sendRandomEventButton.setOnClickListener(view -> {
127137
sendRandomEvent();
128138
});
@@ -149,7 +159,6 @@ private void setupObservers() {
149159
});
150160
authViewModel.getUserDataObservable().observe(this, user -> {
151161
binding.userEmailTextView.setText(user.getEmail());
152-
binding.deviceIdTextView.setText(CustomerIO.instance().getRegisteredDeviceToken());
153162
});
154163
authViewModel.getUserLoggedInStateObservable().observe(this, isLoggedIn -> {
155164
if (isLoggedIn) {
@@ -245,6 +254,9 @@ private void showPushPermissionDeniedAlert(@StringRes int messageResId) {
245254
}
246255

247256
private void copyToClipboard(String text) {
257+
if (text.isEmpty()) {
258+
return;
259+
}
248260
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
249261
ClipData clip = ClipData.newPlainText(getString(R.string.device_token), text);
250262
clipboard.setPrimaryClip(clip);

samples/java_layout/src/main/res/layout/activity_dashboard.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@
9797
android:gravity="center"
9898
android:maxLines="2"
9999
android:layout_marginStart="8dp"
100-
android:clickable="true"
101-
android:focusable="true"
102100
android:background="?attr/selectableItemBackground"
103101
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
104102
app:layout_constrainedWidth="true"

samples/java_layout/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<string name="view_logs">View Logs</string>
1818
<string name="log_out">Log Out</string>
1919
<string name="device_token">Device Token</string>
20+
<string name="device_token_not_registered">Not Registered</string>
2021
<string name="api_host">API Host</string>
2122
<string name="cdn_host">CDN Host</string>
2223
<string name="error_host_url">Please enter url without scheme e.g. cdp-cio/v1</string>

0 commit comments

Comments
 (0)