From e113469d77a114b6543a507fe0e45fc5dbc1e9fb Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 22 Oct 2015 17:22:24 +0200 Subject: [PATCH] Removed old Logs --- .../notes/android/activity/NoteActivity.java | 4 ---- .../android/activity/NotesListViewActivity.java | 15 --------------- .../activity/SelectSingleNoteActivity.java | 4 ---- .../notes/android/activity/SettingsActivity.java | 5 ----- .../notes/android/widget/AllNotesWidget.java | 6 ------ .../notes/android/widget/SingleNoteWidget.java | 3 --- .../notes/persistence/NoteSQLiteOpenHelper.java | 12 ------------ .../notes/persistence/NoteServerSyncHelper.java | 2 -- .../owncloud/notes/util/NotesClient.java | 3 --- .../owncloud/notes/util/NotesClientUtil.java | 11 ++--------- .../main/res/layout/fragment_notes_list_view.xml | 2 ++ 11 files changed, 4 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java index fde26c9e..06c5e12f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -26,7 +25,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Log.v("Note", "NoteActivity.onCreate()"); setContentView(R.layout.activity_single_note); note = (Note) getIntent().getSerializableExtra( NotesListViewActivity.SELECTED_NOTE); @@ -74,7 +72,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe finish(); return true; case R.id.menu_share: - Log.v("Note", "Share Action pressed."); Intent shareIntent = new Intent(); shareIntent.setAction(Intent.ACTION_SEND); shareIntent.setType("text/plain"); @@ -85,7 +82,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe startActivity(shareIntent); return true; case R.id.menu_copy: - Log.v("Note", "Copy Action pressed."); db = new NoteSQLiteOpenHelper(this); Note newNote = db.getNote(db.addNoteAndSync(note.getContent())); newNote.setTitle(note.getTitle() + " (" + getResources().getString(R.string.copy) + ")"); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index d6fc7320..0833e3eb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -50,9 +50,7 @@ public class NotesListViewActivity extends AppCompatActivity implements // First Run Wizard SharedPreferences preferences = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); - Log.v("Note", "First Run: " + preferences.getBoolean(SettingsActivity.SETTINGS_FIRST_RUN, true)); if(preferences.getBoolean(SettingsActivity.SETTINGS_FIRST_RUN, true)) { - Log.v("Note", "Seems to be the First Run..."); Intent settingsIntent = new Intent(this, SettingsActivity.class); startActivityForResult(settingsIntent, server_settings); } @@ -127,7 +125,6 @@ public class NotesListViewActivity extends AppCompatActivity implements public void onItemClick(AdapterView parentView, View childView, int position, long id) { listView.setItemChecked(position, !listView.isItemChecked(position)); - Log.v("Note", "getCheckedItemCount " + listView.getCheckedItemCount()); if (listView.getCheckedItemCount() < 1) { removeSelection(); Intent intent = new Intent(getApplicationContext(), @@ -135,9 +132,6 @@ public class NotesListViewActivity extends AppCompatActivity implements Note note = adapter.getItem(position); intent.putExtra(SELECTED_NOTE, note); intent.putExtra(SELECTED_NOTE_POSITION, position); - Log.v("Note", - "notePosition | NotesListViewActivity wurde abgesendet " - + position); startActivityForResult(intent, show_single_note_cmd); } else { // perform long click if already something is selected onListItemSelect(position); @@ -198,26 +192,17 @@ public class NotesListViewActivity extends AppCompatActivity implements } } else if (requestCode == NoteActivity.EDIT_NOTE_CMD) { if (resultCode == RESULT_OK) { - Log.v("Note", "Note was edited from single view"); - Note editedNote = (Note) data.getExtras().getSerializable( NoteActivity.EDIT_NOTE); - Log.v("Note", "Neuer Titel: " + editedNote); - int notePosition = data.getExtras().getInt( SELECTED_NOTE_POSITION); - Log.v("Note", "notePosition | NotesListViewActivity kam an " - + notePosition); - adapter.remove(adapter.getItem(notePosition)); adapter.add(editedNote); } } else if (requestCode == SettingsActivity.CREDENTIALS_CHANGED) { - Log.v("Note", "Credentials Changed!"); db = new NoteSQLiteOpenHelper(this); db.synchronizeWithServer(); // Needed to instanciate new NotesClient with new URL } - Log.v("Note", "New NoteSQLteOpenHelper instanciated"); //TODO Maybe only if previous activity == settings activity? setListView(db.getNotes()); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java index 9a1d595d..860c853b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; @@ -35,12 +34,9 @@ public class SelectSingleNoteActivity extends AppCompatActivity implements Adapt super.onCreate(savedInstanceState); setResult(RESULT_CANCELED); setContentView(R.layout.activity_select_single_note); - - Log.v("NoteWidget", "In Config Activity"); // Display Data db = new NoteSQLiteOpenHelper(this); db.synchronizeWithServer(); - Log.v("NoteWidget", "Databasename: " + db.getDatabaseName()); setListView(db.getNotes()); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java index b19629d9..71c5c9ad 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java @@ -8,7 +8,6 @@ import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -116,7 +115,6 @@ public class SettingsActivity extends AppCompatActivity implements View.OnClickL @Override protected void onPostExecute(Boolean o) { - Log.v("Note", "Set Visible: " + o); if (o) { findViewById(R.id.settings_url_check).setVisibility(View.VISIBLE); } else { @@ -151,14 +149,12 @@ public class SettingsActivity extends AppCompatActivity implements View.OnClickL @Override protected void onPostExecute(Boolean isValidLogin) { if(isValidLogin) { - Log.v("Note", "Valid Credentials."); SharedPreferences.Editor editor = preferences.edit(); editor.putString(SETTINGS_URL, url); editor.putString(SETTINGS_USERNAME, username); editor.putString(SETTINGS_PASSWORD, password); // Now it is no more First Run - Log.v("Note", "set First_Run to false."); editor.putBoolean(SETTINGS_FIRST_RUN, false); editor.apply(); @@ -172,7 +168,6 @@ public class SettingsActivity extends AppCompatActivity implements View.OnClickL setResult(RESULT_OK, data); finish(); } else { - Log.v("Note", "Invalid Credentials!"); btn_submit.setEnabled(true); //TODO Show Error Message } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/widget/AllNotesWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/android/widget/AllNotesWidget.java index 1f6432e1..d4c14b4d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/widget/AllNotesWidget.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/widget/AllNotesWidget.java @@ -5,7 +5,6 @@ import android.appwidget.AppWidgetProvider; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; import android.widget.RemoteViews; import android.widget.RemoteViewsService; @@ -27,8 +26,6 @@ public class AllNotesWidget extends AppWidgetProvider { public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { for (int i = 0; i < appWidgetIds.length; i++) { int appWidgetId = appWidgetIds[i]; - Log.v("AllNotesWidget", "onUpdate appWidgetId: " + appWidgetId); - // Set up the intent that starts the StackViewService, which will // provide the views for this collection. Intent intent = new Intent(context, StackWidgetService.class); @@ -64,7 +61,6 @@ public class AllNotesWidget extends AppWidgetProvider { mContext = context; mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - Log.v("AllNotesWidget", "StackRemoteViewsFactory()"); NoteSQLiteOpenHelper db = new NoteSQLiteOpenHelper(mContext); db.synchronizeWithServer(); mWidgetItems = db.getNotes(); @@ -72,7 +68,6 @@ public class AllNotesWidget extends AppWidgetProvider { } public void onCreate() { - Log.v("AllNotesWidget", "StackRemoteViewsFactory.onCreate"); mWidgetItems.add(new Note(0, Calendar.getInstance(), "Test-Titel", "Test-Beschreibung")); } @@ -93,7 +88,6 @@ public class AllNotesWidget extends AppWidgetProvider { @Override public RemoteViews getViewAt(int position) { - Log.v("AllNotesWidget", "StackRemoteViewsFactory.getViewAt()"); // Construct a remote views item based on the app widget item XML file, // and set the text based on the position. RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.fragment_notes_list_view); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/widget/SingleNoteWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/android/widget/SingleNoteWidget.java index e03aadea..743eb583 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/widget/SingleNoteWidget.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/widget/SingleNoteWidget.java @@ -5,7 +5,6 @@ import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; import android.content.Context; import android.content.Intent; -import android.util.Log; import android.widget.RemoteViews; import it.niedermann.owncloud.notes.R; @@ -37,7 +36,6 @@ public class SingleNoteWidget extends AppWidgetProvider { public void onReceive(Context context, Intent intent) { super.onReceive(context, intent); if (intent.getAction().equals(ACTION_SHOW_NOTE)) { - Log.v("SingleNoteWidget", "SingleNoteWidget.onReceive()"); } } @@ -45,7 +43,6 @@ public class SingleNoteWidget extends AppWidgetProvider { public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { for (int i = 0; i < appWidgetIds.length; i++) { int appWidgetId = appWidgetIds[i]; - Log.v("SingleNoteWidget", "onUpdate appWidgetId: " + appWidgetId); updateAppWidget(null, context, appWidgetManager, appWidgetId); } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java index bc272a40..6bf081ca 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java @@ -5,7 +5,6 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -55,7 +54,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @Override public void onCreate(SQLiteDatabase db) { - Log.v("Note", "Creating Database"); db.execSQL("CREATE TABLE '" + table_notes + "' ( '" + key_id + "' INTEGER PRIMARY KEY AUTOINCREMENT, '" + key_status + "' VARCHAR(50), '" + @@ -71,7 +69,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @SuppressWarnings("UnusedReturnValue") public long addNoteAndSync(String content) { - Log.v("Note", "addNoteAndSync"); SQLiteDatabase db = this.getWritableDatabase(); ContentValues values = new ContentValues(); @@ -93,7 +90,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { * @param note Note to be added */ public void addNote(Note note) { - Log.v("Note", "addNote (" + note + ")"); SQLiteDatabase db = this.getWritableDatabase(); ContentValues values = new ContentValues(); @@ -117,7 +113,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @SuppressWarnings("unused") public Note getNote(long id) { - Log.v("Note", "getNote(" + id + ")"); SQLiteDatabase db = this.getReadableDatabase(); Cursor cursor = db.query(table_notes, @@ -150,7 +145,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { * @return List<Note> */ public List getNotes() { - Log.v("Note", "getNotes"); List notes = new ArrayList<>(); SQLiteDatabase db = this.getWritableDatabase(); Cursor cursor = db.rawQuery("SELECT * FROM " + table_notes + " WHERE " + key_status + " != ?", new String[]{DBStatus.LOCAL_DELETED.getTitle()}); @@ -177,7 +171,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { * @return List<Note> */ public List getNotesByStatus(DBStatus status) { - Log.v("Note", "getNotesByStatus(" + status.getTitle() + ")"); List notes = new ArrayList<>(); SQLiteDatabase db = this.getWritableDatabase(); Cursor cursor = db.rawQuery("SELECT * FROM " + table_notes + " WHERE " + key_status + " = ?", new String[]{status.getTitle()}); @@ -206,7 +199,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @SuppressWarnings("UnusedReturnValue") public int updateNoteAndSync(Note note) { - Log.v("Note", "updateNoteAndSync(" + note + ")"); SQLiteDatabase db = this.getWritableDatabase(); ContentValues values = new ContentValues(); values.put(key_id, note.getId()); @@ -231,7 +223,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @SuppressWarnings("UnusedReturnValue") public int updateNote(Note note) { - Log.v("Note", "updateNote(" + note + ")"); SQLiteDatabase db = this.getWritableDatabase(); ContentValues values = new ContentValues(); values.put(key_id, note.getId()); @@ -256,7 +247,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { */ @SuppressWarnings("UnusedReturnValue") public int deleteNoteAndSync(long id) { - Log.v("Note", "deleteNoteAndSync(" + id + ")"); SQLiteDatabase db = this.getWritableDatabase(); ContentValues values = new ContentValues(); values.put(key_status, DBStatus.LOCAL_DELETED.getTitle()); @@ -275,7 +265,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { * @param id long - ID of the Note that should be deleted. */ public void deleteNote(long id) { - Log.v("Note", "deleteNote(" + id + ")"); SQLiteDatabase db = this.getWritableDatabase(); db.delete(table_notes, key_id + " = ?", @@ -285,7 +274,6 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - Log.v("Note", "onUpgrade - DELETE *"); clearDatabase(); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java index 759df656..21ed35cb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java @@ -8,7 +8,6 @@ import android.os.Handler; import android.os.Message; import android.preference.PreferenceManager; import android.support.design.widget.Snackbar; -import android.util.Log; import android.view.View; import org.json.JSONException; @@ -81,7 +80,6 @@ public class NoteServerSyncHelper { private void asyncTaskFinished() { operationsFinished++; - Log.v("Note", "Finished " + operationsFinished + " / " + operationsCount); if(operationsFinished == operationsCount) { handler.obtainMessage(1).sendToTarget(); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java index 22a65e2c..82f05fa0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClient.java @@ -1,7 +1,6 @@ package it.niedermann.owncloud.notes.util; import android.util.Base64; -import android.util.Log; import org.json.JSONArray; import org.json.JSONException; @@ -188,7 +187,6 @@ public class NotesClient { throws IOException { StringBuffer result = new StringBuffer(); String targetURL = url + "index.php/apps/notes/api/v0.2/" + target; - Log.v("Note", targetURL); HttpURLConnection con = (HttpURLConnection) new URL(targetURL) .openConnection(); con.setRequestMethod(method); @@ -203,7 +201,6 @@ public class NotesClient { con.setRequestProperty("Content-Type", application_json); con.setDoOutput(true); OutputStream os = con.getOutputStream(); - Log.v("Note", params.toString()); os.write(params.toString().getBytes()); os.flush(); os.close(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java index 48e63b65..3573a31c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesClientUtil.java @@ -1,7 +1,6 @@ package it.niedermann.owncloud.notes.util; import android.util.Base64; -import android.util.Log; import java.io.IOException; import java.net.HttpURLConnection; @@ -36,13 +35,8 @@ public class NotesClientUtil { urlc.setRequestProperty("Connection", "close"); urlc.setConnectTimeout(1000 * 10); // mTimeout is in seconds urlc.connect(); - if (urlc.getResponseCode() == 200) { - Log.v("Note", "ResponseCode: " + urlc.getResponseCode()); - return true; - } else { - return false; - } - } catch (MalformedURLException e1) { + return urlc.getResponseCode() == 200; + } catch (MalformedURLException el) { return false; } catch (IOException e) { return false; @@ -59,7 +53,6 @@ public class NotesClientUtil { public static boolean isValidLogin(String url, String username, String password) { try { String targetURL = url + "index.php/apps/notes/api/v0.2/notes"; - Log.v("Note", targetURL); HttpURLConnection con = (HttpURLConnection) new URL(targetURL) .openConnection(); con.setRequestMethod("GET"); diff --git a/app/src/main/res/layout/fragment_notes_list_view.xml b/app/src/main/res/layout/fragment_notes_list_view.xml index 561b0f0a..224ca370 100644 --- a/app/src/main/res/layout/fragment_notes_list_view.xml +++ b/app/src/main/res/layout/fragment_notes_list_view.xml @@ -25,7 +25,9 @@ android:id="@+id/noteModified" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentBottom="false" android:layout_alignParentEnd="true" + android:layout_alignParentLeft="false" android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true"