Added a legal information that can be view by the user
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<manifest package="org.RickBarrette.osj.forum"
|
<manifest package="org.RickBarrette.osj.forum"
|
||||||
android:versionCode="195"
|
android:versionCode="215"
|
||||||
android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
||||||
|
|
||||||
<uses-sdk
|
<uses-sdk
|
||||||
@@ -42,6 +42,7 @@
|
|||||||
android:value=".TopicListActivity" />
|
android:value=".TopicListActivity" />
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="com.TwentyCodes.android.exception.ExceptionReportActivity" android:launchMode="singleInstance" android:noHistory="true" android:excludeFromRecents="true"></activity>
|
<activity android:name="com.TwentyCodes.android.exception.ExceptionReportActivity" android:launchMode="singleInstance" android:noHistory="true" android:excludeFromRecents="true"></activity>
|
||||||
|
<activity android:name="LegalActivity"></activity>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
184
OSJ Forum/assets/legal.html
Normal file
184
OSJ Forum/assets/legal.html
Normal file
@@ -0,0 +1,184 @@
|
|||||||
|
<strong>OJS Forum - Ocean State Jeepsters Forum</strong>
|
||||||
|
<br/>
|
||||||
|
<pre> Copyright © 2012 <a href="mailto:rickbarrette@gmail.com?subject=OSJ+Forum">Rick Barrette</a>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
<a href="#apachelicense">Apache Software License 2.0</a>
|
||||||
|
|
||||||
|
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.
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
<hr/>
|
||||||
|
|
||||||
|
<p>OSJ and Ocean State Jeepsters are Copyright © Ocean State Jeepsters 2007-2011<a href="http://www.oceanstatejeepsters.com/"> http://www.oceanstatejeepsters.com/</a></o><br/>
|
||||||
|
|
||||||
|
<hr/>
|
||||||
|
|
||||||
|
OSJ Forum uses the following open source libraries licensed under the <a href="#apachelicense">Apache Software License 2.0</a>.
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li> <a href="http://code.google.com/p/android-xmlrpc/">android-xmlrpc</a> - Very thin xmlrpc client library for Android platform
|
||||||
|
</ul>
|
||||||
|
<hr/>
|
||||||
|
|
||||||
|
<a name="apachelicense"/><p>Apache License<br></br>Version 2.0, January 2004<br></br>
|
||||||
|
<a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
|
||||||
|
<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
|
||||||
|
<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
|
||||||
|
<p>"License" shall mean the terms and conditions for use, reproduction, and
|
||||||
|
distribution as defined by Sections 1 through 9 of this document.</p>
|
||||||
|
<p>"Licensor" shall mean the copyright owner or entity authorized by the
|
||||||
|
copyright owner that is granting the License.</p>
|
||||||
|
<p>"Legal Entity" shall mean the union of the acting entity and all other
|
||||||
|
entities that control, are controlled by, or are under common control with
|
||||||
|
that entity. For the purposes of this definition, "control" means (i) the
|
||||||
|
power, direct or indirect, to cause the direction or management of such
|
||||||
|
entity, whether by contract or otherwise, or (ii) ownership of fifty
|
||||||
|
percent (50%) or more of the outstanding shares, or (iii) beneficial
|
||||||
|
ownership of such entity.</p>
|
||||||
|
<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
|
||||||
|
permissions granted by this License.</p>
|
||||||
|
<p>"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation source,
|
||||||
|
and configuration files.</p>
|
||||||
|
<p>"Object" form shall mean any form resulting from mechanical transformation
|
||||||
|
or translation of a Source form, including but not limited to compiled
|
||||||
|
object code, generated documentation, and conversions to other media types.</p>
|
||||||
|
<p>"Work" shall mean the work of authorship, whether in Source or Object form,
|
||||||
|
made available under the License, as indicated by a copyright notice that
|
||||||
|
is included in or attached to the work (an example is provided in the
|
||||||
|
Appendix below).</p>
|
||||||
|
<p>"Derivative Works" shall mean any work, whether in Source or Object form,
|
||||||
|
that is based on (or derived from) the Work and for which the editorial
|
||||||
|
revisions, annotations, elaborations, or other modifications represent, as
|
||||||
|
a whole, an original work of authorship. For the purposes of this License,
|
||||||
|
Derivative Works shall not include works that remain separable from, or
|
||||||
|
merely link (or bind by name) to the interfaces of, the Work and Derivative
|
||||||
|
Works thereof.</p>
|
||||||
|
<p>"Contribution" shall mean any work of authorship, including the original
|
||||||
|
version of the Work and any modifications or additions to that Work or
|
||||||
|
Derivative Works thereof, that is intentionally submitted to Licensor for
|
||||||
|
inclusion in the Work by the copyright owner or by an individual or Legal
|
||||||
|
Entity authorized to submit on behalf of the copyright owner. For the
|
||||||
|
purposes of this definition, "submitted" means any form of electronic,
|
||||||
|
verbal, or written communication sent to the Licensor or its
|
||||||
|
representatives, including but not limited to communication on electronic
|
||||||
|
mailing lists, source code control systems, and issue tracking systems that
|
||||||
|
are managed by, or on behalf of, the Licensor for the purpose of discussing
|
||||||
|
and improving the Work, but excluding communication that is conspicuously
|
||||||
|
marked or otherwise designated in writing by the copyright owner as "Not a
|
||||||
|
Contribution."</p>
|
||||||
|
<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
|
||||||
|
behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.</p>
|
||||||
|
<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
|
||||||
|
terms and conditions of this License, each Contributor hereby grants to You
|
||||||
|
a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of, publicly
|
||||||
|
display, publicly perform, sublicense, and distribute the Work and such
|
||||||
|
Derivative Works in Source or Object form.</p>
|
||||||
|
<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
|
||||||
|
and conditions of this License, each Contributor hereby grants to You a
|
||||||
|
perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made, use,
|
||||||
|
offer to sell, sell, import, and otherwise transfer the Work, where such
|
||||||
|
license applies only to those patent claims licensable by such Contributor
|
||||||
|
that are necessarily infringed by their Contribution(s) alone or by
|
||||||
|
combination of their Contribution(s) with the Work to which such
|
||||||
|
Contribution(s) was submitted. If You institute patent litigation against
|
||||||
|
any entity (including a cross-claim or counterclaim in a lawsuit) alleging
|
||||||
|
that the Work or a Contribution incorporated within the Work constitutes
|
||||||
|
direct or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate as of the
|
||||||
|
date such litigation is filed.</p>
|
||||||
|
<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
|
||||||
|
distribute copies of the Work or Derivative Works thereof in any medium,
|
||||||
|
with or without modifications, and in Source or Object form, provided that
|
||||||
|
You meet the following conditions:</p>
|
||||||
|
<ol>
|
||||||
|
<li>
|
||||||
|
<p>You must give any other recipients of the Work or Derivative Works a
|
||||||
|
copy of this License; and</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<p>You must cause any modified files to carry prominent notices stating
|
||||||
|
that You changed the files; and</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<p>You must retain, in the Source form of any Derivative Works that You
|
||||||
|
distribute, all copyright, patent, trademark, and attribution notices from
|
||||||
|
the Source form of the Work, excluding those notices that do not pertain to
|
||||||
|
any part of the Derivative Works; and</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<p>If the Work includes a "NOTICE" text file as part of its distribution,
|
||||||
|
then any Derivative Works that You distribute must include a readable copy
|
||||||
|
of the attribution notices contained within such NOTICE file, excluding
|
||||||
|
those notices that do not pertain to any part of the Derivative Works, in
|
||||||
|
at least one of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or documentation,
|
||||||
|
if provided along with the Derivative Works; or, within a display generated
|
||||||
|
by the Derivative Works, if and wherever such third-party notices normally
|
||||||
|
appear. The contents of the NOTICE file are for informational purposes only
|
||||||
|
and do not modify the License. You may add Your own attribution notices
|
||||||
|
within Derivative Works that You distribute, alongside or as an addendum to
|
||||||
|
the NOTICE text from the Work, provided that such additional attribution
|
||||||
|
notices cannot be construed as modifying the License.
|
||||||
|
You may add Your own copyright statement to Your modifications and may
|
||||||
|
provide additional or different license terms and conditions for use,
|
||||||
|
reproduction, or distribution of Your modifications, or for any such
|
||||||
|
Derivative Works as a whole, provided Your use, reproduction, and
|
||||||
|
distribution of the Work otherwise complies with the conditions stated in
|
||||||
|
this License.</p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
|
||||||
|
explicitly state otherwise, any Contribution intentionally submitted for
|
||||||
|
inclusion in the Work by You to the Licensor shall be under the terms and
|
||||||
|
conditions of this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify the
|
||||||
|
terms of any separate license agreement you may have executed with Licensor
|
||||||
|
regarding such Contributions.</p>
|
||||||
|
<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
|
||||||
|
permission to use the trade names, trademarks, service marks, or product
|
||||||
|
names of the Licensor, except as required for reasonable and customary use
|
||||||
|
in describing the origin of the Work and reproducing the content of the
|
||||||
|
NOTICE file.</p>
|
||||||
|
<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
|
||||||
|
applicable law or agreed to in writing, Licensor provides the Work (and
|
||||||
|
each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
|
||||||
|
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
|
||||||
|
without limitation, any warranties or conditions of TITLE,
|
||||||
|
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
|
||||||
|
are solely responsible for determining the appropriateness of using or
|
||||||
|
redistributing the Work and assume any risks associated with Your exercise
|
||||||
|
of permissions under this License.</p>
|
||||||
|
<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
|
||||||
|
under no legal theory, whether in tort (including negligence), contract, or
|
||||||
|
otherwise, unless required by applicable law (such as deliberate and
|
||||||
|
grossly negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a result
|
||||||
|
of this License or out of the use or inability to use the Work (including
|
||||||
|
but not limited to damages for loss of goodwill, work stoppage, computer
|
||||||
|
failure or malfunction, or any and all other commercial damages or losses),
|
||||||
|
even if such Contributor has been advised of the possibility of such
|
||||||
|
damages.</p>
|
||||||
|
<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
|
||||||
|
While redistributing the Work or Derivative Works thereof, You may choose
|
||||||
|
to offer, and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this License.
|
||||||
|
However, in accepting such obligations, You may act only on Your own behalf
|
||||||
|
and on Your sole responsibility, not on behalf of any other Contributor,
|
||||||
|
and only if You agree to indemnify, defend, and hold each Contributor
|
||||||
|
harmless for any liability incurred by, or claims asserted against, such
|
||||||
|
Contributor by reason of your accepting any such warranty or additional
|
||||||
|
liability.</p>
|
||||||
|
<p>END OF TERMS AND CONDITIONS</p>
|
||||||
6
OSJ Forum/res/layout/leagal_activity.xml
Normal file
6
OSJ Forum/res/layout/leagal_activity.xml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<WebView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:id="@+id/webview" >
|
||||||
|
</WebView>
|
||||||
4
OSJ Forum/res/menu/main_menu.xml
Normal file
4
OSJ Forum/res/menu/main_menu.xml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >z
|
||||||
|
<item android:id="@+id/legal" android:showAsAction="never" android:title="@string/legal"></item>
|
||||||
|
</menu>
|
||||||
@@ -13,5 +13,6 @@
|
|||||||
<string name="new_posts">New Posts</string>
|
<string name="new_posts">New Posts</string>
|
||||||
<string name="test_username">test</string>
|
<string name="test_username">test</string>
|
||||||
<string name="test_password">Test1</string>
|
<string name="test_password">Test1</string>
|
||||||
<string name="osj_server">https://oceanstatejeepsters.ipower.com</string>
|
<string name="osj_server">https://oceanstatejeepsters.ipower.com/forum/mobiquo/mobiquo.php</string>
|
||||||
|
<string name="legal">Legal</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -25,6 +25,9 @@ import android.content.Intent;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.app.FragmentActivity;
|
import android.support.v4.app.FragmentActivity;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.TwentyCodes.android.exception.ExceptionHandler;
|
import com.TwentyCodes.android.exception.ExceptionHandler;
|
||||||
|
|
||||||
@@ -49,6 +52,13 @@ public class ForumListActivity extends FragmentActivity implements OnItemSelecte
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
final MenuInflater inflater = getMenuInflater();
|
||||||
|
inflater.inflate(R.menu.main_menu, menu);
|
||||||
|
return super.onCreateOptionsMenu(menu);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemSelected(final Fragment listFragment, final String id) {
|
public void onItemSelected(final Fragment listFragment, final String id) {
|
||||||
if(listFragment instanceof ForumDetailFragment){
|
if(listFragment instanceof ForumDetailFragment){
|
||||||
@@ -70,5 +80,15 @@ public class ForumListActivity extends FragmentActivity implements OnItemSelecte
|
|||||||
detailIntent.putExtra(ForumDetailFragment.ARG_ITEM_ID, id);
|
detailIntent.putExtra(ForumDetailFragment.ARG_ITEM_ID, id);
|
||||||
startActivity(detailIntent);
|
startActivity(detailIntent);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch(item.getItemId()){
|
||||||
|
case R.id.legal:
|
||||||
|
startActivity(new Intent(this, LegalActivity.class));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
40
OSJ Forum/src/org/RickBarrette/osj/forum/LegalActivity.java
Normal file
40
OSJ Forum/src/org/RickBarrette/osj/forum/LegalActivity.java
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
/**
|
||||||
|
* LegalActivity.java
|
||||||
|
* @date Sep 16, 2012
|
||||||
|
* @author ricky barrette
|
||||||
|
*
|
||||||
|
* Copyright 2012 Richard Barrette
|
||||||
|
*
|
||||||
|
* 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.RickBarrette.osj.forum;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.webkit.WebView;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a super simple web activity to display legal information to the user
|
||||||
|
* @author ricky barrette
|
||||||
|
*/
|
||||||
|
public class LegalActivity extends Activity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.leagal_activity);
|
||||||
|
WebView wv = (WebView) findViewById(R.id.webview);
|
||||||
|
wv.loadUrl("file:///android_asset/legal.html");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
package org.xmlrpc.android;
|
package org.xmlrpc.android;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.io.Reader;
|
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user