From 6d7df9c55d9dc215be3a07d4ddd5e69b473102b2 Mon Sep 17 00:00:00 2001 From: Nathaniel McCallum Date: Mon, 21 Oct 2013 17:36:44 -0400 Subject: [PATCH] Relicense to Apache 2.0 --- AndroidManifest.xml | 22 +- COPYING | 202 ++++++++++++++++++ res/layout/common.xml | 22 +- res/layout/hotp.xml | 22 +- res/layout/main.xml | 20 ++ res/layout/manual.xml | 20 ++ res/layout/totp.xml | 22 +- res/menu/main.xml | 22 +- .../fedorahosted/freeotp/AddTokenDialog.java | 20 ++ .../freeotp/AddTokenSecretTextWatcher.java | 20 ++ .../freeotp/AddTokenTextWatcher.java | 20 ++ .../freeotp/CircleProgressBar.java | 20 +- .../fedorahosted/freeotp/MainActivity.java | 20 +- src/org/fedorahosted/freeotp/Token.java | 20 +- .../fedorahosted/freeotp/TokenAdapter.java | 20 +- 15 files changed, 388 insertions(+), 104 deletions(-) create mode 100644 COPYING diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6d60b20..32c5719 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,21 +5,19 @@ - Authors: Nathaniel McCallum - - Copyright (C) 2013 Nathaniel McCallum, Red Hat - - see file 'COPYING' for use and warranty information - - - This program 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 3 of the License, or - - (at your option) any later version. + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at - - - This program 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. + - http://www.apache.org/licenses/LICENSE-2.0 - - - You should have received a copy of the GNU General Public License - - along with this program. If not, see . - --> + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + --> - - Copyright (C) 2013 Nathaniel McCallum, Red Hat - - see file 'COPYING' for use and warranty information - - - This program 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 3 of the License, or - - (at your option) any later version. + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at - - - This program 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. + - http://www.apache.org/licenses/LICENSE-2.0 - - - You should have received a copy of the GNU General Public License - - along with this program. If not, see . - --> + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + --> - - Copyright (C) 2013 Nathaniel McCallum, Red Hat - - see file 'COPYING' for use and warranty information - - - This program 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 3 of the License, or - - (at your option) any later version. + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at - - - This program 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. + - http://www.apache.org/licenses/LICENSE-2.0 - - - You should have received a copy of the GNU General Public License - - along with this program. If not, see . - --> + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + --> + + + + - - Copyright (C) 2013 Nathaniel McCallum, Red Hat - - see file 'COPYING' for use and warranty information - - - This program 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 3 of the License, or - - (at your option) any later version. + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at - - - This program 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. + - http://www.apache.org/licenses/LICENSE-2.0 - - - You should have received a copy of the GNU General Public License - - along with this program. If not, see . - --> + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + --> - - Copyright (C) 2013 Nathaniel McCallum, Red Hat - - see file 'COPYING' for use and warranty information - - - This program 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 3 of the License, or - - (at your option) any later version. + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at - - - This program 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. + - http://www.apache.org/licenses/LICENSE-2.0 - - - You should have received a copy of the GNU General Public License - - along with this program. If not, see . - --> + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + --> + * + * Copyright (C) 2013 Nathaniel McCallum, Red Hat + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.fedorahosted.freeotp; import java.util.Locale; diff --git a/src/org/fedorahosted/freeotp/AddTokenSecretTextWatcher.java b/src/org/fedorahosted/freeotp/AddTokenSecretTextWatcher.java index eaf335d..68752ee 100644 --- a/src/org/fedorahosted/freeotp/AddTokenSecretTextWatcher.java +++ b/src/org/fedorahosted/freeotp/AddTokenSecretTextWatcher.java @@ -1,3 +1,23 @@ +/* + * FreeOTP + * + * Authors: Nathaniel McCallum + * + * Copyright (C) 2013 Nathaniel McCallum, Red Hat + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.fedorahosted.freeotp; import android.app.AlertDialog; diff --git a/src/org/fedorahosted/freeotp/AddTokenTextWatcher.java b/src/org/fedorahosted/freeotp/AddTokenTextWatcher.java index 5102ddd..1f3a4ad 100644 --- a/src/org/fedorahosted/freeotp/AddTokenTextWatcher.java +++ b/src/org/fedorahosted/freeotp/AddTokenTextWatcher.java @@ -1,3 +1,23 @@ +/* + * FreeOTP + * + * Authors: Nathaniel McCallum + * + * Copyright (C) 2013 Nathaniel McCallum, Red Hat + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.fedorahosted.freeotp; import android.app.AlertDialog; diff --git a/src/org/fedorahosted/freeotp/CircleProgressBar.java b/src/org/fedorahosted/freeotp/CircleProgressBar.java index 95c556a..e9772e6 100644 --- a/src/org/fedorahosted/freeotp/CircleProgressBar.java +++ b/src/org/fedorahosted/freeotp/CircleProgressBar.java @@ -4,20 +4,18 @@ * Authors: Nathaniel McCallum * * Copyright (C) 2013 Nathaniel McCallum, Red Hat - * see file 'COPYING' for use and warranty information * - * This program 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 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.fedorahosted.freeotp; diff --git a/src/org/fedorahosted/freeotp/MainActivity.java b/src/org/fedorahosted/freeotp/MainActivity.java index 9a31a94..ad62761 100644 --- a/src/org/fedorahosted/freeotp/MainActivity.java +++ b/src/org/fedorahosted/freeotp/MainActivity.java @@ -4,20 +4,18 @@ * Authors: Nathaniel McCallum * * Copyright (C) 2013 Nathaniel McCallum, Red Hat - * see file 'COPYING' for use and warranty information * - * This program 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 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /* diff --git a/src/org/fedorahosted/freeotp/Token.java b/src/org/fedorahosted/freeotp/Token.java index ca51633..b7416c8 100644 --- a/src/org/fedorahosted/freeotp/Token.java +++ b/src/org/fedorahosted/freeotp/Token.java @@ -4,20 +4,18 @@ * Authors: Nathaniel McCallum * * Copyright (C) 2013 Nathaniel McCallum, Red Hat - * see file 'COPYING' for use and warranty information * - * This program 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 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.fedorahosted.freeotp; diff --git a/src/org/fedorahosted/freeotp/TokenAdapter.java b/src/org/fedorahosted/freeotp/TokenAdapter.java index 5ad3310..1915548 100644 --- a/src/org/fedorahosted/freeotp/TokenAdapter.java +++ b/src/org/fedorahosted/freeotp/TokenAdapter.java @@ -4,20 +4,18 @@ * Authors: Nathaniel McCallum * * Copyright (C) 2013 Nathaniel McCallum, Red Hat - * see file 'COPYING' for use and warranty information * - * This program 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 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.fedorahosted.freeotp; -- 2.43.2