Merge branch 'master' of https://github.com/Codarama/haxsync

376c27ab5de2fed0fdbe4) # Conflicts: # haxingModule/haxingModule.iml
Codarama · Apr 6, 2016 · 39098c7 · 39098c7
2 parents a928689 + a317e45
commit 39098c7
Show file tree

Hide file tree

Showing 55 changed files with 944 additions and 74 deletions.
diff --git a/haxingModule/src/main/java/org/codarama/haxsync/SyncPreferences.java b/haxingModule/src/main/java/org/codarama/haxsync/SyncPreferences.java
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2015 Codarama.Org, All Rights Reserved
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 package org.codarama.haxsync;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/AboutPopup.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/AboutPopup.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/AuthorizationActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/AuthorizationActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/BirthdayReminder.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/BirthdayReminder.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/ContactDetailActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/ContactDetailActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/ContactListActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/ContactListActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/ContinueReceiver.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/ContinueReceiver.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/EventReminder.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/EventReminder.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/FriendPicker.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/FriendPicker.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/GoogleBackup.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/GoogleBackup.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/Help.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/Help.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/LoginActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/LoginActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/PostActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/PostActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/Preferences.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/Preferences.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/ProfileActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/ProfileActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/SyncPopup.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/SyncPopup.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.accounts.Account;

diff --git a/haxingModule/src/main/java/org/codarama/haxsync/activities/ThumbActivity.java b/haxingModule/src/main/java/org/codarama/haxsync/activities/ThumbActivity.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016 Codarama.org, All Rights Reserved
+ *
+ * Codarama HaxSync is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * Codarama HaxSync is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package org.codarama.haxsync.activities;
 
 import android.app.Activity;