From 2eb9166493b5c779bc60109eb18a4675f46bc01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Sun, 9 Oct 2016 13:25:45 +0200 Subject: [PATCH] Fixed proguard and lint issues. --- app/build.gradle | 5 + app/proguard-rules.pro | 6 +- .../urbanexplorer/AppConstants.java | 3 + .../adapters/WikiLocationsAdapter.java | 5 +- .../fragments/PlacesFragment.java | 9 +- .../urbanexplorer/utils/HelperUtils.java | 2 +- .../utils/PanoramioCacheUtils.java | 20 +- .../urbanexplorer/utils/WikiCacheUtils.java | 40 +- .../urbanexplorer/views/SwipeFrameLayout.java | 10 +- .../res/layout/fragment_panoramio_shower.xml | 2 +- .../main/res/layout/wiki_locations_item.xml | 2 +- app/src/main/res/values-de/strings.xml | 608 ++++++++++++++++++ app/src/main/res/values-pl/strings.xml | 608 ++++++++++++++++++ googleutils/proguard-rules.pro | 3 + wikibinding/proguard-rules.pro | 17 + 15 files changed, 1313 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7eaedd0..3e1894f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,6 +55,11 @@ android { signingConfig signingConfigs.config } } + + lintOptions { + disable 'InvalidPackage' + abortOnError false + } } dependencies { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 6b2df08..af51210 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -22,4 +22,8 @@ -assumenosideeffects class ch.qos.logback.** { *; } -assumenosideeffects class org.slf4j.** { *; } -keep class com.crashlytics.** { *; } --dontwarn com.crashlytics.** \ No newline at end of file +-dontwarn com.crashlytics.** +-dontwarn retrofit2.** +-dontwarn okio.** +-dontwarn com.crashlytics.** +-dontwarn okhttp3.logging.** \ No newline at end of file diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java index 7d8672c..d2eeb0f 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java @@ -1,5 +1,7 @@ package pl.tpolgrabia.urbanexplorer; +import java.util.Locale; + /** * Created by tpolgrabia on 27.08.16. */ @@ -19,4 +21,5 @@ public class AppConstants { static final String PHOTO_INFO = "PHOTO_INFO"; static final String SAVED_CONFIG_KEY = "SAVED_CONFIG_KEY"; public static final String GOOGLE_API_KEY = "AIzaSyBAJoK-pu_qnQ0U8EGjM1Zkz_g8oJV4w2g"; + public static final Locale DEF_APP_LOCALE = Locale.ENGLISH; } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/WikiLocationsAdapter.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/WikiLocationsAdapter.java index f8c7657..7e60799 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/WikiLocationsAdapter.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/WikiLocationsAdapter.java @@ -9,16 +9,19 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; import com.nostra13.universalimageloader.core.ImageLoader; +import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.MainActivity; import pl.tpolgrabia.urbanexplorer.R; import pl.tpolgrabia.wikibinding.dto.app.WikiAppObject; import java.util.List; +import java.util.Locale; /** * Created by tpolgrabia on 01.09.16. */ public class WikiLocationsAdapter extends ArrayAdapter { + public WikiLocationsAdapter(Context ctx, List locations) { super(ctx, R.layout.wiki_locations_item, locations); } @@ -43,7 +46,7 @@ public class WikiLocationsAdapter extends ArrayAdapter { String url = wikiPage.getThumbnail() != null ? wikiPage.getThumbnail() : null; TextView locDistanceInfo = (TextView) itemView.findViewById(R.id.wiki_locs_item_distance); - locDistanceInfo.setText(String.format("%.2f km", wikiPage.getDistance() / 1000.0)); + locDistanceInfo.setText(String.format(AppConstants.DEF_APP_LOCALE, "%.2f km", wikiPage.getDistance() / 1000.0)); imgPreview.setImageBitmap(BitmapFactory.decodeResource(getContext().getResources(), R.drawable.noimage)); if (url != null) { diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java index 4724a32..7512403 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java @@ -40,6 +40,7 @@ import pl.tpolgrabia.urbanexplorerutils.utils.SettingsUtils; import java.io.*; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.concurrent.Semaphore; import java.util.regex.Pattern; @@ -159,7 +160,8 @@ public class PlacesFragment extends Fragment { } Toast.makeText(getActivity(), - String.format("Location changed: %.3f,%.3f", + String.format(AppConstants.DEF_APP_LOCALE, + "Location changed: %.3f,%.3f", location.getLatitude(), location.getLongitude()), Toast.LENGTH_SHORT).show(); @@ -215,7 +217,10 @@ public class PlacesFragment extends Fragment { return; } Toast.makeText(getActivity(), - String.format("Fetching nearby places %.3f,%.3f", location.getLatitude(), location.getLongitude()), + String.format(AppConstants.DEF_APP_LOCALE, + "Fetching nearby places %.3f,%.3f", + location.getLatitude(), + location.getLongitude()), Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/HelperUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/HelperUtils.java index 4917729..1f6cc9d 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/HelperUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/HelperUtils.java @@ -47,7 +47,7 @@ public class HelperUtils { Toast.LENGTH_LONG).show(); SharedPreferences.Editor editor = sharedPrefs.edit(); editor.putBoolean(FIRST_TIME_LAUNCH, false); - editor.commit(); + editor.apply(); } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioCacheUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioCacheUtils.java index 2b16b83..098bd8d 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioCacheUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioCacheUtils.java @@ -45,11 +45,13 @@ public class PanoramioCacheUtils { return photos; } else { // maybe we find something in our cache file - try (Reader reader = - new InputStreamReader( - new FileInputStream( - new File(homeFragment.getActivity().getCacheDir(), - AppConstants.PANORAMIO_CACHE_FILENAME)))) { + Reader reader = null; + try { + reader = + new InputStreamReader( + new FileInputStream( + new File(homeFragment.getActivity().getCacheDir(), + AppConstants.PANORAMIO_CACHE_FILENAME))); PanoramioCacheDto dto = new Gson().fromJson(new JsonReader(reader), PanoramioCacheDto.class); if (dto == null) { @@ -71,6 +73,14 @@ public class PanoramioCacheUtils { } catch (Throwable t) { lg.error("Throwable", t); return new ArrayList<>(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + lg.error("Error closing reader - I/O error", e); + } + } } } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiCacheUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiCacheUtils.java index 0756b10..4687cd4 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiCacheUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiCacheUtils.java @@ -8,9 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.dto.wiki.WikiCacheDto; -import pl.tpolgrabia.wikibinding.dto.app.WikiAppObject; import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment; import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils; +import pl.tpolgrabia.wikibinding.dto.app.WikiAppObject; import java.io.*; import java.util.ArrayList; @@ -30,11 +30,13 @@ public class WikiCacheUtils { } public static void saveWikiObjectsToCache(Context ctx, List appObjects) { - try (BufferedWriter bw = new BufferedWriter( + BufferedWriter bw = null; + try { + bw = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( new File(ctx.getCacheDir(), - AppConstants.WIKI_CACHE_FILENAME))))) { + AppConstants.WIKI_CACHE_FILENAME)))); WikiCacheDto dto = new WikiCacheDto(); dto.setAppObject(appObjects); @@ -52,30 +54,44 @@ public class WikiCacheUtils { new Gson().toJson(bw); - } catch (FileNotFoundException e) { - lg.error("File not found", e); } catch (IOException e) { lg.error("I/O error", e); + } finally { + if (bw != null) { + try { + bw.close(); + } catch (IOException e) { + lg.error("Error closing writer - I/O error", e); + } + } } } public static ArrayList loadWikiObjectsFromCache(Context ctx, Bundle savedInstanceState) { ArrayList appObjects = savedInstanceState == null ? new ArrayList() - : (ArrayList)savedInstanceState.getSerializable(WikiLocationsFragment.WIKI_APP_OBJECTS); + : (ArrayList) savedInstanceState.getSerializable(WikiLocationsFragment.WIKI_APP_OBJECTS); if (appObjects == null) { - try (InputStreamReader ir = new InputStreamReader( - new FileInputStream( - new File(ctx.getCacheDir(), - AppConstants.WIKI_CACHE_FILENAME)))) { + InputStreamReader ir = null; + try { + ir = new InputStreamReader( + new FileInputStream( + new File(ctx.getCacheDir(), + AppConstants.WIKI_CACHE_FILENAME))); WikiCacheDto dto = new Gson().fromJson(ir, WikiCacheDto.class); appObjects = new ArrayList<>(dto.getAppObject()); - } catch (FileNotFoundException e) { - lg.error("File not found", e); } catch (IOException e) { lg.error("I/O error", e); + } finally { + if (ir != null) { + try { + ir.close(); + } catch (IOException e) { + lg.error("Error reading reader - I/O error", e); + } + } } } return appObjects; diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/views/SwipeFrameLayout.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/views/SwipeFrameLayout.java index 479508a..0ea6b1a 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/views/SwipeFrameLayout.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/views/SwipeFrameLayout.java @@ -1,6 +1,9 @@ package pl.tpolgrabia.urbanexplorer.views; +import android.annotation.TargetApi; import android.content.Context; +import android.os.Build; +import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; @@ -15,15 +18,16 @@ public class SwipeFrameLayout extends FrameLayout { super(context); } - public SwipeFrameLayout(Context context, AttributeSet attrs) { + public SwipeFrameLayout(Context context, @Nullable AttributeSet attrs) { super(context, attrs); } - public SwipeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + public SwipeFrameLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - public SwipeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + public SwipeFrameLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/res/layout/fragment_panoramio_shower.xml b/app/src/main/res/layout/fragment_panoramio_shower.xml index 9d6c848..1916c21 100644 --- a/app/src/main/res/layout/fragment_panoramio_shower.xml +++ b/app/src/main/res/layout/fragment_panoramio_shower.xml @@ -8,7 +8,7 @@ - Frequency Frequency Frequency + en + pref_wiki_locale + + + accounting + airport + amusement_park + aquarium + art_gallery + atm + bakery + bank + bar + beauty_salon + bicycle_store + book_store + bowling_alley + bus_station + cafe + campground + car_dealer + car_rental + car_repair + car_wash + casino + cemetery + church + city_hall + clothing_store + convenience_store + courthouse + dentist + department_store + doctor + electrician + electronics_store + embassy + fire_station + florist + funeral_home + furniture_store + gas_station + gym + hair_care + hardware_store + hindu_temple + home_goods_store + hospital + insurance_agency + jewelry_store + laundry + lawyer + library + liquor_store + local_government_office + locksmith + lodging + meal_delivery + meal_takeaway + mosque + movie_rental + movie_theater + moving_company + museum + night_club + painter + park + parking + pet_store + pharmacy + physiotherapist + plumber + police + post_office + real_estate_agency + restaurant + roofing_contractor + rv_park + school + shoe_store + shopping_mall + spa + stadium + storage + store + subway_station + synagogue + taxi_stand + train_station + transit_station + travel_agency + university + veterinary_care + zoo + + + + airport + amusement_park + aquarium + art_gallery + bar + beauty_salon + bowling_alley + cafe + campground + casino + cemetery + church + city_hall + clothing_store + department_store + embassy + gym + hair_care + hindu_temple + jewelry_store + liquor_store + meal_delivery + meal_takeaway + mosque + museum + night_club + park + restaurant + rv_park + shoe_store + shopping_mall + spa + stadium + store + subway_station + synagogue + taxi_stand + train_station + transit_station + travel_agency + university + zoo + + + + Accounting + Airport + Amusement park + Aquarium + Art gallery + ATM + Bakery + Bank + Bar + Beauty salon + Bicycle store + Book store + Bowling alley + Bus station + Cafe + Campground + Car dealer + Car rental + Car repair + Car wash + Casino + Cemetery + Church + City hall + Clothing store + Convenience store + Courthouse + Dentist + Department store + Doctor + Electrician + Electronics store + Embassy + Fire station + Florist + Funeral home + Furniture store + Gas station + Gym + Hair care + Hardware store + Hindu temple + Home goods store + Hospital + Insurance agency + Jewelry store + Laundry + Lawyer + Library + Liquor store + Local government office + Locksmith + Lodging + Meal delivery + Meal takeaway + Mosque + Movie rental + Movie theater + Moving company + Museum + Night club + Painter + Park + Parking + Pet store + Pharmacy + Physiotherapist + Plumber + Police + Post office + Real estate agency + Restaurant + Roofing contractor + Rv park + School + Shoe store + Shopping mall + SPA + Stadium + Storage + Store + Subway station + Synagogue + Taxi stand + Train station + Transit station + Travel agency + University + Veterinary care + Zoo + + + + + ab + aa + af + ak + sq + am + ar + an + hy + as + av + ae + ay + az + bm + ba + eu + be + bn + bh + bi + bs + br + bg + my + ca + ch + ce + ny + zh + cv + kw + co + cr + hr + cs + da + dv + nl + dz + en + eo + et + ee + fo + fj + fi + fr + ff + gl + ka + de + el + gn + gu + ht + ha + he + hz + hi + ho + hu + ia + id + ie + ga + ig + ik + io + is + it + iu + ja + jv + kl + kn + kr + ks + kk + km + ki + rw + ky + kv + kg + ko + ku + kj + la + lb + lg + li + ln + lo + lt + lu + lv + gv + mk + mg + ms + ml + mt + mi + mr + mh + mn + na + nv + nd + ne + ng + nb + nn + no + ii + nr + oc + oj + cu + om + or + os + pa + pi + fa + pl + ps + pt + qu + rm + rn + ro + ru + sa + sc + sd + se + sm + sg + sr + gd + sn + si + sk + sl + so + st + es + su + sw + ss + sv + ta + te + tg + th + ti + bo + tk + tl + tn + to + tr + ts + tt + tw + ty + ug + uk + ur + uz + ve + vi + vo + wa + cy + wo + fy + xh + yi + yo + za + zu + + + + Abkhaz + Afar + Afrikaans + Akan + Albanian + Amharic + Arabic + Aragonese + Armenian + Assamese + Avaric + Avestan + Aymara + Azerbaijani + Bambara + Bashkir + Basque + Belarusian + Bengali, Bangla + Bihari + Bislama + Bosnian + Breton + Bulgarian + Burmese + Catalan + Chamorro + Chechen + Chichewa, Chewa, Nyanja + Chinese + Chuvash + Cornish + Corsican + Cree + Croatian + Czech + Danish + Divehi, Dhivehi, Maldivian + Dutch + Dzongkha + English + Esperanto + Estonian + Ewe + Faroese + Fijian + Finnish + French + Fula, Fulah, Pulaar, Pular + Galician + Georgian + German + Greek (modern) + Guaraní + Gujarati + Haitian, Haitian Creole + Hausa + Hebrew (modern) + Herero + Hindi + Hiri Motu + Hungarian + Interlingua + Indonesian + Interlingue + Irish + Igbo + Inupiaq + Ido + Icelandic + Italian + Inuktitut + Japanese + Javanese + Kalaallisut, Greenlandic + Kannada + Kanuri + Kashmiri + Kazakh + Khmer + Kikuyu, Gikuyu + Kinyarwanda + Kyrgyz + Komi + Kongo + Korean + Kurdish + Kwanyama, Kuanyama + Latin + Luxembourgish, Letzeburgesch + Ganda + Limburgish, Limburgan, Limburger + Lingala + Lao + Lithuanian + Luba-Katanga + Latvian + Manx + Macedonian + Malagasy + Malay + Malayalam + Maltese + Māori + Marathi (Marāṭhī) + Marshallese + Mongolian + Nauruan + Navajo, Navaho + Northern Ndebele + Nepali + Ndonga + Norwegian Bokmål + Norwegian Nynorsk + Norwegian + Nuosu + Southern Ndebele + Occitan + Ojibwe, Ojibwa + Old Church Slavonic, Church Slavonic, Old Bulgarian + Oromo + Oriya + Ossetian, Ossetic + Eastern Punjabi, Eastern Panjabi + Pāli + Persian (Farsi) + Polish + Pashto, Pushto + Portuguese + Quechua + Romansh + Kirundi + Romanian + Russian + Sanskrit (Saṁskṛta) + Sardinian + Sindhi + Northern Sami + Samoan + Sango + Serbian + Scottish Gaelic, Gaelic + Shona + Sinhalese, Sinhala + Slovak + Slovene + Somali + Southern Sotho + Spanish + Sundanese + Swahili + Swati + Swedish + Tamil + Telugu + Tajik + Thai + Tigrinya + Tibetan Standard, Tibetan, Central + Turkmen + Tagalog + Tswana + Tonga (Tonga Islands) + Turkish + Tsonga + Tatar + Twi + Tahitian + Uyghur + Ukrainian + Urdu + Uzbek + Venda + Vietnamese + Volapük + Walloon + Welsh + Wolof + Western Frisian + Xhosa + Yiddish + Yoruba + Zhuang, Chuang + Zulu + \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7a8b3c3..a5ca806 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -53,4 +53,612 @@ Zakres X pozycji Zakres Y pozycji Czestotliwość aktualizacji położenia + en + pref_wiki_locale + + + accounting + airport + amusement_park + aquarium + art_gallery + atm + bakery + bank + bar + beauty_salon + bicycle_store + book_store + bowling_alley + bus_station + cafe + campground + car_dealer + car_rental + car_repair + car_wash + casino + cemetery + church + city_hall + clothing_store + convenience_store + courthouse + dentist + department_store + doctor + electrician + electronics_store + embassy + fire_station + florist + funeral_home + furniture_store + gas_station + gym + hair_care + hardware_store + hindu_temple + home_goods_store + hospital + insurance_agency + jewelry_store + laundry + lawyer + library + liquor_store + local_government_office + locksmith + lodging + meal_delivery + meal_takeaway + mosque + movie_rental + movie_theater + moving_company + museum + night_club + painter + park + parking + pet_store + pharmacy + physiotherapist + plumber + police + post_office + real_estate_agency + restaurant + roofing_contractor + rv_park + school + shoe_store + shopping_mall + spa + stadium + storage + store + subway_station + synagogue + taxi_stand + train_station + transit_station + travel_agency + university + veterinary_care + zoo + + + + airport + amusement_park + aquarium + art_gallery + bar + beauty_salon + bowling_alley + cafe + campground + casino + cemetery + church + city_hall + clothing_store + department_store + embassy + gym + hair_care + hindu_temple + jewelry_store + liquor_store + meal_delivery + meal_takeaway + mosque + museum + night_club + park + restaurant + rv_park + shoe_store + shopping_mall + spa + stadium + store + subway_station + synagogue + taxi_stand + train_station + transit_station + travel_agency + university + zoo + + + + Accounting + Airport + Amusement park + Aquarium + Art gallery + ATM + Bakery + Bank + Bar + Beauty salon + Bicycle store + Book store + Bowling alley + Bus station + Cafe + Campground + Car dealer + Car rental + Car repair + Car wash + Casino + Cemetery + Church + City hall + Clothing store + Convenience store + Courthouse + Dentist + Department store + Doctor + Electrician + Electronics store + Embassy + Fire station + Florist + Funeral home + Furniture store + Gas station + Gym + Hair care + Hardware store + Hindu temple + Home goods store + Hospital + Insurance agency + Jewelry store + Laundry + Lawyer + Library + Liquor store + Local government office + Locksmith + Lodging + Meal delivery + Meal takeaway + Mosque + Movie rental + Movie theater + Moving company + Museum + Night club + Painter + Park + Parking + Pet store + Pharmacy + Physiotherapist + Plumber + Police + Post office + Real estate agency + Restaurant + Roofing contractor + Rv park + School + Shoe store + Shopping mall + SPA + Stadium + Storage + Store + Subway station + Synagogue + Taxi stand + Train station + Transit station + Travel agency + University + Veterinary care + Zoo + + + + + ab + aa + af + ak + sq + am + ar + an + hy + as + av + ae + ay + az + bm + ba + eu + be + bn + bh + bi + bs + br + bg + my + ca + ch + ce + ny + zh + cv + kw + co + cr + hr + cs + da + dv + nl + dz + en + eo + et + ee + fo + fj + fi + fr + ff + gl + ka + de + el + gn + gu + ht + ha + he + hz + hi + ho + hu + ia + id + ie + ga + ig + ik + io + is + it + iu + ja + jv + kl + kn + kr + ks + kk + km + ki + rw + ky + kv + kg + ko + ku + kj + la + lb + lg + li + ln + lo + lt + lu + lv + gv + mk + mg + ms + ml + mt + mi + mr + mh + mn + na + nv + nd + ne + ng + nb + nn + no + ii + nr + oc + oj + cu + om + or + os + pa + pi + fa + pl + ps + pt + qu + rm + rn + ro + ru + sa + sc + sd + se + sm + sg + sr + gd + sn + si + sk + sl + so + st + es + su + sw + ss + sv + ta + te + tg + th + ti + bo + tk + tl + tn + to + tr + ts + tt + tw + ty + ug + uk + ur + uz + ve + vi + vo + wa + cy + wo + fy + xh + yi + yo + za + zu + + + + Abkhaz + Afar + Afrikaans + Akan + Albanian + Amharic + Arabic + Aragonese + Armenian + Assamese + Avaric + Avestan + Aymara + Azerbaijani + Bambara + Bashkir + Basque + Belarusian + Bengali, Bangla + Bihari + Bislama + Bosnian + Breton + Bulgarian + Burmese + Catalan + Chamorro + Chechen + Chichewa, Chewa, Nyanja + Chinese + Chuvash + Cornish + Corsican + Cree + Croatian + Czech + Danish + Divehi, Dhivehi, Maldivian + Dutch + Dzongkha + English + Esperanto + Estonian + Ewe + Faroese + Fijian + Finnish + French + Fula, Fulah, Pulaar, Pular + Galician + Georgian + German + Greek (modern) + Guaraní + Gujarati + Haitian, Haitian Creole + Hausa + Hebrew (modern) + Herero + Hindi + Hiri Motu + Hungarian + Interlingua + Indonesian + Interlingue + Irish + Igbo + Inupiaq + Ido + Icelandic + Italian + Inuktitut + Japanese + Javanese + Kalaallisut, Greenlandic + Kannada + Kanuri + Kashmiri + Kazakh + Khmer + Kikuyu, Gikuyu + Kinyarwanda + Kyrgyz + Komi + Kongo + Korean + Kurdish + Kwanyama, Kuanyama + Latin + Luxembourgish, Letzeburgesch + Ganda + Limburgish, Limburgan, Limburger + Lingala + Lao + Lithuanian + Luba-Katanga + Latvian + Manx + Macedonian + Malagasy + Malay + Malayalam + Maltese + Māori + Marathi (Marāṭhī) + Marshallese + Mongolian + Nauruan + Navajo, Navaho + Northern Ndebele + Nepali + Ndonga + Norwegian Bokmål + Norwegian Nynorsk + Norwegian + Nuosu + Southern Ndebele + Occitan + Ojibwe, Ojibwa + Old Church Slavonic, Church Slavonic, Old Bulgarian + Oromo + Oriya + Ossetian, Ossetic + Eastern Punjabi, Eastern Panjabi + Pāli + Persian (Farsi) + Polish + Pashto, Pushto + Portuguese + Quechua + Romansh + Kirundi + Romanian + Russian + Sanskrit (Saṁskṛta) + Sardinian + Sindhi + Northern Sami + Samoan + Sango + Serbian + Scottish Gaelic, Gaelic + Shona + Sinhalese, Sinhala + Slovak + Slovene + Somali + Southern Sotho + Spanish + Sundanese + Swahili + Swati + Swedish + Tamil + Telugu + Tajik + Thai + Tigrinya + Tibetan Standard, Tibetan, Central + Turkmen + Tagalog + Tswana + Tonga (Tonga Islands) + Turkish + Tsonga + Tatar + Twi + Tahitian + Uyghur + Ukrainian + Urdu + Uzbek + Venda + Vietnamese + Volapük + Walloon + Welsh + Wolof + Western Frisian + Xhosa + Yiddish + Yoruba + Zhuang, Chuang + Zulu + \ No newline at end of file diff --git a/googleutils/proguard-rules.pro b/googleutils/proguard-rules.pro index 06736b0..9914eb4 100644 --- a/googleutils/proguard-rules.pro +++ b/googleutils/proguard-rules.pro @@ -28,3 +28,6 @@ -keepattributes Signature # Retain declared checked exceptions for use by a Proxy instance. -keepattributes Exceptions +-keep class java.nio.file.** { *; } +-keep class retrofit2.** { *; } +-keep class okio.** { *; } \ No newline at end of file diff --git a/wikibinding/proguard-rules.pro b/wikibinding/proguard-rules.pro index f253a1f..4159e90 100644 --- a/wikibinding/proguard-rules.pro +++ b/wikibinding/proguard-rules.pro @@ -15,3 +15,20 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +# Proguard rules for retrofit + +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions + +-keep class java.nio.file.** { *; } +-keep class retrofit2.** { *; } +-keep class okio.** { *; } \ No newline at end of file