aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/services/ExportLogsService.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java6
3 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
index e66873acc..75d1bb5be 100644
--- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
@@ -57,7 +57,7 @@ public class ExportLogsService extends XmppConnectionService {
final SharedPreferences ReadableLogs = PreferenceManager.getDefaultSharedPreferences(this);
ReadableLogsEnabled = ReadableLogs.getBoolean("export_plain_text_logs", getResources().getBoolean(R.bool.plain_text_logs));
pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ExportLogsService");
+ wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, Config.LOGTAG + ": ExportLogsService");
this.startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, getNotificationService().exportLogsNotification());
}
diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java
index 0dfd86327..df41d5884 100644
--- a/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java
+++ b/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java
@@ -58,7 +58,7 @@ public abstract class FormFieldWrapper {
int start = label.length();
int end = label.length() + 2;
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
- spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, R.color.accent)), start, end, 0);
+ spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, R.attr.colorAccent)), start, end, 0);
}
return spannableString;
}
diff --git a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java b/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java
index 396a71348..9d7a5dfb8 100644
--- a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java
+++ b/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java
@@ -1,5 +1,6 @@
package de.pixart.messenger.ui.widget;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.ClipData;
import android.content.ClipboardManager;
@@ -8,6 +9,7 @@ import android.os.Build;
import android.util.AttributeSet;
import android.widget.TextView;
+@SuppressLint("AppCompatCustomView")
public class CopyTextView extends TextView {
public CopyTextView(Context context) {
@@ -19,13 +21,13 @@ public class CopyTextView extends TextView {
}
public CopyTextView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs); //, defStyleAttr);
+ super(context, attrs, defStyleAttr);
}
@SuppressWarnings("unused")
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public CopyTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs); //, defStyleAttr); //, defStyleRes);
+ super(context, attrs, defStyleAttr, defStyleRes);
}
public interface CopyHandler {