Fixed some log entries.

app/src/main/java/com/ivalentin/margolariak/ActivityFutureLayout.java

@@ -62,7 +62,7 @@ public class ActivityFutureLayout extends Fragment {
 		Bundle bundle = this.getArguments();
 		int id = bundle.getInt("activity", -1);
 		if (id == -1){
-			Log.e("Activity error", "No such activity: " + id);
+			Log.e("ACTIVITY_FUTURE_LAYOUT", "No such activity: " + id);
 			this.getActivity().onBackPressed();
 		}
 
@@ -284,7 +284,7 @@ public class ActivityFutureLayout extends Fragment {
 				}
 			}
 			catch (ParseException ex){
-				Log.e("Error parsing time", ex.toString());
+				Log.e("ACTIVITY_FUTURE_LAYOUT", "Error parsing time: " + ex.toString());
 			}
 
 			//Set the place

app/src/main/java/com/ivalentin/margolariak/AlarmReceiver.java

@@ -54,7 +54,7 @@ public class AlarmReceiver extends BroadcastReceiver {
 			try{
 				fu = new FetchURL();
 				fu.Run(GM.API.SERVER + GM.API.NOTIFICATION.PATH);
-				Log.d("NOTIFICATIONS", "Fetched notifications");
+				Log.d("ALARM_RECEIVER", "Fetched notifications");
 
 				//Parse info
 				String o = fu.getOutput().toString();
@@ -64,13 +64,13 @@ public class AlarmReceiver extends BroadcastReceiver {
 				try {
 					db = context.openOrCreateDatabase(GM.DB.NAME, Activity.MODE_PRIVATE, null);
 					if (db.isReadOnly()) {
-						Log.e("NOTIFICATIONS", "Database is locked and in read only mode. Not reading new notifications now, but I'll try to sync.");
+						Log.e("ALARM_RECEIVER", "Database is locked and in read only mode. Not reading new notifications now, but I'll try to sync.");
 						new Sync(context).execute(); // Sync before exiting.
 						return;
 					}
 				}
 				catch(SQLiteDatabaseLockedException ex){
-					Log.e("NOTIFICATIONS", "Database is locked and in read only mode. Not reading new notifications now, but I'll try to sync.");
+					Log.e("ALARM_RECEIVER", "Database is locked and in read only mode. Not reading new notifications now, but I'll try to sync.");
 					new Sync(context).execute(); // Sync before exiting.
 					return;
 				}

app/src/main/java/com/ivalentin/margolariak/AlbumLayout.java

@@ -116,7 +116,7 @@ public class AlbumLayout extends Fragment {
 					ivLeft.setImageBitmap(GM.decodeSampledBitmapFromFile(file.getAbsolutePath(), GM.IMG.SIZE.PREVIEW));
 				}
 				catch (Exception ex){
-					Log.e("Bitmap error", "Not loading image " + image + ": " + ex.toString());
+					Log.e("ALBUM_LAYOUT", "Bitmap error. Not loading image " + image + ": " + ex.toString());
 				}
 			}
 			else {
@@ -188,7 +188,7 @@ public class AlbumLayout extends Fragment {
 						ivRight.setImageBitmap(GM.decodeSampledBitmapFromFile(file.getAbsolutePath(), GM.IMG.SIZE.PREVIEW));
 					}
 					catch (Exception ex){
-						Log.e("Bitmap error", "Not loading image " + image + ": " + ex.toString());
+						Log.e("ALBUM_LAYOUT", "Bitmap error. Not loading image " + image + ": " + ex.toString());
 					}
 				}
 				else {

app/src/main/java/com/ivalentin/margolariak/DownloadImage.java

@@ -82,7 +82,7 @@ class DownloadImage extends AsyncTask<Void, Void, Void> {
 			input.close();
 
 		} catch (Exception e) {
-			Log.e("Error downloading: ", e.getMessage());
+			Log.e("DOWNLOAD_IMAGE", "Error downloading: " + e.getMessage());
 		}
 
 		return null;
@@ -94,7 +94,6 @@ class DownloadImage extends AsyncTask<Void, Void, Void> {
 	 */
 	@Override
 	protected void onPostExecute(Void v) {
-		Log.d("File downloaded", path);
 		try {
 			File file = new File(path);
 			iv.setImageBitmap(GM.decodeSampledBitmapFromFile(file.getAbsolutePath(), size));

app/src/main/java/com/ivalentin/margolariak/GM.java

@@ -1490,7 +1490,7 @@ final class GM {
 			}
 		}
 		catch(Exception ex){
-			Log.e("Date format error", ex.toString());
+			Log.e("GM", "Date format error: " + ex.toString());
 		}
 
 		return output;

app/src/main/java/com/ivalentin/margolariak/HomeLayout.java

@@ -503,7 +503,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 			}
 		}
 		catch (Exception ex){
-			Log.e("Location", "Couldn't set up home location section: " + ex.toString());
+			Log.e("HOME_LAYOUT", "Couldn't set up home location section: " + ex.toString());
 		}
 
 		return false;
@@ -1059,7 +1059,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 			}
 		}
 		catch (Exception ex){
-			Log.e("Location manager", "Unable to stop location manager on destroy: " + ex.toString());
+			Log.e("HOME_LAYOUT", "Unable to stop location manager on destroy: " + ex.toString());
 		}
 		super.onDestroy();
 	}

