Add permissions, webpage text update, update file name

karan-appgambit · karan-appgambit · commit 6213191e45b2 · 2023-10-23T17:25:14.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ captures/
 .cxx/
 *.apk
 output.json
+*/release
 
 # IntelliJ
 *.iml
diff --git a/README.md b/README.md
@@ -1,2 +1,23 @@
 # LogcatLogger
-A utility app to save and download android device logs easily. 
+
+A utility app to save and download Android device logs easily
+
+## Usage
+
+Use ADB to grant `android.permission.READ_LOGS` to LogcatLogger.
+
+If you don't grant permission, it collects logs from the LogcatLogger app only.
+
+After permission is granted, it starts collecting all the logs.
+
+### Steps
+
+- Install App.
+- Connect android device to computer.
+- Run below command in Terminal or CMD.
+
+```sh
+adb shell "pm grant com.appgambit.android_logger android.permission.READ_LOGS && am force-stop com.appgambit.android_logger"
+```
+
+- Open app and it will starts collecting logs.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 26
         targetSdk 34
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.READ_LOGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:allowBackup="true"
@@ -26,12 +35,5 @@
         <receiver android:name="com.appgambit.android_logger.LogCaptureService$LogDeletionReceiver" />
 
     </application>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
-    <uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 </manifest>
diff --git a/app/src/main/java/com/appgambit/android_logger/ForegroundLogService.java b/app/src/main/java/com/appgambit/android_logger/ForegroundLogService.java
@@ -70,8 +70,10 @@ public void run() {
                     if (!root.exists()) {
                         root.mkdirs();
                     }
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
+                    String newFileName = "log_" + sdf.format(new Date()) + ".txt";
 
-                    File logFile = new File(root, "logg.txt");
+                    File logFile = new File(root, newFileName);
 
                     double fileSizeInBytes = 0;
                     double fileSizeInKB = 0;
@@ -101,8 +103,8 @@ public void run() {
                             fileSizeInMB = fileSizeInKB / 1024;
 
                             if (fileSizeInMB >= 5.0) {
-                                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
-                                String newFileName = "log_" + sdf.format(new Date()) + ".txt";
+                                sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
+                                newFileName = "log_" + sdf.format(new Date()) + ".txt";
                                 logFile = new File(root, newFileName);
 
                                 fileSizeInBytes = 0;
@@ -203,7 +205,9 @@ private void deleteOldLogFiles(Context context) {
         
     }
     public Notification createNotification() {
-        String notificationChannelId = "LOGCAT LOGGER CHANNEL";
+        String notificationChannelId = "LOGCAT_LOGGER_CHANNEL";
+        String url = WebServerService.getUrl(this);
+        Log.i(MainActivity.TAG, url);
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -212,7 +216,7 @@ public Notification createNotification() {
                     "Logcat logger notifications channel",
                     NotificationManager.IMPORTANCE_HIGH
             );
-            channel.setDescription("Service is running...");
+            channel.setDescription("Use " + url + " to download logs.");
             channel.enableLights(true);
             channel.setLightColor(Color.RED);
             channel.enableVibration(true);
@@ -233,7 +237,7 @@ public Notification createNotification() {
 
         return builder
                 .setContentTitle("Logcat Logger Service")
-                .setContentText("Service is running...")
+                .setContentText("Use " + url + " to download logs.")
                 .setContentIntent(pendingIntent)
                 .setSmallIcon(R.mipmap.ic_launcher) // Replace with your icon resource
                 .setTicker("Ticker text")
diff --git a/app/src/main/java/com/appgambit/android_logger/LogCaptureService.java b/app/src/main/java/com/appgambit/android_logger/LogCaptureService.java
@@ -33,7 +33,7 @@ public class LogCaptureService extends Service {
     private Handler handler = new Handler(Looper.getMainLooper());
 
     // Define the number of days after which log files should be deleted.
-    private static final int DELETE_LOGS_OLDER_THAN_DAYS = 2;
+    static final int DELETE_LOGS_OLDER_THAN_DAYS = 2;
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -64,7 +64,7 @@ public void run() {
                     double fileSizeInMB = 0;
 
                     while (!Thread.currentThread().isInterrupted()) {
-                        Process process = Runtime.getRuntime().exec("logcat -d");
+                        Process process = Runtime.getRuntime().exec("logcat");
 
                         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                         StringBuilder stringBuilder = new StringBuilder();
diff --git a/app/src/main/java/com/appgambit/android_logger/MainActivity.java b/app/src/main/java/com/appgambit/android_logger/MainActivity.java
@@ -13,7 +13,7 @@
 
 public class MainActivity extends AppCompatActivity {
     private TextView t1;
-
+    static String TAG = "LogcatLogger";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/appgambit/android_logger/WebServerService.java b/app/src/main/java/com/appgambit/android_logger/WebServerService.java
@@ -1,6 +1,7 @@
 package com.appgambit.android_logger;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.Looper;
@@ -23,7 +24,7 @@
 import java.util.ArrayList;
 
 public class WebServerService extends Service {
-    private static final int SERVER_PORT = 12993;
+    static final int SERVER_PORT = 12993;
     private ServerSocket serverSocket;
     private boolean isServerRunning;
     private Handler handler = new Handler(Looper.getMainLooper());
@@ -57,32 +58,34 @@ public void run() {
         handler.post(new Runnable() {
             @Override
             public void run() {
-               String deviceIpAddress = getDeviceIpAddress();
-                if (deviceIpAddress != null) {
-                    String urlToOpen = "http://" + deviceIpAddress + ":" + SERVER_PORT + "/";
-                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlToOpen));
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
-                } else {
-                    // Handle the case where you couldn't retrieve the device IP address
-                }
+//               String deviceIpAddress = getDeviceIpAddress(this);
+//                if (deviceIpAddress != null) {
+//                    String urlToOpen = "http://" + deviceIpAddress + ":" + SERVER_PORT + "/";
+//                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlToOpen));
+//                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(intent);
+//                } else {
+//                    // Handle the case where you couldn't retrieve the device IP address
+//                }
             }
         });
     }
 
-    private String getDeviceIpAddress() {
-        WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+    static String getDeviceIpAddress(Context context) {
+        WifiManager wifiManager = (WifiManager) context.getSystemService(WIFI_SERVICE);
         int ipAddress = wifiManager.getConnectionInfo().getIpAddress();
         if (ipAddress != 0) {
             return Formatter.formatIpAddress(ipAddress);
         } else {
             return null;
         }
     }
-
+    static String getUrl(Context context) {
+        return "http://" + getDeviceIpAddress(context) + ":" + SERVER_PORT;
+    }
     private void handleClientRequest(Socket clientSocket) {
         try {
-            String deviceIpAddress = getDeviceIpAddress();
+            String deviceIpAddress = getDeviceIpAddress(this);
             String request = getRequest(clientSocket);
             File folder = new File(getExternalFilesDir("Log_Datas").getAbsolutePath());
 
@@ -172,7 +175,7 @@ private void serveFileNotFound(Socket clientSocket) {
 
     private void serveFileList(Socket clientSocket, File[] files) {
         try {
-            String deviceIpAddress = getDeviceIpAddress();
+            String deviceIpAddress = getDeviceIpAddress(this);
             OutputStream os = clientSocket.getOutputStream();
             StringBuilder response = new StringBuilder();
 
@@ -183,10 +186,12 @@ private void serveFileList(Socket clientSocket, File[] files) {
             response.append("<!DOCTYPE html>\n");
             response.append("<html>\n");
             response.append("<head>\n");
-            response.append("    <title>File List</title>\n");
+            response.append("    <title>Logcat Logger</title>\n");
             response.append("</head>\n");
             response.append("<body>\n");
-            response.append("    <h1>File List</h1>\n");
+            response.append("    <h1>Logcat Logger Service - Log Files</h1>\n");
+            response.append("    <p>Click on the file link to download the log file.</p>\n");
+            response.append("    <p>Logger Service automatically removes files older than " + LogCaptureService.DELETE_LOGS_OLDER_THAN_DAYS + " days.</p>\n");
             response.append("    <ul>\n");
 
             for (File file : files) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.appgambit.android_logger.com.appgambit.android_logger.MainActivity">
+    tools:context="com.appgambit.android_logger.MainActivity">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -19,7 +19,7 @@
                 android:id="@+id/t1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Hello World!" />
+                android:text="" />
         </LinearLayout>
     </ScrollView>
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ android {`
`11`	`11`	`minSdk 26`
`12`	`12`	`targetSdk 34`
`13`	`13`	`versionCode 1`
`14`		`- versionName "1.0"`
	`14`	`+ versionName "1.0.0"`
`15`	`15`
`16`	`16`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`17`	`17`	`}`