Browse Source

Done some changes for storing the log messages on log file and grant that logs are added to the same log file when the app is killed, then reopened

jabarros 10 years ago
parent
commit
30c00ae9e5

+ 1 - 1
src/com/owncloud/android/MainApp.java

@@ -76,7 +76,7 @@ public class MainApp extends Application {
     public static String getAccountType() {
     public static String getAccountType() {
         return getAppContext().getResources().getString(R.string.account_type);
         return getAppContext().getResources().getString(R.string.account_type);
     }
     }
-    
+
     //  From AccountAuthenticator 
     //  From AccountAuthenticator 
     //  public static final String AUTHORITY = "org.owncloud";
     //  public static final String AUTHORITY = "org.owncloud";
     public static String getAuthority() {
     public static String getAuthority() {

+ 2 - 1
src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java

@@ -32,6 +32,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
+import com.owncloud.android.utils.Log_OC;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.net.Uri;
 import android.net.Uri;
@@ -122,7 +123,7 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation {
             authMethod = AuthenticationMethod.SAML_WEB_SSO;
             authMethod = AuthenticationMethod.SAML_WEB_SSO;
         }
         }
         // else - fall back to UNKNOWN
         // else - fall back to UNKNOWN
-        Log.d(TAG, "Authentication method found: " + authenticationMethodToString(authMethod));
+        Log_OC.d(TAG, "Authentication method found: " + authenticationMethodToString(authMethod));
         
         
         if (!authMethod.equals(AuthenticationMethod.UNKNOWN)) {
         if (!authMethod.equals(AuthenticationMethod.UNKNOWN)) {
             result = new RemoteOperationResult(true, result.getHttpCode(), null);
             result = new RemoteOperationResult(true, result.getHttpCode(), null);

+ 2 - 29
src/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Bundle;
 
 
+import android.util.Log;
 import android.view.View;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.Button;
@@ -65,53 +66,26 @@ public class LogHistoryActivity extends SherlockActivity {
             
             
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
-//                File dir = new File(mLogPath);
-//                if (dir != null) {
-//                    File[] files = dir.listFiles();
-//                    if(files!=null) { 
-//                        for(File f: files) {
-//                                f.delete();
-//                        }
-//                    }
-//                    dir.delete();
-//                }
-//                finish();
 
 
                 Log_OC.stopLogging();
                 Log_OC.stopLogging();
                 finish();
                 finish();
             }
             }
         });
         });
 
 
-
         sendHistoryButton.setOnClickListener(new OnClickListener() {
         sendHistoryButton.setOnClickListener(new OnClickListener() {
 
 
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {
                 sendMail();
                 sendMail();
             }
             }
-
         });
         });
-        
-       
+
         if(mLogPath != null){
         if(mLogPath != null){
         logDIR = new File(mLogPath);
         logDIR = new File(mLogPath);
         }
         }
 
 
         if(logDIR != null && logDIR.isDirectory()) {
         if(logDIR != null && logDIR.isDirectory()) {
-//            File[] files = logDIR.listFiles();
-//
-//            if (files != null && files.length != 0) {
-//                ArrayList<String> logfiles_name = new ArrayList<String>();
-//                for (File file : files) {
-//                    logfiles_name.add(file.getName());
-//                }
-//                    String[] logFiles2Array = logfiles_name.toArray(new String[logfiles_name.size()]);
-//                    LogListAdapter listadapter = new LogListAdapter(this,logFiles2Array);
-//                    listView.setAdapter(listadapter);
-//            }
-
             readLogFile();
             readLogFile();
-
         }
         }
     }
     }
 
 
@@ -119,7 +93,6 @@ public class LogHistoryActivity extends SherlockActivity {
     @Override
     @Override
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
         super.onMenuItemSelected(featureId, item);
         super.onMenuItemSelected(featureId, item);
-
         switch (item.getItemId()) {
         switch (item.getItemId()) {
         case android.R.id.home:
         case android.R.id.home:
             finish();
             finish();

+ 6 - 16
src/com/owncloud/android/utils/Log_OC.java

@@ -6,14 +6,10 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
 
 
+import android.os.Environment;
 import android.util.Log;
 import android.util.Log;
 
 
-import com.owncloud.android.MainApp;
-
-
 
 
 public class Log_OC {
 public class Log_OC {
     
     
@@ -74,9 +70,7 @@ public class Log_OC {
             isFileCreated = true;
             isFileCreated = true;
             Log.d("LOG_OC", "Log file created");
             Log.d("LOG_OC", "Log file created");
         }
         }
-//        if (logFile.exists()) {
-//            logFile.delete();
-//        }
+
         try { 
         try { 
             logFile.createNewFile();
             logFile.createNewFile();
             buf = new BufferedWriter(new FileWriter(logFile, true));
             buf = new BufferedWriter(new FileWriter(logFile, true));
@@ -90,12 +84,7 @@ public class Log_OC {
     }
     }
     
     
     public static void stopLogging() {
     public static void stopLogging() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault());
-//        String currentDateandTime = sdf.format(new Date());
         if (logFile != null) {
         if (logFile != null) {
-//            logFile.renameTo(new File(folder + File.separator + MainApp.getLogName() + currentDateandTime+".log"));
-            
-          
             isEnabled = false;
             isEnabled = false;
             try {
             try {
                 buf = new BufferedWriter(new FileWriter(logFile, false));
                 buf = new BufferedWriter(new FileWriter(logFile, false));
@@ -104,9 +93,7 @@ public class Log_OC {
             } catch (IOException e) {
             } catch (IOException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             } 
             } 
-        
         }
         }
-        
     }
     }
     
     
     private static void appendPhoneInfo() {
     private static void appendPhoneInfo() {
@@ -120,8 +107,11 @@ public class Log_OC {
     
     
     private static void appendLog(String text) { 
     private static void appendLog(String text) { 
         if (isEnabled) {
         if (isEnabled) {
+            String logPath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log";
+            startLogging(logPath);
             String timeStamp = new SimpleDateFormat("HH:mm:ss").format(Calendar.getInstance().getTime());
             String timeStamp = new SimpleDateFormat("HH:mm:ss").format(Calendar.getInstance().getTime());
-           try {
+
+            try {
                buf = new BufferedWriter(new FileWriter(logFile, true));
                buf = new BufferedWriter(new FileWriter(logFile, true));
                buf.write(timeStamp + " -> " +text); 
                buf.write(timeStamp + " -> " +text); 
                buf.newLine();
                buf.newLine();