#14: button "Log" to show log after installation

nzbget · Apr 23, 2019 · c9e4ebf · c9e4ebf
1 parent f044bfe
commit c9e4ebf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/java/net/nzbget/nzbget/InstallActivity.java b/app/src/main/java/net/nzbget/nzbget/InstallActivity.java
@@ -430,7 +430,7 @@ public void run()
             {
                 if (ok)
                 {
-                    MessageActivity.showOkMessage(activity, "Installation", "NZBGet daemon has been successfully installed.",
+                    MessageActivity.showOkMessage(activity, "Daemon Installation", "NZBGet daemon has been successfully installed.",
                             new MessageActivity.OnClickListener()
                             {
                                 public void onClick()

diff --git a/app/src/main/java/net/nzbget/nzbget/MessageActivity.java b/app/src/main/java/net/nzbget/nzbget/MessageActivity.java
@@ -46,7 +46,7 @@ public static void showLogMessage(Context context, String title)
         context.startActivity(intent);
     }
 
-    public static void showOkMessage(Context context, String title, String text, final OnClickListener click)
+    public static void showOkMessage(final Context context, final String title, String text, final OnClickListener click)
     {
         AlertDialog.Builder adb = new AlertDialog.Builder(context);
         adb.setTitle(title);
@@ -63,6 +63,13 @@ public void onClick(DialogInterface dialog, int id)
                 }
             }
         });
+        adb.setNeutralButton("Log", new DialogInterface.OnClickListener()
+        {
+            public void onClick(DialogInterface dialog, int id)
+            {
+                MessageActivity.showLogMessage(context, title + " Log");
+            }
+        });
         AlertDialog alert = adb.create();
         alert.show();
     }

diff --git a/app/src/main/jniLibs/armeabi/libdaemon.so b/app/src/main/jniLibs/armeabi/libdaemon.so
@@ -67,7 +67,9 @@ Stop()
 Remove()
 {
 	echo "Removing daemon"
-	$HOME/nzbget/nzbget -c $HOME/nzbget/nzbget.conf -Q || echo ""
+	echo "Stopping daemon (if it's running)"
+	$HOME/nzbget/nzbget -c $HOME/nzbget/nzbget.conf -Q || echo "OK"
+	echo "Deleting daemon directory"
 	rm -r nzbget
 }