From 70230186119b34b9811b1592c27d01f3777e3af3 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 26 Jun 2017 09:23:42 +0200 Subject: [PATCH] 1.69 --- NEWS | 5 ++ app/app.iml | 4 ++ app/build.gradle | 4 +- app/build/outputs/mapping/release/mapping.txt | 55 ++++++++++++------- 4 files changed, 46 insertions(+), 22 deletions(-) diff --git a/NEWS b/NEWS index 3e75b38b..69009839 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.69: + +* Use the latest Galaxy Zoo surveys. + (Gama 12, SDSS Lost Set, and Illustris.) + 1.68 * Use the latest Galaxy Zoo surveys. diff --git a/app/app.iml b/app/app.iml index de84acdb..684bc380 100644 --- a/app/app.iml +++ b/app/app.iml @@ -90,15 +90,19 @@ + + + + diff --git a/app/build.gradle b/app/build.gradle index e770332d..080eac9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 25 - versionCode 68 - versionName '1.68' + versionCode 69 + versionName '1.69' // Suggested here: https://developer.android.com/topic/libraries/testing-support-library/index.html testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/build/outputs/mapping/release/mapping.txt b/app/build/outputs/mapping/release/mapping.txt index d6de4991..181cb35b 100644 --- a/app/build/outputs/mapping/release/mapping.txt +++ b/app/build/outputs/mapping/release/mapping.txt @@ -4339,29 +4339,30 @@ android.support.v4.content.Loader -> android.support.v4.c.m: void deliverResult(java.lang.Object) -> b void deliverCancellation() -> l android.content.Context getContext() -> m + int getId() -> n void registerListener(int,android.support.v4.content.Loader$OnLoadCompleteListener) -> a void unregisterListener(android.support.v4.content.Loader$OnLoadCompleteListener) -> a void registerOnLoadCanceledListener(android.support.v4.content.Loader$OnLoadCanceledListener) -> a void unregisterOnLoadCanceledListener(android.support.v4.content.Loader$OnLoadCanceledListener) -> b - boolean isStarted() -> n - boolean isAbandoned() -> o - boolean isReset() -> p - void startLoading() -> q + boolean isStarted() -> o + boolean isAbandoned() -> p + boolean isReset() -> q + void startLoading() -> r void onStartLoading() -> i - boolean cancelLoad() -> r + boolean cancelLoad() -> s boolean onCancelLoad() -> b - void forceLoad() -> s + void forceLoad() -> t void onForceLoad() -> a - void stopLoading() -> t + void stopLoading() -> u void onStopLoading() -> j - void abandon() -> u - void onAbandon() -> v - void reset() -> w + void abandon() -> v + void onAbandon() -> w + void reset() -> x void onReset() -> k - boolean takeContentChanged() -> x - void commitContentChanged() -> y - void rollbackContentChanged() -> z - void onContentChanged() -> A + boolean takeContentChanged() -> y + void commitContentChanged() -> z + void rollbackContentChanged() -> A + void onContentChanged() -> B java.lang.String dataToString(java.lang.Object) -> c java.lang.String toString() -> toString void dump(java.lang.String,java.io.FileDescriptor,java.io.PrintWriter,java.lang.String[]) -> a @@ -18010,7 +18011,9 @@ com.google.firebase.crash.FirebaseCrash -> com.google.firebase.crash.FirebaseCra void zzUM() -> b com.google.android.gms.internal.zzbkr zzUN() -> c boolean isEnabled() -> d + void log(java.lang.String) -> a void zza(java.lang.String,long,android.os.Bundle) -> a + void zziC(java.lang.String) -> b void zzb(java.lang.String,long,android.os.Bundle) -> b void zzi(java.lang.Throwable) -> a boolean zzUO() -> e @@ -18326,6 +18329,7 @@ com.murrayc.galaxyzoo.app.ClassifyFragment -> com.murrayc.galaxyzoo.app.c: boolean mGetNextInProgress -> af com.murrayc.galaxyzoo.app.ClassifyFragment$Callbacks sDummyCallbacks -> ag com.murrayc.galaxyzoo.app.ClassifyFragment$Callbacks mCallbacks -> ah + com.murrayc.galaxyzoo.app.ClassifyFragment$GetNextIdLoader getNextIdLoader -> ai boolean $assertionsDisabled -> aa void () -> void onAttach(android.content.Context) -> a @@ -18342,10 +18346,11 @@ com.murrayc.galaxyzoo.app.ClassifyFragment -> com.murrayc.galaxyzoo.app.c: void addOrUpdateChildFragments() -> U void update() -> L void updateFromCursor() -> V - android.support.v4.content.Loader onCreateLoader(int,android.os.Bundle) -> a - void onLoadFinished(android.support.v4.content.Loader,android.database.Cursor) -> a - void onLoaderReset(android.support.v4.content.Loader) -> a - void onLoadFinished(android.support.v4.content.Loader,java.lang.Object) -> a + void access$000(com.murrayc.galaxyzoo.app.ClassifyFragment,boolean) -> a + java.lang.String[] access$100(com.murrayc.galaxyzoo.app.ClassifyFragment) -> a + android.database.Cursor access$202(com.murrayc.galaxyzoo.app.ClassifyFragment,android.database.Cursor) -> a + boolean access$302(com.murrayc.galaxyzoo.app.ClassifyFragment,boolean) -> b + void access$400(com.murrayc.galaxyzoo.app.ClassifyFragment) -> b void () -> com.murrayc.galaxyzoo.app.ClassifyFragment$1 -> com.murrayc.galaxyzoo.app.c$1: void () -> @@ -18356,6 +18361,14 @@ com.murrayc.galaxyzoo.app.ClassifyFragment$1 -> com.murrayc.galaxyzoo.app.c$1: com.murrayc.galaxyzoo.app.ClassifyFragment$Callbacks -> com.murrayc.galaxyzoo.app.c$a: void warnAboutNetworkProblemWithRetry() -> m void listenForNetworkReconnection() -> n +com.murrayc.galaxyzoo.app.ClassifyFragment$GetNextIdLoader -> com.murrayc.galaxyzoo.app.c$b: + com.murrayc.galaxyzoo.app.ClassifyFragment this$0 -> a + void (com.murrayc.galaxyzoo.app.ClassifyFragment) -> + android.support.v4.content.Loader onCreateLoader(int,android.os.Bundle) -> a + void onLoadFinished(android.support.v4.content.Loader,android.database.Cursor) -> a + void onLoaderReset(android.support.v4.content.Loader) -> a + void onLoadFinished(android.support.v4.content.Loader,java.lang.Object) -> a + void (com.murrayc.galaxyzoo.app.ClassifyFragment,com.murrayc.galaxyzoo.app.ClassifyFragment$1) -> com.murrayc.galaxyzoo.app.DecisionTree -> com.murrayc.galaxyzoo.app.d: java.util.Map questionsMap -> a java.lang.String firstQuestionId -> b @@ -18616,9 +18629,11 @@ com.murrayc.galaxyzoo.app.ListFragment$Callbacks -> com.murrayc.galaxyzoo.app.Li void navigateToNextAvailable() -> k com.murrayc.galaxyzoo.app.Log -> com.murrayc.galaxyzoo.app.j: java.lang.String defaultString(java.lang.String) -> c - void error(java.lang.String,java.lang.Throwable) -> a + void fatal(java.lang.String,java.lang.Throwable) -> a + void fatal(java.lang.String) -> d + void error(java.lang.String,java.lang.Throwable) -> b void error(java.lang.String) -> a - void info(java.lang.String,java.lang.Throwable) -> b + void info(java.lang.String,java.lang.Throwable) -> c void info(java.lang.String) -> b com.murrayc.galaxyzoo.app.LoginActivity -> com.murrayc.galaxyzoo.app.LoginActivity: com.murrayc.galaxyzoo.app.provider.client.ZooniverseClient mClient -> n