From d7a206ba55de49c8bbfb4dca733d223b01066f26 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 11 Jun 2015 00:04:01 +0300 Subject: rename folder service --- org.fox.ttcomics/src/main/AndroidManifest.xml | 2 +- .../main/java/org/fox/ttcomics2/MainActivity.java | 10 +- .../java/org/fox/ttcomics2/PositionGetService.java | 119 --------------------- .../java/org/fox/ttcomics2/SyncFolderService.java | 119 +++++++++++++++++++++ 4 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PositionGetService.java create mode 100644 org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java (limited to 'org.fox.ttcomics') diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index fa2eb12..a0f698d 100755 --- a/org.fox.ttcomics/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -63,7 +63,7 @@ android:finishOnTaskLaunch="true" /> diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java index a58259e..d56c16f 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java @@ -37,7 +37,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener private BroadcastReceiver m_serviceReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (PositionGetService.INTENT_ACTION_FILE_PROCESSED.equals(intent.getAction())) { + if (SyncFolderService.INTENT_ACTION_FILE_PROCESSED.equals(intent.getAction())) { int count = intent.getExtras().getInt("count"); int index = intent.getExtras().getInt("index"); @@ -48,7 +48,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener m_progressDialog.show(); } - if (PositionGetService.INTENT_ACTION_SCAN_COMPLETE.equals(intent.getAction())) { + if (SyncFolderService.INTENT_ACTION_SCAN_COMPLETE.equals(intent.getAction())) { m_progressDialog.dismiss(); updateComicsList(); } @@ -156,8 +156,8 @@ public class MainActivity extends CommonActivity implements MaterialTabListener super.onResume(); IntentFilter filter = new IntentFilter(); - filter.addAction(PositionGetService.INTENT_ACTION_FILE_PROCESSED); - filter.addAction(PositionGetService.INTENT_ACTION_SCAN_COMPLETE); + filter.addAction(SyncFolderService.INTENT_ACTION_FILE_PROCESSED); + filter.addAction(SyncFolderService.INTENT_ACTION_SCAN_COMPLETE); filter.addCategory(Intent.CATEGORY_DEFAULT); registerReceiver(m_serviceReceiver, filter); @@ -239,7 +239,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener } private void updateLastRead(String baseDir) { - Intent serviceIntent = new Intent(MainActivity.this, PositionGetService.class); + Intent serviceIntent = new Intent(MainActivity.this, SyncFolderService.class); serviceIntent.putExtra("baseDir", baseDir); startService(serviceIntent); } diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PositionGetService.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PositionGetService.java deleted file mode 100644 index d94e4ac..0000000 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PositionGetService.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.fox.ttcomics2; - -import android.app.Service; -import android.content.Intent; -import android.os.AsyncTask; -import android.os.Binder; -import android.os.IBinder; -import android.util.Log; - -import java.io.File; -import java.io.IOException; -import java.net.HttpURLConnection; - -public class PositionGetService extends Service { - private final String TAG = this.getClass().getSimpleName(); - - public final static String INTENT_ACTION_FILE_PROCESSED = "org.fox.ttcomics2.intent.action.FileProcessed"; - public final static String INTENT_ACTION_SCAN_COMPLETE = "org.fox.ttcomics2.intent.action.ScanComplete"; - - private DatabaseHelper m_databaseHelper; - private final IBinder m_binder = new LocalBinder(); - - public class LocalBinder extends Binder { - PositionGetService getService() { - return PositionGetService.this; - } - } - - @Override - public void onCreate() { - super.onCreate(); - - m_databaseHelper = DatabaseHelper.getInstance(this); - } - - @Override - public IBinder onBind(Intent intent) { - return m_binder; - } - - @Override - public void onStart(Intent intent, int startId) { - String baseDir = intent.getExtras().getString("baseDir"); - - AsyncTask task = new AsyncTask() { - @Override - protected Integer doInBackground(String... params) { - File rootDir = new File(params[0]); - - if (rootDir.exists() && rootDir.isDirectory()) { - - int index = 0; - int count = rootDir.listFiles().length; - - for (File file : rootDir.listFiles()) { - ++index; - - Log.d(TAG, "file=" + file.getAbsolutePath()); - - SyncClient m_syncClient = new SyncClient(); - - String googleAccount = CommonActivity.getGoogleAccount(getApplicationContext()); - - if (googleAccount != null) { - m_syncClient.setOwner(googleAccount); - } else if (BuildConfig.DEBUG) { - m_syncClient.setOwner("TEST-ACCOUNT"); - } - - HttpURLConnection conn = m_syncClient.doSyncHttpRequest("get", CommonActivity.sha1(file.getName())); - - try { - if (conn != null && conn.getResponseCode() == HttpURLConnection.HTTP_OK) { - String result = m_syncClient.readHttpResponse(conn); - - if (result != null) { - //Log.d(TAG, "GOT=" + result); - - int position = Integer.valueOf(result); - - if (position > 0) { - - if (position > m_databaseHelper.getLastPosition(file.getAbsolutePath())) { - m_databaseHelper.setLastPosition(file.getAbsolutePath(), position); - } - } - - } - - Thread.sleep(250); - } - } catch (IOException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - - Intent broadcast = new Intent(); - broadcast.setAction(INTENT_ACTION_FILE_PROCESSED); - broadcast.putExtra("index", index); - broadcast.putExtra("count", count); - broadcast.addCategory(Intent.CATEGORY_DEFAULT); - sendBroadcast(broadcast); - } - } - - Intent broadcast = new Intent(); - broadcast.setAction(INTENT_ACTION_SCAN_COMPLETE); - broadcast.addCategory(Intent.CATEGORY_DEFAULT); - sendBroadcast(broadcast); - - return null; - } - }; - - task.execute(baseDir); - } - -} diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java new file mode 100644 index 0000000..8efb1e3 --- /dev/null +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncFolderService.java @@ -0,0 +1,119 @@ +package org.fox.ttcomics2; + +import android.app.Service; +import android.content.Intent; +import android.os.AsyncTask; +import android.os.Binder; +import android.os.IBinder; +import android.util.Log; + +import java.io.File; +import java.io.IOException; +import java.net.HttpURLConnection; + +public class SyncFolderService extends Service { + private final String TAG = this.getClass().getSimpleName(); + + public final static String INTENT_ACTION_FILE_PROCESSED = "org.fox.ttcomics2.intent.action.FileProcessed"; + public final static String INTENT_ACTION_SCAN_COMPLETE = "org.fox.ttcomics2.intent.action.ScanComplete"; + + private DatabaseHelper m_databaseHelper; + private final IBinder m_binder = new LocalBinder(); + + public class LocalBinder extends Binder { + SyncFolderService getService() { + return SyncFolderService.this; + } + } + + @Override + public void onCreate() { + super.onCreate(); + + m_databaseHelper = DatabaseHelper.getInstance(this); + } + + @Override + public IBinder onBind(Intent intent) { + return m_binder; + } + + @Override + public void onStart(Intent intent, int startId) { + String baseDir = intent.getExtras().getString("baseDir"); + + AsyncTask task = new AsyncTask() { + @Override + protected Integer doInBackground(String... params) { + File rootDir = new File(params[0]); + + if (rootDir.exists() && rootDir.isDirectory()) { + + int index = 0; + int count = rootDir.listFiles().length; + + for (File file : rootDir.listFiles()) { + ++index; + + Log.d(TAG, "file=" + file.getAbsolutePath()); + + SyncClient m_syncClient = new SyncClient(); + + String googleAccount = CommonActivity.getGoogleAccount(getApplicationContext()); + + if (googleAccount != null) { + m_syncClient.setOwner(googleAccount); + } else if (BuildConfig.DEBUG) { + m_syncClient.setOwner("TEST-ACCOUNT"); + } + + HttpURLConnection conn = m_syncClient.doSyncHttpRequest("get", CommonActivity.sha1(file.getName())); + + try { + if (conn != null && conn.getResponseCode() == HttpURLConnection.HTTP_OK) { + String result = m_syncClient.readHttpResponse(conn); + + if (result != null) { + //Log.d(TAG, "GOT=" + result); + + int position = Integer.valueOf(result); + + if (position > 0) { + + if (position > m_databaseHelper.getLastPosition(file.getAbsolutePath())) { + m_databaseHelper.setLastPosition(file.getAbsolutePath(), position); + } + } + + } + + Thread.sleep(250); + } + } catch (IOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + + Intent broadcast = new Intent(); + broadcast.setAction(INTENT_ACTION_FILE_PROCESSED); + broadcast.putExtra("index", index); + broadcast.putExtra("count", count); + broadcast.addCategory(Intent.CATEGORY_DEFAULT); + sendBroadcast(broadcast); + } + } + + Intent broadcast = new Intent(); + broadcast.setAction(INTENT_ACTION_SCAN_COMPLETE); + broadcast.addCategory(Intent.CATEGORY_DEFAULT); + sendBroadcast(broadcast); + + return null; + } + }; + + task.execute(baseDir); + } + +} -- cgit v1.2.3