Master

.github/workflows/android.yml

@@ -0,0 +1,26 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build

app/build.gradle

@@ -17,14 +17,14 @@ repositories {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.0'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "com.pluscubed.matlog"
         minSdkVersion 16
         targetSdkVersion 29
-        versionName '1.2.3'
-        versionCode 11
+        versionName '1.3.0'
+        versionCode 12
 
         testApplicationId "com.pluscubed.matlog.test"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/pluscubed/logcat/data/LogLine.java

@@ -20,7 +20,7 @@ public class LogLine {
             "(\\w)" +
                     "/" +
                     // tag
-                    "([^(]+)" +
+                    "([^(].+)" +
                     "\\(\\s*" +
                     // pid
                     "(\\d+)" +
@@ -49,7 +49,7 @@ public static LogLine newLogLine(String originalLine, boolean expanded, String f
 
         // if the first char is a digit, then this starts out with a timestamp
         // otherwise, it's a legacy log or the beginning of the log output or something
-        if (!TextUtils.isEmpty(originalLine)
+             if (!TextUtils.isEmpty(originalLine)
                 && Character.isDigit(originalLine.charAt(0))
                 && originalLine.length() >= TIMESTAMP_LENGTH) {
             String timestamp = originalLine.substring(0, TIMESTAMP_LENGTH - 1);

app/src/main/res/drawable/ic_more_vert_24dp.xml

@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#757575"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    <path android:fillColor="#757575" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>

app/src/main/res/layout/list_item_logfilename_single.xml

@@ -28,7 +28,6 @@
         android:layout_marginTop="16dp"
         android:ellipsize="marquee"
         android:gravity="center_vertical"
-        android:textColor="@color/primary_text_default_material_dark"
         android:textSize="16sp"
         tools:text="TEST"
         android:singleLine="true" />

app/src/main/res/values-ru/strings.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- translateable strings-->
-
-
     <string name="about">О программе</string>
     <string name="about_matlog">О программе MatLog</string>
 
     <string name="add_filter">Добавить фильтр</string>
-    <string name="add_filter_ellipsis">Добавить фильр…</string>
+    <string name="add_filter_ellipsis">Добавить фильтр…</string>
 
     <plurals name="are_you_sure">
         <item quantity="one">%d file will be deleted</item>
@@ -48,7 +46,7 @@
         <item quantity="many">%d файлов будет удалёно</item>
     </plurals>
 
-    <string name="filter_choice">Поиск по...</string>
+    <string name="filter_choice">Поиск по…</string>
     <string name="filter_choice_pid">PID</string>
     <string name="filter_choice_tag">Тег</string>
     <string name="filter_text_colon">Фильтр текста:</string>
@@ -127,7 +125,7 @@
 
     <string name="settings">Настройки</string>
 
-    <string name="simultaneous"> (Simultaneous)</string>
+    <string name="simultaneous"> (Одновременный)</string>
 
     <string name="start_recording_log">Запись</string>
 
@@ -183,8 +181,8 @@
 
     <string name="permission_not_granted">Эта функция не будет работать без разрешения на запись во внутр. накопитель</string>
     <string name="search">Поиск</string>
-    <string name="scrubber">Omit sensitive info</string>
-    <string name="scrubber_summary">Omit sensitive info like web urls, phone numbers or emails</string>
+    <string name="scrubber">Скрыть личные данные</string>
+    <string name="scrubber_summary">Исключать из лога конфиденциальную информацию (URL, IP адреса, Email)</string>
     <string name="text_include_dmesg">Добавить лог ядра</string>
     <string name="save_log_zip">Сохранить в ZIP</string>
     <string name="share_log">Поделиться</string>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sat Aug 24 20:27:25 KRAT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip