Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-08 07:57:28 +00:00
Code Issues Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
zerrium 2021-03-18 15:14:35 +07:00
parent 6202f876b1
commit 41d4bf313f
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -115,7 +115,5 @@ dependencies {
implementation 'com.github.ammargitham:uCrop:2.3-native-beta-2' implementation 'com.github.ammargitham:uCrop:2.3-native-beta-2'
implementation 'com.github.ammargitham:android-gpuimage:2.1.1-beta4' implementation 'com.github.ammargitham:android-gpuimage:2.1.1-beta4'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6'
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
} }

8
app/src/main/java/awais/instagrabber/activities/MainActivity.java
View File

@ -10,7 +10,6 @@ import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.database.MatrixCursor; import android.database.MatrixCursor;
import android.net.IpSecManager;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
@ -84,7 +83,7 @@ import awais.instagrabber.utils.TextUtils;
import awais.instagrabber.utils.Utils; import awais.instagrabber.utils.Utils;
import awais.instagrabber.utils.emoji.EmojiParser; import awais.instagrabber.utils.emoji.EmojiParser;
import awais.instagrabber.viewmodels.AppStateViewModel; import awais.instagrabber.viewmodels.AppStateViewModel;
import zerrium.FilterKeywords; import zerrium.FilterKeywordsUtility;
import static awais.instagrabber.utils.NavigationExtensions.setupWithNavController; import static awais.instagrabber.utils.NavigationExtensions.setupWithNavController;
import static awais.instagrabber.utils.Utils.settingsHelper; import static awais.instagrabber.utils.Utils.settingsHelper;
@ -180,14 +179,11 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
} }
private void initZerriumFilter(){ private void initZerriumFilter(){
boolean filter_result = false;
try{ try{
filter_result = FilterKeywords.insert(getResources().getStringArray(R.array.filter_keyword)); FilterKeywordsUtility.insert(getResources().getStringArray(R.array.filter_keyword));
}catch(Exception e){ }catch(Exception e){
Log.e(TAG, "initZerriumFilter: " + e); Log.e(TAG, "initZerriumFilter: " + e);
} }
if(!filter_result) Log.d(TAG, "ZerriumFilter insert failed");
else Log.d(TAG, "ZerriumFilter insert success");
} }
private void initDmService() { private void initDmService() {

9
app/src/main/java/awais/instagrabber/asyncs/FeedPostFetchService.java
View File

@ -12,7 +12,7 @@ import awais.instagrabber.utils.Constants;
import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.CookieUtils;
import awais.instagrabber.webservices.FeedService; import awais.instagrabber.webservices.FeedService;
import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.webservices.ServiceCallback;
import zerrium.FilterKeywords; import zerrium.FilterKeywordsUtility;
import static awais.instagrabber.utils.Utils.settingsHelper; import static awais.instagrabber.utils.Utils.settingsHelper;
@ -44,17 +44,16 @@ public class FeedPostFetchService implements PostFetcher.PostFetchService {
hasNextPage = result.hasNextPage(); hasNextPage = result.hasNextPage();
//Skip adding (junk) post to Feed models //Skip adding (junk) post to Feed models
for(Media m:result.getFeedModels()){ for(final Media m:result.getFeedModels()){
Caption c = m.getCaption(); final Caption c = m.getCaption();
if(c == null){ if(c == null){
feedModels.add(m); //No caption feedModels.add(m); //No caption
continue; continue;
} }
if(!FilterKeywords.filter(c.getText())){ //Check caption if it doesn't contain any specified keywords in filter_keywords.xml if(!FilterKeywordsUtility.filter(c.getText())){ //Check caption if it doesn't contain any specified keywords in filter_keywords.xml
feedModels.add(m); feedModels.add(m);
} }
} }
//Zerrium 18 March 2021
//feedModels.addAll(result.getFeedModels()); //feedModels.addAll(result.getFeedModels());
if (fetchListener != null) { if (fetchListener != null) {
// if (feedModels.size() < 15 && hasNextPage) { // if (feedModels.size() < 15 && hasNextPage) {

17
app/src/main/java/zerrium/FilterKeywords.java → app/src/main/java/zerrium/FilterKeywordsUtility.java
View File

@ -2,27 +2,28 @@ package zerrium;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
public class FilterKeywords { public class FilterKeywordsUtility {
private static final ArrayList<String> FILTER_KEYWORDS = new ArrayList<>(); private static final ArrayList<String> FILTER_KEYWORDS = new ArrayList<>();
public static boolean append(String keyword){ public static boolean append(final String keyword){
if(keyword == null) return false; if(keyword == null) return false;
FILTER_KEYWORDS.add(keyword); FILTER_KEYWORDS.add(keyword);
return true; return true;
} }
public static boolean insert(String[] keywords){ public static boolean insert(final String[] keywords){
if(keywords == null) return false; if(keywords == null) return false;
FILTER_KEYWORDS.addAll(Arrays.asList(keywords)); FILTER_KEYWORDS.addAll(Arrays.asList(keywords));
return true; return true;
} }
public static boolean filter(String word){ public static boolean filter(String caption){
if(word == null) return false; if(caption == null) return false;
word = word.toLowerCase(); caption = caption.toLowerCase(Locale.getDefault());
for(String s:FILTER_KEYWORDS){ for(final String s:FILTER_KEYWORDS){
if(word.contains(s)) return true; if(caption.contains(s)) return true;
} }
return false; return false;
} }