diff --git a/Chan/AndroidManifest.xml b/Chan/AndroidManifest.xml index 4341339d..3a1c33eb 100644 --- a/Chan/AndroidManifest.xml +++ b/Chan/AndroidManifest.xml @@ -1,8 +1,8 @@ - - - diff --git a/Chan/assets/html/licences.html b/Chan/assets/html/licences.html index 17c2cfe9..f06cf4bc 100644 --- a/Chan/assets/html/licences.html +++ b/Chan/assets/html/licences.html @@ -58,6 +58,22 @@ limitations under the License.
+

jsoup License

+ 
+        
+The jsoup code-base (include source and compiled packages) are distributed under the open source MIT license as described below.
+
+The MIT License
+Copyright © 2009 - 2013 Jonathan Hedley (jonathan@hedley.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+        
+
+
diff --git a/Chan/gradle/wrapper/gradle-wrapper.jar b/Chan/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 8c0fb64a..00000000 Binary files a/Chan/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/Chan/gradle/wrapper/gradle-wrapper.properties b/Chan/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 5c22dec0..00000000 --- a/Chan/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Apr 10 15:27:10 PDT 2013 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip diff --git a/Chan/libs/ormlite-android-4.48.jar b/Chan/libs/ormlite-android-4.48.jar new file mode 100644 index 00000000..75c2af42 Binary files /dev/null and b/Chan/libs/ormlite-android-4.48.jar differ diff --git a/Chan/libs/ormlite-core-4.48.jar b/Chan/libs/ormlite-core-4.48.jar new file mode 100644 index 00000000..e3e13371 Binary files /dev/null and b/Chan/libs/ormlite-core-4.48.jar differ diff --git a/Chan/libs/sugar-1.2.jar b/Chan/libs/sugar-1.2.jar deleted file mode 100644 index 2e6f0290..00000000 Binary files a/Chan/libs/sugar-1.2.jar and /dev/null differ diff --git a/Chan/src/org/floens/chan/ChanApplication.java b/Chan/src/org/floens/chan/ChanApplication.java index c08a5dce..c8ef962a 100644 --- a/Chan/src/org/floens/chan/ChanApplication.java +++ b/Chan/src/org/floens/chan/ChanApplication.java @@ -16,7 +16,7 @@ import com.android.volley.toolbox.ImageLoader; import com.android.volley.toolbox.Volley; public class ChanApplication extends Application { - public static final boolean DEVELOPER_MODE = true; + public static final boolean DEVELOPER_MODE = false; private static ChanApplication instance; private static RequestQueue volleyRequestQueue; diff --git a/Chan/src/org/floens/chan/activity/BaseActivity.java b/Chan/src/org/floens/chan/activity/BaseActivity.java index 35921181..448c5594 100644 --- a/Chan/src/org/floens/chan/activity/BaseActivity.java +++ b/Chan/src/org/floens/chan/activity/BaseActivity.java @@ -5,8 +5,8 @@ import org.floens.chan.R; import org.floens.chan.adapter.PinnedAdapter; import org.floens.chan.animation.SwipeDismissListViewTouchListener; import org.floens.chan.animation.SwipeDismissListViewTouchListener.DismissCallbacks; -import org.floens.chan.entity.Pin; -import org.floens.chan.entity.Post; +import org.floens.chan.model.Pin; +import org.floens.chan.model.Post; import android.app.Activity; import android.app.AlertDialog; @@ -230,7 +230,7 @@ public abstract class BaseActivity extends Activity implements PanelSlideListene if (!TextUtils.isEmpty(value)) { pin.loadable.title = value; - ChanApplication.getPinnedManager().refresh(); + ChanApplication.getPinnedManager().update(pin); } } }) diff --git a/Chan/src/org/floens/chan/activity/BoardActivity.java b/Chan/src/org/floens/chan/activity/BoardActivity.java index b90c31c0..180e4390 100644 --- a/Chan/src/org/floens/chan/activity/BoardActivity.java +++ b/Chan/src/org/floens/chan/activity/BoardActivity.java @@ -5,11 +5,11 @@ import java.util.List; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Pin; -import org.floens.chan.entity.Post; import org.floens.chan.fragment.ReplyFragment; import org.floens.chan.fragment.ThreadFragment; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Pin; +import org.floens.chan.model.Post; import org.floens.chan.net.ChanUrls; import android.app.ActionBar; @@ -339,12 +339,10 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio } catch (NumberFormatException e) {} if (no >= 0 && ChanApplication.getBoardManager().getBoardExists(rawBoard)) { - boardLoadable.board = rawBoard; boardSetByIntent = true; - startLoadingBoard(boardLoadable); + startLoadingBoard(new Loadable(rawBoard)); startLoadingThread(new Loadable(rawBoard, no)); - finish(); } else { handleIntentURIFallback(startUri.toString()); return; diff --git a/Chan/src/org/floens/chan/activity/BoardEditor.java b/Chan/src/org/floens/chan/activity/BoardEditor.java index b644d8ca..6ea7ad72 100644 --- a/Chan/src/org/floens/chan/activity/BoardEditor.java +++ b/Chan/src/org/floens/chan/activity/BoardEditor.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import org.floens.chan.ChanApplication; import org.floens.chan.R; import org.floens.chan.adapter.BoardEditAdapter; -import org.floens.chan.entity.Board; +import org.floens.chan.model.Board; import org.floens.chan.view.DynamicListView; import android.app.Activity; diff --git a/Chan/src/org/floens/chan/activity/CatalogActivity.java b/Chan/src/org/floens/chan/activity/CatalogActivity.java index bf6418fb..67c2d63e 100644 --- a/Chan/src/org/floens/chan/activity/CatalogActivity.java +++ b/Chan/src/org/floens/chan/activity/CatalogActivity.java @@ -1,11 +1,11 @@ package org.floens.chan.activity; import org.floens.chan.R; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Loadable.Mode; -import org.floens.chan.entity.Pin; -import org.floens.chan.entity.Post; import org.floens.chan.fragment.ThreadFragment; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Pin; +import org.floens.chan.model.Post; +import org.floens.chan.model.Loadable.Mode; import org.floens.chan.net.ChanUrls; import android.os.Bundle; diff --git a/Chan/src/org/floens/chan/activity/ReplyActivity.java b/Chan/src/org/floens/chan/activity/ReplyActivity.java index 062c8a24..850918b2 100644 --- a/Chan/src/org/floens/chan/activity/ReplyActivity.java +++ b/Chan/src/org/floens/chan/activity/ReplyActivity.java @@ -1,7 +1,7 @@ package org.floens.chan.activity; -import org.floens.chan.entity.Loadable; import org.floens.chan.fragment.ReplyFragment; +import org.floens.chan.model.Loadable; import android.app.Activity; import android.app.FragmentTransaction; diff --git a/Chan/src/org/floens/chan/activity/ThreadActivity.java b/Chan/src/org/floens/chan/activity/ThreadActivity.java deleted file mode 100644 index a630218a..00000000 --- a/Chan/src/org/floens/chan/activity/ThreadActivity.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.floens.chan.activity; - -import org.floens.chan.ChanApplication; -import org.floens.chan.R; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Pin; -import org.floens.chan.entity.Post; -import org.floens.chan.fragment.ReplyFragment; -import org.floens.chan.fragment.ThreadFragment; -import org.floens.chan.net.ChanUrls; - -import android.app.FragmentTransaction; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.Menu; -import android.view.MenuItem; - -public class ThreadActivity extends BaseActivity { - private Loadable loadable = new Loadable(); - - private ThreadFragment threadFragment; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - loadable.mode = Loadable.Mode.THREAD; - - threadFragment = ThreadFragment.newInstance(this); - FragmentTransaction ft = getFragmentManager().beginTransaction(); - ft.replace(R.id.right_pane, threadFragment); - ft.commitAllowingStateLoss(); - - Bundle bundle = getIntent().getExtras(); - - // Favor savedInstanceState bundle over intent bundle: - // the intent bundle may be old, for example when the user - // switches the loadable through the drawer. - if (savedInstanceState != null) { - loadable.readFromBundle(this, savedInstanceState); - } else if (bundle != null) { - loadable.readFromBundle(this, bundle); - } else { - finish(); - } - - startLoading(loadable); - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - - loadable.writeToBundle(this, outState); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { -// getMenuInflater().inflate(R.menu.thread, menu); - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch(item.getItemId()) { - case R.id.action_reload: - threadFragment.reload(); - - return true; - case R.id.action_reply: - ReplyFragment reply = ReplyFragment.newInstance(loadable); - reply.show(getFragmentManager(), "replyDialog"); - - return true; - case R.id.action_pin: - Pin pin = new Pin(); - pin.loadable = loadable; - - ChanApplication.getPinnedManager().add(pin); - - drawer.openDrawer(drawerList); - - return true; - case R.id.action_open_browser: - openUrl(ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no)); - - return true; - case android.R.id.home: - finish(); - - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onDrawerClicked(Pin pin) { - drawer.closeDrawer(drawerList); - - loadable = pin.loadable; - - startLoading(loadable); - } - - private void startLoading(Loadable loadable) { - Pin pin = ChanApplication.getPinnedManager().findPinByLoadable(loadable); - if (pin != null) { - // Use the loadable from the pin. - // This way we can store the listview position in the pin loadable, - // and not in a separate loadable instance. - loadable = pin.loadable; - } - - threadFragment.startLoading(loadable); - - setShareUrl(ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no)); - - if (TextUtils.isEmpty(loadable.title)) { - loadable.title = "/" + loadable.board + "/" + loadable.no; - } - - getActionBar().setTitle(loadable.title); - } - - @Override - public void onOPClicked(Post post) { - threadFragment.getThreadManager().showPostLinkables(post); - } -} diff --git a/Chan/src/org/floens/chan/adapter/BoardEditAdapter.java b/Chan/src/org/floens/chan/adapter/BoardEditAdapter.java index 13c0d880..a1bb0698 100644 --- a/Chan/src/org/floens/chan/adapter/BoardEditAdapter.java +++ b/Chan/src/org/floens/chan/adapter/BoardEditAdapter.java @@ -21,7 +21,7 @@ import java.util.List; import org.floens.chan.R; import org.floens.chan.activity.BoardEditor; -import org.floens.chan.entity.Board; +import org.floens.chan.model.Board; import android.content.Context; import android.view.LayoutInflater; diff --git a/Chan/src/org/floens/chan/adapter/PinnedAdapter.java b/Chan/src/org/floens/chan/adapter/PinnedAdapter.java index 81db45b1..a279be5d 100644 --- a/Chan/src/org/floens/chan/adapter/PinnedAdapter.java +++ b/Chan/src/org/floens/chan/adapter/PinnedAdapter.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.List; import org.floens.chan.R; -import org.floens.chan.entity.Pin; +import org.floens.chan.model.Pin; import android.content.Context; import android.view.LayoutInflater; @@ -40,8 +40,6 @@ public class PinnedAdapter extends ArrayAdapter { LinearLayout view = null; - // Log.i("Chan", "Position: " + position + ", " + getItemId(position)); - Pin item = getItem(position); if (item.type == Pin.Type.HEADER) { view = (LinearLayout) inflater.inflate(R.layout.drawer_item_header, null); diff --git a/Chan/src/org/floens/chan/adapter/PostAdapter.java b/Chan/src/org/floens/chan/adapter/PostAdapter.java index 90615a95..4a474a98 100644 --- a/Chan/src/org/floens/chan/adapter/PostAdapter.java +++ b/Chan/src/org/floens/chan/adapter/PostAdapter.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import org.floens.chan.R; -import org.floens.chan.entity.Post; import org.floens.chan.manager.ThreadManager; +import org.floens.chan.model.Post; import org.floens.chan.view.PostView; import android.content.Context; diff --git a/Chan/src/org/floens/chan/entity/Pin.java b/Chan/src/org/floens/chan/entity/Pin.java deleted file mode 100644 index f1f249ae..00000000 --- a/Chan/src/org/floens/chan/entity/Pin.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.floens.chan.entity; - -import java.util.ArrayList; -import java.util.List; - -import org.floens.chan.net.ThreadLoader; -import org.floens.chan.net.ThreadLoader.ThreadLoaderListener; - -import com.android.volley.VolleyError; - -public class Pin { - public Type type = Type.THREAD; - public Loadable loadable = new Loadable("", -1); - - private int count; - private int newCount; - private final boolean watch = true; - private boolean error = false; - private List postList = new ArrayList(); - public ThreadLoader threadLoader = new ThreadLoader(new ThreadLoaderListener() { - @Override - public void onError(VolleyError volleyError) { - error = true; - } - - @Override - public void onData(List result) { - postList = result; - - int totalCount = result.size(); - - newCount = totalCount - count; - count = totalCount; - } - }); - - public void startLoading() { - if (type != Type.THREAD || error) return; - - // threadLoader.start(new Loadable(board, no)); - } - - public boolean getShouldWatch() { - return watch; - } - - public boolean getHasLoadingError() { - return error; - } - - public int getCount() { - return count; - } - - /** - * Get how many new posts there are. Calling this will reset the internal - * counter to zero, so don't call this multiple times for new info. - * @return Amount of new posts - */ - public int getNewCount() { - int newer = newCount; - newCount = 0; - - return newer; - } - - /** Header is used to display a static header in the drawer listview. */ - public static enum Type { - HEADER, - THREAD - }; -} - - - - - diff --git a/Chan/src/org/floens/chan/fragment/PostRepliesFragment.java b/Chan/src/org/floens/chan/fragment/PostRepliesFragment.java index 419a03dc..4b71b70e 100644 --- a/Chan/src/org/floens/chan/fragment/PostRepliesFragment.java +++ b/Chan/src/org/floens/chan/fragment/PostRepliesFragment.java @@ -3,14 +3,13 @@ package org.floens.chan.fragment; import java.util.List; import org.floens.chan.R; -import org.floens.chan.entity.Post; import org.floens.chan.manager.ThreadManager; +import org.floens.chan.model.Post; import org.floens.chan.view.PostView; import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; -import android.content.res.Resources; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -64,8 +63,6 @@ public class PostRepliesFragment extends DialogFragment { View container = inflater.inflate(R.layout.post_replies, null); - Resources resources = context.getResources(); - listView = (ListView) container.findViewById(R.id.post_list); container.findViewById(R.id.replies_back).setOnClickListener(new View.OnClickListener() { diff --git a/Chan/src/org/floens/chan/fragment/ReplyFragment.java b/Chan/src/org/floens/chan/fragment/ReplyFragment.java index 13129dc3..1085732b 100644 --- a/Chan/src/org/floens/chan/fragment/ReplyFragment.java +++ b/Chan/src/org/floens/chan/fragment/ReplyFragment.java @@ -4,10 +4,10 @@ import java.io.File; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Reply; import org.floens.chan.manager.ReplyManager; import org.floens.chan.manager.ReplyManager.ReplyResponse; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Reply; import org.floens.chan.net.ChanUrls; import org.floens.chan.utils.ImageDecoder; import org.floens.chan.utils.LoadView; diff --git a/Chan/src/org/floens/chan/fragment/ThreadFragment.java b/Chan/src/org/floens/chan/fragment/ThreadFragment.java index a75def12..f9ae26a6 100644 --- a/Chan/src/org/floens/chan/fragment/ThreadFragment.java +++ b/Chan/src/org/floens/chan/fragment/ThreadFragment.java @@ -6,11 +6,11 @@ import java.util.List; import org.floens.chan.R; import org.floens.chan.activity.BaseActivity; import org.floens.chan.adapter.PostAdapter; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Post; import org.floens.chan.imageview.activity.ImageViewActivity; import org.floens.chan.manager.ThreadManager; import org.floens.chan.manager.ThreadManager.ThreadListener; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Post; import org.floens.chan.net.EndOfLineException; import org.floens.chan.utils.LoadView; diff --git a/Chan/src/org/floens/chan/imageview/activity/ImageViewActivity.java b/Chan/src/org/floens/chan/imageview/activity/ImageViewActivity.java index d2af6be2..23d8b500 100644 --- a/Chan/src/org/floens/chan/imageview/activity/ImageViewActivity.java +++ b/Chan/src/org/floens/chan/imageview/activity/ImageViewActivity.java @@ -3,9 +3,9 @@ package org.floens.chan.imageview.activity; import java.util.ArrayList; import org.floens.chan.R; -import org.floens.chan.entity.Post; import org.floens.chan.imageview.ImageSaver; import org.floens.chan.imageview.adapter.ImageViewAdapter; +import org.floens.chan.model.Post; import android.app.ActionBar; import android.app.Activity; diff --git a/Chan/src/org/floens/chan/imageview/adapter/ImageViewAdapter.java b/Chan/src/org/floens/chan/imageview/adapter/ImageViewAdapter.java index e5de0ffc..da88d4cc 100644 --- a/Chan/src/org/floens/chan/imageview/adapter/ImageViewAdapter.java +++ b/Chan/src/org/floens/chan/imageview/adapter/ImageViewAdapter.java @@ -2,9 +2,9 @@ package org.floens.chan.imageview.adapter; import java.util.ArrayList; -import org.floens.chan.entity.Post; import org.floens.chan.imageview.activity.ImageViewActivity; import org.floens.chan.imageview.fragment.ImageViewFragment; +import org.floens.chan.model.Post; import android.app.Fragment; import android.app.FragmentManager; diff --git a/Chan/src/org/floens/chan/imageview/fragment/ImageViewFragment.java b/Chan/src/org/floens/chan/imageview/fragment/ImageViewFragment.java index 4033b9f9..9d9f5316 100644 --- a/Chan/src/org/floens/chan/imageview/fragment/ImageViewFragment.java +++ b/Chan/src/org/floens/chan/imageview/fragment/ImageViewFragment.java @@ -2,9 +2,9 @@ package org.floens.chan.imageview.fragment; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Post; import org.floens.chan.imageview.activity.ImageViewActivity; import org.floens.chan.imageview.view.NetworkPhotoView; +import org.floens.chan.model.Post; import org.floens.chan.net.GIFRequest; import org.floens.chan.view.GIFView; diff --git a/Chan/src/org/floens/chan/manager/BoardManager.java b/Chan/src/org/floens/chan/manager/BoardManager.java index 640d55f6..b9556781 100644 --- a/Chan/src/org/floens/chan/manager/BoardManager.java +++ b/Chan/src/org/floens/chan/manager/BoardManager.java @@ -5,7 +5,7 @@ import java.util.Scanner; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Board; +import org.floens.chan.model.Board; import org.floens.chan.net.BoardsRequest; import org.floens.chan.net.ChanUrls; diff --git a/Chan/src/org/floens/chan/manager/PinnedManager.java b/Chan/src/org/floens/chan/manager/PinnedManager.java index 4d5fec13..ad7f82cd 100644 --- a/Chan/src/org/floens/chan/manager/PinnedManager.java +++ b/Chan/src/org/floens/chan/manager/PinnedManager.java @@ -5,11 +5,10 @@ import java.util.Scanner; import org.floens.chan.ChanApplication; import org.floens.chan.adapter.PinnedAdapter; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Pin; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Pin; import android.content.Context; -import android.content.SharedPreferences; public class PinnedManager { private final ArrayList list = new ArrayList(); @@ -66,30 +65,31 @@ public class PinnedManager { return tempList; } - public void refresh() { + public void add(Pin pin) { + // No duplicates + for (Pin e : list) { + if (e.loadable.equals(pin.loadable)) { + return; + } + } + + adapter.add(pin); + + storePinnedListInPreferences("pinnedList", list); + } + + public void remove(Pin pin) { + adapter.remove(pin); + + storePinnedListInPreferences("pinnedList", list); + } + + public void update(Pin pin) { adapter.notifyDataSetChanged(); storePinnedListInPreferences("pinnedList", list); } - public void remove(Pin pin) { - adapter.remove(pin); - - storePinnedListInPreferences("pinnedList", list); - } - - public void add(Pin pin) { - for (Pin e : list) { - if (e.loadable.equals(pin.loadable)) { - return; - } - } - - adapter.add(pin); - - storePinnedListInPreferences("pinnedList", list); - } - private void storePinnedListInPreferences(String key, ArrayList list) { String total = ""; @@ -97,11 +97,11 @@ public class PinnedManager { total += post.loadable.board + "\u1208" + post.loadable.no + "\u1208" + post.loadable.title + "\n"; } - getPreferences().edit().putString(key, total).commit(); + ChanApplication.getPreferences().edit().putString(key, total).commit(); } private ArrayList getPinnedListFromPreferences(String key) { - String total = getPreferences().getString(key, null); + String total = ChanApplication.getPreferences().getString(key, null); if (total == null) return null; ArrayList list = new ArrayList(); @@ -134,10 +134,6 @@ public class PinnedManager { return list; } - - private SharedPreferences getPreferences() { - return ChanApplication.getPreferences(); - } } diff --git a/Chan/src/org/floens/chan/manager/ReplyManager.java b/Chan/src/org/floens/chan/manager/ReplyManager.java index bba0a67d..eb14b4af 100644 --- a/Chan/src/org/floens/chan/manager/ReplyManager.java +++ b/Chan/src/org/floens/chan/manager/ReplyManager.java @@ -8,7 +8,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.floens.chan.activity.ImagePickActivity; -import org.floens.chan.entity.Reply; +import org.floens.chan.model.Reply; import org.floens.chan.net.ChanUrls; import android.content.Context; @@ -40,7 +40,7 @@ public class ReplyManager { private FileListener fileListener; public ReplyManager(Context context) { - this.instance = this; + ReplyManager.instance = this; this.context = context; draft = new Reply(); } diff --git a/Chan/src/org/floens/chan/manager/ThreadManager.java b/Chan/src/org/floens/chan/manager/ThreadManager.java index b60097b5..de8d54e8 100644 --- a/Chan/src/org/floens/chan/manager/ThreadManager.java +++ b/Chan/src/org/floens/chan/manager/ThreadManager.java @@ -5,10 +5,10 @@ import java.util.List; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Post; -import org.floens.chan.entity.PostLinkable; import org.floens.chan.fragment.PostRepliesFragment; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Post; +import org.floens.chan.model.PostLinkable; import org.floens.chan.net.ThreadLoader; import android.app.Activity; diff --git a/Chan/src/org/floens/chan/entity/Board.java b/Chan/src/org/floens/chan/model/Board.java similarity index 94% rename from Chan/src/org/floens/chan/entity/Board.java rename to Chan/src/org/floens/chan/model/Board.java index 8d7774c3..123c7a48 100644 --- a/Chan/src/org/floens/chan/entity/Board.java +++ b/Chan/src/org/floens/chan/model/Board.java @@ -1,4 +1,4 @@ -package org.floens.chan.entity; +package org.floens.chan.model; /** * Board key and value. diff --git a/Chan/src/org/floens/chan/entity/Loadable.java b/Chan/src/org/floens/chan/model/Loadable.java similarity index 98% rename from Chan/src/org/floens/chan/entity/Loadable.java rename to Chan/src/org/floens/chan/model/Loadable.java index 0f77f111..7e2bc463 100644 --- a/Chan/src/org/floens/chan/entity/Loadable.java +++ b/Chan/src/org/floens/chan/model/Loadable.java @@ -1,4 +1,4 @@ -package org.floens.chan.entity; +package org.floens.chan.model; import android.content.Context; import android.os.Bundle; diff --git a/Chan/src/org/floens/chan/model/Pin.java b/Chan/src/org/floens/chan/model/Pin.java new file mode 100644 index 00000000..995ac897 --- /dev/null +++ b/Chan/src/org/floens/chan/model/Pin.java @@ -0,0 +1,18 @@ +package org.floens.chan.model; + + +public class Pin { + public Type type = Type.THREAD; + public Loadable loadable = new Loadable("", -1); + + /** Header is used to display a static header in the drawer listview. */ + public static enum Type { + HEADER, + THREAD + }; +} + + + + + diff --git a/Chan/src/org/floens/chan/entity/Post.java b/Chan/src/org/floens/chan/model/Post.java similarity index 98% rename from Chan/src/org/floens/chan/entity/Post.java rename to Chan/src/org/floens/chan/model/Post.java index 8bdad320..e5af4f09 100644 --- a/Chan/src/org/floens/chan/entity/Post.java +++ b/Chan/src/org/floens/chan/model/Post.java @@ -1,10 +1,10 @@ -package org.floens.chan.entity; +package org.floens.chan.model; import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.floens.chan.entity.PostLinkable.Type; +import org.floens.chan.model.PostLinkable.Type; import org.floens.chan.net.ChanUrls; import org.floens.chan.view.PostView; import org.jsoup.Jsoup; diff --git a/Chan/src/org/floens/chan/entity/PostLinkable.java b/Chan/src/org/floens/chan/model/PostLinkable.java similarity index 96% rename from Chan/src/org/floens/chan/entity/PostLinkable.java rename to Chan/src/org/floens/chan/model/PostLinkable.java index ba9b1a56..d657dee2 100644 --- a/Chan/src/org/floens/chan/entity/PostLinkable.java +++ b/Chan/src/org/floens/chan/model/PostLinkable.java @@ -1,4 +1,4 @@ -package org.floens.chan.entity; +package org.floens.chan.model; import android.graphics.Color; import android.text.TextPaint; diff --git a/Chan/src/org/floens/chan/entity/Reply.java b/Chan/src/org/floens/chan/model/Reply.java similarity index 84% rename from Chan/src/org/floens/chan/entity/Reply.java rename to Chan/src/org/floens/chan/model/Reply.java index ca10d40b..c9356c53 100644 --- a/Chan/src/org/floens/chan/entity/Reply.java +++ b/Chan/src/org/floens/chan/model/Reply.java @@ -1,9 +1,9 @@ -package org.floens.chan.entity; +package org.floens.chan.model; import java.io.File; /** - * The data needer to send a reply. + * The data needed to send a reply. */ public class Reply { public String name = ""; diff --git a/Chan/src/org/floens/chan/net/BoardsRequest.java b/Chan/src/org/floens/chan/net/BoardsRequest.java index 6a47c2e0..158e176d 100644 --- a/Chan/src/org/floens/chan/net/BoardsRequest.java +++ b/Chan/src/org/floens/chan/net/BoardsRequest.java @@ -3,7 +3,7 @@ package org.floens.chan.net; import java.io.IOException; import java.util.ArrayList; -import org.floens.chan.entity.Board; +import org.floens.chan.model.Board; import android.util.JsonReader; diff --git a/Chan/src/org/floens/chan/net/ChanReaderRequest.java b/Chan/src/org/floens/chan/net/ChanReaderRequest.java index ca02310b..000adf3f 100644 --- a/Chan/src/org/floens/chan/net/ChanReaderRequest.java +++ b/Chan/src/org/floens/chan/net/ChanReaderRequest.java @@ -3,8 +3,8 @@ package org.floens.chan.net; import java.io.IOException; import java.util.ArrayList; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Post; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Post; import android.util.JsonReader; diff --git a/Chan/src/org/floens/chan/net/ThreadLoader.java b/Chan/src/org/floens/chan/net/ThreadLoader.java index cf8dea4b..7a4a80c3 100644 --- a/Chan/src/org/floens/chan/net/ThreadLoader.java +++ b/Chan/src/org/floens/chan/net/ThreadLoader.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import org.floens.chan.ChanApplication; -import org.floens.chan.entity.Loadable; -import org.floens.chan.entity.Post; +import org.floens.chan.model.Loadable; +import org.floens.chan.model.Post; import android.util.Log; import android.util.SparseArray; diff --git a/Chan/src/org/floens/chan/service/PinnedService.java b/Chan/src/org/floens/chan/service/PinnedService.java index e923df50..36275612 100644 --- a/Chan/src/org/floens/chan/service/PinnedService.java +++ b/Chan/src/org/floens/chan/service/PinnedService.java @@ -1,26 +1,17 @@ package org.floens.chan.service; import java.util.ArrayList; -import java.util.Iterator; -import org.floens.chan.ChanApplication; -import org.floens.chan.entity.Pin; import org.floens.chan.manager.PinnedManager; +import org.floens.chan.model.Pin; -import android.app.Service; -import android.content.Intent; -import android.os.Handler; -import android.os.IBinder; -import android.os.Looper; -import android.widget.Toast; - -public class PinnedService extends Service { +public class PinnedService /*extends Service*/ { /** * Base interval when the thread wakes up */ private final int LOAD_BASE_INTERVAL = 20000; - private final PinnedManager pinnedManager; + private PinnedManager pinnedManager; private Thread loadThread; private final boolean running = true; @@ -30,7 +21,7 @@ public class PinnedService extends Service { @Override public void run() { while (running) { - loadPins(); +// loadPins(); try { Thread.sleep(LOAD_BASE_INTERVAL); @@ -41,7 +32,7 @@ public class PinnedService extends Service { } }; - public PinnedService() { + /*public PinnedService() { pinnedManager = ChanApplication.getPinnedManager(); } @@ -62,7 +53,7 @@ public class PinnedService extends Service { /** * Add not yet added pins to our list. * Remove old/unwatched pins from our list. - */ + private void organizePins() { ArrayList managerList = pinnedManager.getPinnedThreads(); @@ -117,6 +108,6 @@ public class PinnedService extends Service { @Override public IBinder onBind(Intent intent) { return null; - } + }*/ } diff --git a/Chan/src/org/floens/chan/view/PostView.java b/Chan/src/org/floens/chan/view/PostView.java index a7d0509c..26817b0d 100644 --- a/Chan/src/org/floens/chan/view/PostView.java +++ b/Chan/src/org/floens/chan/view/PostView.java @@ -2,9 +2,9 @@ package org.floens.chan.view; import org.floens.chan.ChanApplication; import org.floens.chan.R; -import org.floens.chan.entity.Post; -import org.floens.chan.entity.PostLinkable; import org.floens.chan.manager.ThreadManager; +import org.floens.chan.model.Post; +import org.floens.chan.model.PostLinkable; import org.floens.chan.net.ChanUrls; import org.floens.chan.utils.IconCache;