app/src/main/java/com/ivalentin/margolariak/MainActivity.java

@@ -672,7 +672,7 @@ public class MainActivity extends Activity {
 			db.execSQL(GM.DB.QUERY.CREATE.VERSION);
 			db.close();
 		} catch (Exception ex) {
-			Log.e("Error creating database", ex.toString());
+			Log.e("MAIN_ACTIVITY", "Error creating database: " + ex.toString());
 		}
 	}
 
@@ -684,7 +684,7 @@ public class MainActivity extends Activity {
 		try {
 			getApplicationContext().deleteDatabase(GM.DB.NAME);
 		} catch (Exception ex) {
-			Log.e("Error deleting database", ex.toString());
+			Log.e("MAIN_ACTIVITY", "Error deleting database: " + ex.toString());
 		}
 	}
 

app/src/main/java/com/ivalentin/margolariak/PhotoLayout.java

@@ -57,7 +57,7 @@ public class PhotoLayout extends Fragment {
 		String albumPerm = bundle.getString("albumPerm", "");
 		int id = bundle.getInt("photo", -1);
 		if (id == -1) {
-			Log.e("Photo error", "No such photo: " + id);
+			Log.e("PHOTO_LAYOUT", "No such photo: " + id);
 			this.getActivity().onBackPressed();
 		}
 

app/src/main/java/com/ivalentin/margolariak/PostComment.java

@@ -127,7 +127,6 @@ class PostComment extends AsyncTask<String, String, Integer> {
 
 			String uri = GM.API.SERVER + GM.API.COMMENT.PATH + "?" + urlParams;
 			url = new URL(uri);
-			Log.e("URI", uri);
 
 			HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
 

app/src/main/java/com/ivalentin/margolariak/PostLayout.java

@@ -48,7 +48,7 @@ public class PostLayout extends Fragment {
 		Bundle bundle = this.getArguments();
 		final int id = bundle.getInt("post", -1);
 		if (id == -1){
-			Log.e("Post error", "No such post: " + id);
+			Log.e("POST_LAYOUT", "No such post: " + id);
 			this.getActivity().onBackPressed();
 		}
 

app/src/main/java/com/ivalentin/margolariak/ScheduleLayout.java

@@ -209,7 +209,7 @@ public class ScheduleLayout extends Fragment{
 		try {
 			calendar.setTime(dateFormat.parse(dates[selected] + " 06:00:00"));
 		} catch (Exception ex) {
-			Log.e("Datetime error", ex.toString());
+			Log.e("SCHEDULE_LAYOUT", "Datetime error: " + ex.toString());
 		}
 
 		SQLiteDatabase db = SQLiteDatabase.openDatabase(getActivity().getDatabasePath(GM.DB.NAME).getAbsolutePath(), null, SQLiteDatabase.NO_LOCALIZED_COLLATORS | SQLiteDatabase.OPEN_READONLY);
@@ -259,7 +259,7 @@ public class ScheduleLayout extends Fragment{
 		try {
 			c.setTime(sdf.parse(dates[selected]));
 		} catch (Exception ex) {
-			Log.e("Date parsing error", ex.toString());
+			Log.e("SCHEDULE_LAYOUT", "Date parsing error: " + ex.toString());
 			return eventCount;
 		}
 		c.add(Calendar.DATE, 1);  // number of days to add
@@ -351,7 +351,7 @@ public class ScheduleLayout extends Fragment{
 			sw.scrollTo(0, 0);
 		}
 		catch(Exception ex){
-			Log.e("Schedule scroll", "Culdnt get scrollview to scroll: " + ex.toString());
+			Log.e("SCHEDULE_LAYOUT", "Culdn't get scrollview to scroll: " + ex.toString());
 		}
 
 		return eventCount;
@@ -364,7 +364,6 @@ public class ScheduleLayout extends Fragment{
 	 * @param id The event id
 	 * @param schedule GM.SCHEDULE.GM or GM.SCHEDULE.CITY
 	 */
-	@SuppressWarnings("ConstantConditions")
 	private void showDialog(final int id, final int schedule){
 
 		//Create the dialog
@@ -518,7 +517,7 @@ public class ScheduleLayout extends Fragment{
 				}
 			}
 			catch (Exception ex){
-				Log.e("Error parsing date", ex.toString());
+				Log.e("SCHEDULE_LAYOUT", "Error parsing date: " + ex.toString());
 			}
 
 			//Set time
@@ -532,7 +531,7 @@ public class ScheduleLayout extends Fragment{
 				}
 			}
 			catch (ParseException ex){
-				Log.e("Error parsing time", ex.toString());
+				Log.e("SCHEDULE_LAYOUT", "Error parsing time: " + ex.toString());
 			}
 
 
@@ -634,7 +633,13 @@ public class ScheduleLayout extends Fragment{
 
 			//Show the dialog
 			WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
-			lp.copyFrom(dialog.getWindow().getAttributes());
+			try {
+				//noinspection ConstantConditions
+				lp.copyFrom(dialog.getWindow().getAttributes());
+			}
+			catch(NullPointerException e){
+				Log.e("SCHEDULE_LAYOUT", "Error setting dialog parameters: " + e.toString());
+			}
 			lp.width = WindowManager.LayoutParams.MATCH_PARENT;
 			lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
 			lp.gravity = Gravity.CENTER;

app/src/main/java/com/ivalentin/margolariak/SettingsActivity.java

@@ -249,7 +249,6 @@ public class SettingsActivity extends Activity {
 		//Set the web view
 		WebView wv = (WebView) dialog.findViewById(R.id.wv_changelog);
 		wv.getSettings().setAllowContentAccess(true);
-		Log.e("URL", "file:///android_assets/changelog_" + GM.getLang() + ".html");
 		wv.loadUrl("file:///android_asset/changelog_" + GM.getLang() + ".html");
 
 		//Set close button

app/src/main/java/com/ivalentin/margolariak/Sync.java

@@ -307,89 +307,11 @@ class Sync extends AsyncTask<Void, Void, Void> {
 			cursor.close();
 		}
 		catch (java.io.UnsupportedEncodingException ex){
-			Log.e("UTF-8", "Error encoding url for sync \"" + url + "\" - " + ex.toString());
+			Log.e("SYNC", "Error encoding url for sync \"" + url + "\" - " + ex.toString());
 		}
 		return url;
 	}
 
-	/**
-	 * Recreates the database, dropping and then creating all the tables containing
-	 * data. "location" and "notification" tables are untouched.
-	 *
-	 * @param db A database connection.
-	 *
-	 * @return False if there were errors, true otherwise.
-	 */
-	@SuppressWarnings("unused")
-	private boolean recreateDb(SQLiteDatabase db) {
-		boolean result = true;
-		try {
-			db.beginTransactionNonExclusive();
-			db.execSQL(GM.DB.QUERY.DROP.ACTIVITY);
-			db.execSQL(GM.DB.QUERY.DROP.ACTIVITY_COMMENT);
-			db.execSQL(GM.DB.QUERY.DROP.ACTIVITY_IMAGE);
-			db.execSQL(GM.DB.QUERY.DROP.ACTIVITY_ITINERARY);
-			db.execSQL(GM.DB.QUERY.DROP.ACTIVITY_TAG);
-			db.execSQL(GM.DB.QUERY.DROP.ALBUM);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL_DAY);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL_EVENT_CITY);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL_EVENT_GM);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL_EVENT_IMAGE);
-			db.execSQL(GM.DB.QUERY.DROP.FESTIVAL_OFFER);
-			db.execSQL(GM.DB.QUERY.DROP.PEOPLE);
-			db.execSQL(GM.DB.QUERY.DROP.PHOTO);
-			db.execSQL(GM.DB.QUERY.DROP.PHOTO_ALBUM);
-			db.execSQL(GM.DB.QUERY.DROP.PHOTO_COMMENT);
-			db.execSQL(GM.DB.QUERY.DROP.PLACE);
-			db.execSQL(GM.DB.QUERY.DROP.POST);
-			db.execSQL(GM.DB.QUERY.DROP.POST_COMMENT);
-			db.execSQL(GM.DB.QUERY.DROP.POST_IMAGE);
-			db.execSQL(GM.DB.QUERY.DROP.POST_TAG);
-			db.execSQL(GM.DB.QUERY.DROP.ROUTE);
-			db.execSQL(GM.DB.QUERY.DROP.ROUTE_POINT);
-			db.execSQL(GM.DB.QUERY.DROP.SETTINGS);
-			db.execSQL(GM.DB.QUERY.DROP.SPONSOR);
-			db.execSQL(GM.DB.QUERY.DROP.VERSION);
-			db.setTransactionSuccessful();
-			db.endTransaction();
-			publishProgress();
-			db.beginTransactionNonExclusive();
-			db.execSQL(GM.DB.QUERY.CREATE.ACTIVITY);
-			db.execSQL(GM.DB.QUERY.CREATE.ACTIVITY_COMMENT);
-			db.execSQL(GM.DB.QUERY.CREATE.ACTIVITY_IMAGE);
-			db.execSQL(GM.DB.QUERY.CREATE.ACTIVITY_ITINERARY);
-			db.execSQL(GM.DB.QUERY.CREATE.ACTIVITY_TAG);
-			db.execSQL(GM.DB.QUERY.CREATE.ALBUM);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL_DAY);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL_EVENT_CITY);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL_EVENT_GM);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL_EVENT_IMAGE);
-			db.execSQL(GM.DB.QUERY.CREATE.FESTIVAL_OFFER);
-			db.execSQL(GM.DB.QUERY.CREATE.PEOPLE);
-			db.execSQL(GM.DB.QUERY.CREATE.PHOTO);
-			db.execSQL(GM.DB.QUERY.CREATE.PHOTO_ALBUM);
-			db.execSQL(GM.DB.QUERY.CREATE.PHOTO_COMMENT);
-			db.execSQL(GM.DB.QUERY.CREATE.PLACE);
-			db.execSQL(GM.DB.QUERY.CREATE.POST);
-			db.execSQL(GM.DB.QUERY.CREATE.POST_COMMENT);
-			db.execSQL(GM.DB.QUERY.CREATE.POST_IMAGE);
-			db.execSQL(GM.DB.QUERY.CREATE.POST_TAG);
-			db.execSQL(GM.DB.QUERY.CREATE.ROUTE);
-			db.execSQL(GM.DB.QUERY.CREATE.ROUTE_POINT);
-			db.execSQL(GM.DB.QUERY.CREATE.SETTINGS);
-			db.execSQL(GM.DB.QUERY.CREATE.SPONSOR);
-			db.execSQL(GM.DB.QUERY.CREATE.VERSION);
-			db.setTransactionSuccessful();
-			db.endTransaction();
-		}
-		catch (Exception ex) {
-			result = false;
-			Log.e("SYNC", "Error recreating the database: " + ex.toString());
-		}
-		return result;
-	}
 
 	/**
 	 * Finds out the type of a column of a table in the database.